Accueil Explorer Aide
Connexion
ableton-dir
/
openadk
forké depuis oss/openadk
1
0
Fork 0
Fichiers
Aborescence: fabbb1de0c
Branches Tags
openadk
/
package
/
openafs
/
patches
/
patch-src_des_read_pssword_c

patch-src_des_read_pssword_c 1.8 KB
Historique Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 
  1. --- openafs-1.6.5.orig/src/des/read_pssword.c	2013-07-18 00:10:42.000000000 +0200
    2. 

  2. +++ openafs-1.6.5/src/des/read_pssword.c	2013-08-22 07:26:09.861211339 +0200
    3. 

  3. @@ -53,6 +53,7 @@ static int intrupt;
    4. 

  4.  #endif
    5. 

  5.  
    6. 

  6.  #ifdef HAVE_TERMIOS_H
    7. 

  7. +#include <sys/ioctl.h>
    8. 

  8.  #include <termios.h>
    9. 

  9.  #endif
    10. 

  10.  
    11. 

  11. @@ -115,7 +116,7 @@ des_read_password(des_cblock * k, char *
    12. 

  12.  static void catch(int);
    13. 

  13.  #endif
    14. 

  14.  
    15. 

  15. -#if	!defined(BSDUNIX) && (defined(AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV))
    16. 

  16. +#if	!defined(BSDUNIX) && (defined(AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV))
    17. 

  17.  #include <termio.h>
    18. 

  18.  #endif
    19. 

  19.  
    20. 

  20. @@ -148,7 +149,7 @@ des_read_pw_string(char *s, int maxa, ch
    21. 

  21.      FILE *fi;
    22. 

  22.  #else
    23. 

  23.  #if	defined	(AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV)
    24. 

  24. -    struct termio ttyb;
    25. 

  25. +    struct termios ttyb;
    26. 

  26.      FILE *fi;
    27. 

  27.      char savel, flags;
    28. 

  28.      void (*sig) (int);
    29. 

  29. @@ -227,12 +228,12 @@ des_read_pw_string(char *s, int maxa, ch
    30. 

  30.  	setbuf(fi, (char *)NULL);
    31. 

  31.      sig = signal(SIGINT, catch);
    32. 

  32.      intrupt = 0;
    33. 

  33. -    (void)ioctl(fileno(fi), TCGETA, &ttyb);
    34. 

  34. +    (void)ioctl(fileno(fi), TCGETS, &ttyb);
    35. 

  35.      savel = ttyb.c_line;
    36. 

  36.      ttyb.c_line = 0;
    37. 

  37.      flags = ttyb.c_lflag;
    38. 

  38.      ttyb.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
    39. 

  39. -    (void)ioctl(fileno(fi), TCSETAF, &ttyb);
    40. 

  40. +    (void)ioctl(fileno(fi), TCSETSF, &ttyb);
    41. 

  41.  #else
    42. 

  42.  #ifdef AFS_NT40_ENV
    43. 

  43.      /* turn off console input echoing */
    44. 

  44. @@ -335,7 +336,7 @@ des_read_pw_string(char *s, int maxa, ch
    45. 

  45.  #if	defined	(AFS_AIX_ENV) /*|| defined (AFS_HPUX_ENV)*/ || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV)
    46. 

  46.      ttyb.c_lflag = flags;
    47. 

  47.      ttyb.c_line = savel;
    48. 

  48. -    (void)ioctl(fileno(fi), TCSETAW, &ttyb);
    49. 

  49. +    (void)ioctl(fileno(fi), TCSETSW, &ttyb);
    50. 

  50.      (void)signal(SIGINT, sig);
    51. 

  51.      if (fi != stdin)
    52. 

  52.  	(void)fclose(fi);
    53.