diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-25 09:58:34 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-25 09:58:34 +0200 |
commit | a42b7f9cbf9b6c3f4a2b7fe2ff718e02ae15071f (patch) | |
tree | e8c1bf3e17956d0ca35561d9d20d636ed0634486 /package/openafs/patches/patch-src_des_read_pssword_c | |
parent | dfa47f6ed121abcbc3d9974601fc30fbadf7c716 (diff) | |
parent | cd47bd9a54844eb6b3184390bb90927395066043 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openafs/patches/patch-src_des_read_pssword_c')
-rw-r--r-- | package/openafs/patches/patch-src_des_read_pssword_c | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/package/openafs/patches/patch-src_des_read_pssword_c b/package/openafs/patches/patch-src_des_read_pssword_c new file mode 100644 index 000000000..7192a06f2 --- /dev/null +++ b/package/openafs/patches/patch-src_des_read_pssword_c @@ -0,0 +1,52 @@ +--- openafs-1.6.5.orig/src/des/read_pssword.c 2013-07-18 00:10:42.000000000 +0200 ++++ openafs-1.6.5/src/des/read_pssword.c 2013-08-22 07:26:09.861211339 +0200 +@@ -53,6 +53,7 @@ static int intrupt; + #endif + + #ifdef HAVE_TERMIOS_H ++#include <sys/ioctl.h> + #include <termios.h> + #endif + +@@ -115,7 +116,7 @@ des_read_password(des_cblock * k, char * + static void catch(int); + #endif + +-#if !defined(BSDUNIX) && (defined(AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV)) ++#if !defined(BSDUNIX) && (defined(AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV)) + #include <termio.h> + #endif + +@@ -148,7 +149,7 @@ des_read_pw_string(char *s, int maxa, ch + FILE *fi; + #else + #if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) +- struct termio ttyb; ++ struct termios ttyb; + FILE *fi; + char savel, flags; + void (*sig) (int); +@@ -227,12 +228,12 @@ des_read_pw_string(char *s, int maxa, ch + setbuf(fi, (char *)NULL); + sig = signal(SIGINT, catch); + intrupt = 0; +- (void)ioctl(fileno(fi), TCGETA, &ttyb); ++ (void)ioctl(fileno(fi), TCGETS, &ttyb); + savel = ttyb.c_line; + ttyb.c_line = 0; + flags = ttyb.c_lflag; + ttyb.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL); +- (void)ioctl(fileno(fi), TCSETAF, &ttyb); ++ (void)ioctl(fileno(fi), TCSETSF, &ttyb); + #else + #ifdef AFS_NT40_ENV + /* turn off console input echoing */ +@@ -335,7 +336,7 @@ des_read_pw_string(char *s, int maxa, ch + #if defined (AFS_AIX_ENV) /*|| defined (AFS_HPUX_ENV)*/ || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) + ttyb.c_lflag = flags; + ttyb.c_line = savel; +- (void)ioctl(fileno(fi), TCSETAW, &ttyb); ++ (void)ioctl(fileno(fi), TCSETSW, &ttyb); + (void)signal(SIGINT, sig); + if (fi != stdin) + (void)fclose(fi); |