2 files changed, 10 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 046cadc84..c3069df12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
      [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c]
      [sshconnect.c sshlogin.c sshpty.c uidswap.c]
      move #include <unistd.h> out of includes.h
+   - dtucker@cvs.openbsd.org 2006/07/17 12:02:24
+     [auth-options.c]
+     Use '\0' rather than 0 to terminates strings; ok djm@
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4941,4 +4944,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4413 2006/07/24 04:01:23 djm Exp $
+$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 @@
-/* $OpenBSD: auth-options.c,v 1.37 2006/07/12 22:28:51 stevesk Exp $ */
+/* $OpenBSD: auth-options.c,v 1.38 2006/07/17 12:02:24 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * 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)
                                 forced_command = NULL;
                                 goto bad_option;
                         }
-                        forced_command[i] = 0;
+                        forced_command[i] = '\0';
                         auth_debug_add("Forced command: %.900s", forced_command);
                         opts++;
                         goto next_option;
@@ -170,7 +170,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 xfree(s);
                                 goto bad_option;
                         }
-                        s[i] = 0;
+                        s[i] = '\0';
                         auth_debug_add("Adding to environment: %.900s", s);
                         debug("Adding to environment: %.900s", s);
                         opts++;
@@ -207,7 +207,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 xfree(patterns);
                                 goto bad_option;
                         }
-                        patterns[i] = 0;
+                        patterns[i] = '\0';
                         opts++;
                         if (match_host_and_ip(remote_host, remote_ip,
                             patterns) != 1) {
@@ -252,7 +252,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 xfree(patterns);
                                 goto bad_option;
                         }
-                        patterns[i] = 0;
+                        patterns[i] = '\0';
                         opts++;
                         p = patterns;
                         host = hpdelim(&p);
@@ -300,7 +300,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 forced_tun_device = -1;
                                 goto bad_option;
                         }
-                        tun[i] = 0;
+                        tun[i] = '\0';
                         forced_tun_device = a2tun(tun, NULL);
                         xfree(tun);
                         if (forced_tun_device == SSH_TUNID_ERR) {