===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth-options.c,v
retrieving revision 1.31.4.2
retrieving revision 1.32
diff -u -r1.31.4.2 -r1.32
--- src/usr.bin/ssh/auth-options.c	2006/10/06 03:19:32	1.31.4.2
+++ src/usr.bin/ssh/auth-options.c	2005/12/06 22:38:27	1.32
@@ -1,4 +1,3 @@
-/* $OpenBSD: auth-options.c,v 1.31.4.2 2006/10/06 03:19:32 brad Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -10,30 +9,19 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-#include <sys/types.h>
+#include "includes.h"
+RCSID("$OpenBSD: auth-options.c,v 1.32 2005/12/06 22:38:27 reyk Exp $");
 
-#include <netdb.h>
-#include <pwd.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-
 #include "xmalloc.h"
 #include "match.h"
 #include "log.h"
 #include "canohost.h"
-#include "buffer.h"
 #include "channels.h"
 #include "auth-options.h"
 #include "servconf.h"
 #include "misc.h"
-#include "key.h"
-#include "hostfile.h"
-#include "auth.h"
-#ifdef GSSAPI
-#include "ssh-gss.h"
-#endif
 #include "monitor_wrap.h"
+#include "auth.h"
 
 /* Flags set authorized_keys flags */
 int no_port_forwarding_flag = 0;
@@ -143,7 +131,7 @@
 				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;
@@ -175,7 +163,7 @@
 				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++;
@@ -212,7 +200,7 @@
 				xfree(patterns);
 				goto bad_option;
 			}
-			patterns[i] = '\0';
+			patterns[i] = 0;
 			opts++;
 			if (match_host_and_ip(remote_host, remote_ip,
 			    patterns) != 1) {
@@ -257,7 +245,7 @@
 				xfree(patterns);
 				goto bad_option;
 			}
-			patterns[i] = '\0';
+			patterns[i] = 0;
 			opts++;
 			p = patterns;
 			host = hpdelim(&p);
@@ -305,10 +293,10 @@
 				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) {
+			if (forced_tun_device < -1) {
 				debug("%.100s, line %lu: invalid tun device",
 				    file, linenum);
 				auth_debug_add("%.100s, line %lu: invalid tun device",