diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-options.c | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -23,6 +23,9 @@ | |||
23 | [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c] | 23 | [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c] |
24 | [sshconnect.c sshlogin.c sshpty.c uidswap.c] | 24 | [sshconnect.c sshlogin.c sshpty.c uidswap.c] |
25 | move #include <unistd.h> out of includes.h | 25 | move #include <unistd.h> out of includes.h |
26 | - dtucker@cvs.openbsd.org 2006/07/17 12:02:24 | ||
27 | [auth-options.c] | ||
28 | Use '\0' rather than 0 to terminates strings; ok djm@ | ||
26 | 29 | ||
27 | 20060713 | 30 | 20060713 |
28 | - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h | 31 | - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h |
@@ -4941,4 +4944,4 @@ | |||
4941 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4944 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4942 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4945 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4943 | 4946 | ||
4944 | $Id: ChangeLog,v 1.4413 2006/07/24 04:01:23 djm Exp $ | 4947 | $Id: ChangeLog,v 1.4414 2006/07/24 04:01:43 djm Exp $ |
diff --git a/auth-options.c b/auth-options.c index 0b11151cf..7e6bfeb40 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.37 2006/07/12 22:28:51 stevesk Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.38 2006/07/17 12:02:24 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -138,7 +138,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
138 | forced_command = NULL; | 138 | forced_command = NULL; |
139 | goto bad_option; | 139 | goto bad_option; |
140 | } | 140 | } |
141 | forced_command[i] = 0; | 141 | forced_command[i] = '\0'; |
142 | auth_debug_add("Forced command: %.900s", forced_command); | 142 | auth_debug_add("Forced command: %.900s", forced_command); |
143 | opts++; | 143 | opts++; |
144 | goto next_option; | 144 | goto next_option; |
@@ -170,7 +170,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
170 | xfree(s); | 170 | xfree(s); |
171 | goto bad_option; | 171 | goto bad_option; |
172 | } | 172 | } |
173 | s[i] = 0; | 173 | s[i] = '\0'; |
174 | auth_debug_add("Adding to environment: %.900s", s); | 174 | auth_debug_add("Adding to environment: %.900s", s); |
175 | debug("Adding to environment: %.900s", s); | 175 | debug("Adding to environment: %.900s", s); |
176 | opts++; | 176 | opts++; |
@@ -207,7 +207,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
207 | xfree(patterns); | 207 | xfree(patterns); |
208 | goto bad_option; | 208 | goto bad_option; |
209 | } | 209 | } |
210 | patterns[i] = 0; | 210 | patterns[i] = '\0'; |
211 | opts++; | 211 | opts++; |
212 | if (match_host_and_ip(remote_host, remote_ip, | 212 | if (match_host_and_ip(remote_host, remote_ip, |
213 | patterns) != 1) { | 213 | patterns) != 1) { |
@@ -252,7 +252,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
252 | xfree(patterns); | 252 | xfree(patterns); |
253 | goto bad_option; | 253 | goto bad_option; |
254 | } | 254 | } |
255 | patterns[i] = 0; | 255 | patterns[i] = '\0'; |
256 | opts++; | 256 | opts++; |
257 | p = patterns; | 257 | p = patterns; |
258 | host = hpdelim(&p); | 258 | host = hpdelim(&p); |
@@ -300,7 +300,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
300 | forced_tun_device = -1; | 300 | forced_tun_device = -1; |
301 | goto bad_option; | 301 | goto bad_option; |
302 | } | 302 | } |
303 | tun[i] = 0; | 303 | tun[i] = '\0'; |
304 | forced_tun_device = a2tun(tun, NULL); | 304 | forced_tun_device = a2tun(tun, NULL); |
305 | xfree(tun); | 305 | xfree(tun); |
306 | if (forced_tun_device == SSH_TUNID_ERR) { | 306 | if (forced_tun_device == SSH_TUNID_ERR) { |