RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) OpenBSD CVS Sync 

- dtucker@cvs.openbsd.org 2007/12/31 10:41:31
     [readconf.c servconf.c]
     Prevent strict-aliasing warnings on newer gcc versions.  bz #1355, patch
     from Dmitry V. Levin, ok djm@
This commit is contained in:
Darren Tucker 2008-01-01 20:32:26 +11:00
parent 528d6fa10a
commit 1e44c5ded3
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,10 @@
20080101
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2007/12/31 10:41:31
[readconf.c servconf.c]
Prevent strict-aliasing warnings on newer gcc versions. bz #1355, patch
from Dmitry V. Levin, ok djm@
20071231 20071231
- (dtucker) [configure.ac openbsd-compat/glob.{c,h}] Bug #1407: force use of - (dtucker) [configure.ac openbsd-compat/glob.{c,h}] Bug #1407: force use of
builtin glob implementation on Mac OS X. Based on a patch from builtin glob implementation on Mac OS X. Based on a patch from
@ -3487,4 +3494,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4811 2007/12/31 10:29:26 dtucker Exp $ $Id: ChangeLog,v 1.4812 2008/01/01 09:32:26 dtucker Exp $

9
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.163 2007/10/22 19:10:24 markus Exp $ */ /* $OpenBSD: readconf.c,v 1.164 2007/12/31 10:41:31 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -326,6 +326,7 @@ process_config_line(Options *options, const char *host,
{ {
char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256]; char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256];
int opcode, *intptr, value, value2, scale; int opcode, *intptr, value, value2, scale;
LogLevel *log_level_ptr;
long long orig, val64; long long orig, val64;
size_t len; size_t len;
Forward fwd; Forward fwd;
@ -692,14 +693,14 @@ parse_int:
break; break;
case oLogLevel: case oLogLevel:
intptr = (int *) &options->log_level; log_level_ptr = &options->log_level;
arg = strdelim(&s); arg = strdelim(&s);
value = log_level_number(arg); value = log_level_number(arg);
if (value == SYSLOG_LEVEL_NOT_SET) if (value == SYSLOG_LEVEL_NOT_SET)
fatal("%.200s line %d: unsupported log level '%s'", fatal("%.200s line %d: unsupported log level '%s'",
filename, linenum, arg ? arg : "<NONE>"); filename, linenum, arg ? arg : "<NONE>");
if (*activep && (LogLevel) *intptr == SYSLOG_LEVEL_NOT_SET) if (*activep && *log_level_ptr == SYSLOG_LEVEL_NOT_SET)
*intptr = (LogLevel) value; *log_level_ptr = (LogLevel) value;
break; break;
case oLocalForward: case oLocalForward:

16
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.173 2007/12/27 14:22:08 dtucker Exp $ */ /* $OpenBSD: servconf.c,v 1.174 2007/12/31 10:41:31 dtucker Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -621,6 +621,8 @@ process_server_config_line(ServerOptions *options, char *line,
{ {
char *cp, **charptr, *arg, *p; char *cp, **charptr, *arg, *p;
int cmdline = 0, *intptr, value, n; int cmdline = 0, *intptr, value, n;
SyslogFacility *log_facility_ptr;
LogLevel *log_level_ptr;
ServerOpCodes opcode; ServerOpCodes opcode;
u_short port; u_short port;
u_int i, flags = 0; u_int i, flags = 0;
@ -976,25 +978,25 @@ parse_flag:
goto parse_flag; goto parse_flag;
case sLogFacility: case sLogFacility:
intptr = (int *) &options->log_facility; log_facility_ptr = &options->log_facility;
arg = strdelim(&cp); arg = strdelim(&cp);
value = log_facility_number(arg); value = log_facility_number(arg);
if (value == SYSLOG_FACILITY_NOT_SET) if (value == SYSLOG_FACILITY_NOT_SET)
fatal("%.200s line %d: unsupported log facility '%s'", fatal("%.200s line %d: unsupported log facility '%s'",
filename, linenum, arg ? arg : "<NONE>"); filename, linenum, arg ? arg : "<NONE>");
if (*intptr == -1) if (*log_facility_ptr == -1)
*intptr = (SyslogFacility) value; *log_facility_ptr = (SyslogFacility) value;
break; break;
case sLogLevel: case sLogLevel:
intptr = (int *) &options->log_level; log_level_ptr = &options->log_level;
arg = strdelim(&cp); arg = strdelim(&cp);
value = log_level_number(arg); value = log_level_number(arg);
if (value == SYSLOG_LEVEL_NOT_SET) if (value == SYSLOG_LEVEL_NOT_SET)
fatal("%.200s line %d: unsupported log level '%s'", fatal("%.200s line %d: unsupported log level '%s'",
filename, linenum, arg ? arg : "<NONE>"); filename, linenum, arg ? arg : "<NONE>");
if (*intptr == -1) if (*log_level_ptr == -1)
*intptr = (LogLevel) value; *log_level_ptr = (LogLevel) value;
break; break;
case sAllowTcpForwarding: case sAllowTcpForwarding: