diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 14:05:20 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 14:05:20 +1100 |
commit | 91d4b12fcb045d93034b2609aaf56a4b41e6eb4f (patch) | |
tree | ee1d4f180ffb05e0623e8539073eb0c6b5badcc9 | |
parent | 1b81a49f8669b4fd33100ec349570fc5390d88d4 (diff) |
- deraadt@cvs.openbsd.org 2006/03/20 18:17:20
[auth1.c auth2.c sshd.c]
sprinkle some ARGSUSED for table driven functions (which sometimes
must ignore their args)
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth1.c | 5 | ||||
-rw-r--r-- | auth2.c | 2 | ||||
-rw-r--r-- | sshd.c | 1 |
4 files changed, 12 insertions, 2 deletions
@@ -78,6 +78,10 @@ | |||
78 | [channels.c clientloop.c monitor_wrap.c monitor_wrap.h serverloop.c] | 78 | [channels.c clientloop.c monitor_wrap.c monitor_wrap.h serverloop.c] |
79 | [ssh.c sshpty.c sshpty.h] | 79 | [ssh.c sshpty.c sshpty.h] |
80 | sprinkle u_int throughout pty subsystem, ok markus | 80 | sprinkle u_int throughout pty subsystem, ok markus |
81 | - deraadt@cvs.openbsd.org 2006/03/20 18:17:20 | ||
82 | [auth1.c auth2.c sshd.c] | ||
83 | sprinkle some ARGSUSED for table driven functions (which sometimes | ||
84 | must ignore their args) | ||
81 | 85 | ||
82 | 20060325 | 86 | 20060325 |
83 | - OpenBSD CVS Sync | 87 | - OpenBSD CVS Sync |
@@ -4335,4 +4339,4 @@ | |||
4335 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4339 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4336 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4340 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4337 | 4341 | ||
4338 | $Id: ChangeLog,v 1.4264 2006/03/26 03:05:02 djm Exp $ | 4342 | $Id: ChangeLog,v 1.4265 2006/03/26 03:05:20 djm Exp $ |
@@ -95,6 +95,7 @@ get_authname(int type) | |||
95 | return (buf); | 95 | return (buf); |
96 | } | 96 | } |
97 | 97 | ||
98 | /*ARGSUSED*/ | ||
98 | static int | 99 | static int |
99 | auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) | 100 | auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) |
100 | { | 101 | { |
@@ -119,6 +120,7 @@ auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) | |||
119 | return (authenticated); | 120 | return (authenticated); |
120 | } | 121 | } |
121 | 122 | ||
123 | /*ARGSUSED*/ | ||
122 | static int | 124 | static int |
123 | auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) | 125 | auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) |
124 | { | 126 | { |
@@ -136,6 +138,7 @@ auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) | |||
136 | return (authenticated); | 138 | return (authenticated); |
137 | } | 139 | } |
138 | 140 | ||
141 | /*ARGSUSED*/ | ||
139 | static int | 142 | static int |
140 | auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) | 143 | auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) |
141 | { | 144 | { |
@@ -174,6 +177,7 @@ auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) | |||
174 | return (authenticated); | 177 | return (authenticated); |
175 | } | 178 | } |
176 | 179 | ||
180 | /*ARGSUSED*/ | ||
177 | static int | 181 | static int |
178 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) | 182 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) |
179 | { | 183 | { |
@@ -192,6 +196,7 @@ auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) | |||
192 | return (-1); | 196 | return (-1); |
193 | } | 197 | } |
194 | 198 | ||
199 | /*ARGSUSED*/ | ||
195 | static int | 200 | static int |
196 | auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen) | 201 | auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen) |
197 | { | 202 | { |
@@ -95,6 +95,7 @@ do_authentication2(Authctxt *authctxt) | |||
95 | dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); | 95 | dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); |
96 | } | 96 | } |
97 | 97 | ||
98 | /*ARGSUSED*/ | ||
98 | static void | 99 | static void |
99 | input_service_request(int type, u_int32_t seq, void *ctxt) | 100 | input_service_request(int type, u_int32_t seq, void *ctxt) |
100 | { | 101 | { |
@@ -128,6 +129,7 @@ input_service_request(int type, u_int32_t seq, void *ctxt) | |||
128 | xfree(service); | 129 | xfree(service); |
129 | } | 130 | } |
130 | 131 | ||
132 | /*ARGSUSED*/ | ||
131 | static void | 133 | static void |
132 | input_userauth_request(int type, u_int32_t seq, void *ctxt) | 134 | input_userauth_request(int type, u_int32_t seq, void *ctxt) |
133 | { | 135 | { |
@@ -273,7 +273,6 @@ sighup_handler(int sig) | |||
273 | * Called from the main program after receiving SIGHUP. | 273 | * Called from the main program after receiving SIGHUP. |
274 | * Restarts the server. | 274 | * Restarts the server. |
275 | */ | 275 | */ |
276 | /*ARGSUSED*/ | ||
277 | static void | 276 | static void |
278 | sighup_restart(void) | 277 | sighup_restart(void) |
279 | { | 278 | { |