diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | monitor.c | 8 | ||||
-rw-r--r-- | monitor_wrap.c | 6 |
3 files changed, 11 insertions, 8 deletions
@@ -24,7 +24,8 @@ | |||
24 | knf says that a 2nd level indent is four (not three or five) spaces | 24 | knf says that a 2nd level indent is four (not three or five) spaces |
25 | -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] | 25 | -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] |
26 | [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too | 26 | [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too |
27 | 27 | - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls | |
28 | |||
28 | 20050716 | 29 | 20050716 |
29 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication | 30 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication |
30 | socketpair stays open on in both the monitor and PAM process. Patch from | 31 | socketpair stays open on in both the monitor and PAM process. Patch from |
@@ -2857,4 +2858,4 @@ | |||
2857 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2858 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2858 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2859 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2859 | 2860 | ||
2860 | $Id: ChangeLog,v 1.3852 2005/07/17 07:26:43 djm Exp $ | 2861 | $Id: ChangeLog,v 1.3853 2005/07/17 07:53:31 djm Exp $ |
@@ -869,8 +869,8 @@ int | |||
869 | mm_answer_pam_query(int sock, Buffer *m) | 869 | mm_answer_pam_query(int sock, Buffer *m) |
870 | { | 870 | { |
871 | char *name, *info, **prompts; | 871 | char *name, *info, **prompts; |
872 | u_int num, *echo_on; | 872 | u_int i, num, *echo_on; |
873 | int i, ret; | 873 | int ret; |
874 | 874 | ||
875 | debug3("%s", __func__); | 875 | debug3("%s", __func__); |
876 | sshpam_authok = NULL; | 876 | sshpam_authok = NULL; |
@@ -903,8 +903,8 @@ int | |||
903 | mm_answer_pam_respond(int sock, Buffer *m) | 903 | mm_answer_pam_respond(int sock, Buffer *m) |
904 | { | 904 | { |
905 | char **resp; | 905 | char **resp; |
906 | u_int num; | 906 | u_int i, num; |
907 | int i, ret; | 907 | int ret; |
908 | 908 | ||
909 | debug3("%s", __func__); | 909 | debug3("%s", __func__); |
910 | sshpam_authok = NULL; | 910 | sshpam_authok = NULL; |
diff --git a/monitor_wrap.c b/monitor_wrap.c index afa612f4e..1489e7f08 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -764,7 +764,8 @@ mm_sshpam_query(void *ctx, char **name, char **info, | |||
764 | u_int *num, char ***prompts, u_int **echo_on) | 764 | u_int *num, char ***prompts, u_int **echo_on) |
765 | { | 765 | { |
766 | Buffer m; | 766 | Buffer m; |
767 | int i, ret; | 767 | u_int i; |
768 | int ret; | ||
768 | 769 | ||
769 | debug3("%s", __func__); | 770 | debug3("%s", __func__); |
770 | buffer_init(&m); | 771 | buffer_init(&m); |
@@ -790,7 +791,8 @@ int | |||
790 | mm_sshpam_respond(void *ctx, u_int num, char **resp) | 791 | mm_sshpam_respond(void *ctx, u_int num, char **resp) |
791 | { | 792 | { |
792 | Buffer m; | 793 | Buffer m; |
793 | int i, ret; | 794 | u_int i; |
795 | int ret; | ||
794 | 796 | ||
795 | debug3("%s", __func__); | 797 | debug3("%s", __func__); |
796 | buffer_init(&m); | 798 | buffer_init(&m); |