Sun Jan 9 23:17:36 2011 UTC ()
avoid unused variable warning.


(christos)
diff -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/servconf.c
cvs diff -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/servconf.c (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/dist/servconf.c 2010/11/22 09:53:01 1.6
+++ src/crypto/external/bsd/openssh/dist/servconf.c 2011/01/09 23:17:36 1.7
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1/* $NetBSD: servconf.c,v 1.6 2010/11/22 09:53:01 adam Exp $ */ 1/* $NetBSD: servconf.c,v 1.7 2011/01/09 23:17:36 christos Exp $ */
2/* $OpenBSD: servconf.c,v 1.209 2010/06/22 04:22:59 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.209 2010/06/22 04:22:59 djm Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
6 * 6 *
7 * As far as I am concerned, the code I have written for this software 7 * As far as I am concerned, the code I have written for this software
8 * can be used freely for any purpose. Any derived versions of this 8 * can be used freely for any purpose. Any derived versions of this
9 * software must be clearly marked as such, and if the derived work is 9 * software must be clearly marked as such, and if the derived work is
10 * incompatible with the protocol description in the RFC file, it must be 10 * incompatible with the protocol description in the RFC file, it must be
11 * called by a name other than "ssh" or "Secure Shell". 11 * called by a name other than "ssh" or "Secure Shell".
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15__RCSID("$NetBSD: servconf.c,v 1.6 2010/11/22 09:53:01 adam Exp $"); 15__RCSID("$NetBSD: servconf.c,v 1.7 2011/01/09 23:17:36 christos Exp $");
16#include <sys/types.h> 16#include <sys/types.h>
17#include <sys/socket.h> 17#include <sys/socket.h>
18#include <sys/queue.h> 18#include <sys/queue.h>
19#include <sys/param.h> 19#include <sys/param.h>
20 20
21#include <netdb.h> 21#include <netdb.h>
22#include <pwd.h> 22#include <pwd.h>
23#include <stdio.h> 23#include <stdio.h>
24#include <stdlib.h> 24#include <stdlib.h>
25#include <string.h> 25#include <string.h>
26#include <signal.h> 26#include <signal.h>
27#include <unistd.h> 27#include <unistd.h>
28#include <stdarg.h> 28#include <stdarg.h>
@@ -806,27 +806,29 @@ match_cfg_line(char **condition, int lin @@ -806,27 +806,29 @@ match_cfg_line(char **condition, int lin
806} 806}
807 807
808#define WHITESPACE " \t\r\n" 808#define WHITESPACE " \t\r\n"
809 809
810int 810int
811process_server_config_line(ServerOptions *options, char *line, 811process_server_config_line(ServerOptions *options, char *line,
812 const char *filename, int linenum, int *activep, const char *user, 812 const char *filename, int linenum, int *activep, const char *user,
813 const char *host, const char *address) 813 const char *host, const char *address)
814{ 814{
815 char *cp, **charptr, *arg, *p; 815 char *cp, **charptr, *arg, *p;
816 int cmdline = 0, *intptr, value, n; 816 int cmdline = 0, *intptr, value, n;
817 SyslogFacility *log_facility_ptr; 817 SyslogFacility *log_facility_ptr;
818 LogLevel *log_level_ptr; 818 LogLevel *log_level_ptr;
 819#ifdef WITH_LDAP_PUBKEY
819 unsigned long lvalue; 820 unsigned long lvalue;
 821#endif
820 time_t *timetptr; 822 time_t *timetptr;
821 ServerOpCodes opcode; 823 ServerOpCodes opcode;
822 int port = 0; 824 int port = 0;
823 u_int i, flags = 0; 825 u_int i, flags = 0;
824 size_t len; 826 size_t len;
825 827
826 cp = line; 828 cp = line;
827 if ((arg = strdelim(&cp)) == NULL) 829 if ((arg = strdelim(&cp)) == NULL)
828 return 0; 830 return 0;
829 /* Ignore leading whitespace */ 831 /* Ignore leading whitespace */
830 if (*arg == '\0') 832 if (*arg == '\0')
831 arg = strdelim(&cp); 833 arg = strdelim(&cp);
832 if (!arg || !*arg || *arg == '#') 834 if (!arg || !*arg || *arg == '#')