- stevesk@cvs.openbsd.org 2006/07/22 20:48:23

[openssh.git] / auth-options.c

diff --git a/auth-options.c b/auth-options.c
index 56d598412653d80bc30b897791acfc96818a4c6d..33c62641b0e2edc464558a4c62515bf3d8bb8ffd 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.35 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.39 2006/07/22 20:48:22 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,6 +12,14 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
+#include <pwd.h>
+#include <string.h>
+
 #include "xmalloc.h"
 #include "match.h"
 #include "log.h"
@@ -131,7 +139,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;
@@ -163,7 +171,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++;
@@ -200,7 +208,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) {
@@ -245,7 +253,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);
@@ -293,7 +301,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) {