diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | readconf.c | 9 | ||||
-rw-r--r-- | servconf.c | 16 |
3 files changed, 22 insertions, 12 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20080101 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - dtucker@cvs.openbsd.org 2007/12/31 10:41:31 | ||
4 | [readconf.c servconf.c] | ||
5 | Prevent strict-aliasing warnings on newer gcc versions. bz #1355, patch | ||
6 | from Dmitry V. Levin, ok djm@ | ||
7 | |||
1 | 20071231 | 8 | 20071231 |
2 | - (dtucker) [configure.ac openbsd-compat/glob.{c,h}] Bug #1407: force use of | 9 | - (dtucker) [configure.ac openbsd-compat/glob.{c,h}] Bug #1407: force use of |
3 | builtin glob implementation on Mac OS X. Based on a patch from | 10 | builtin glob implementation on Mac OS X. Based on a patch from |
@@ -3487,4 +3494,4 @@ | |||
3487 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3494 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3488 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3495 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3489 | 3496 | ||
3490 | $Id: ChangeLog,v 1.4811 2007/12/31 10:29:26 dtucker Exp $ | 3497 | $Id: ChangeLog,v 1.4812 2008/01/01 09:32:26 dtucker Exp $ |
diff --git a/readconf.c b/readconf.c index df058d35a..1d6409fdb 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.163 2007/10/22 19:10:24 markus Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.164 2007/12/31 10:41:31 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -326,6 +326,7 @@ process_config_line(Options *options, const char *host, | |||
326 | { | 326 | { |
327 | char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256]; | 327 | char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256]; |
328 | int opcode, *intptr, value, value2, scale; | 328 | int opcode, *intptr, value, value2, scale; |
329 | LogLevel *log_level_ptr; | ||
329 | long long orig, val64; | 330 | long long orig, val64; |
330 | size_t len; | 331 | size_t len; |
331 | Forward fwd; | 332 | Forward fwd; |
@@ -692,14 +693,14 @@ parse_int: | |||
692 | break; | 693 | break; |
693 | 694 | ||
694 | case oLogLevel: | 695 | case oLogLevel: |
695 | intptr = (int *) &options->log_level; | 696 | log_level_ptr = &options->log_level; |
696 | arg = strdelim(&s); | 697 | arg = strdelim(&s); |
697 | value = log_level_number(arg); | 698 | value = log_level_number(arg); |
698 | if (value == SYSLOG_LEVEL_NOT_SET) | 699 | if (value == SYSLOG_LEVEL_NOT_SET) |
699 | fatal("%.200s line %d: unsupported log level '%s'", | 700 | fatal("%.200s line %d: unsupported log level '%s'", |
700 | filename, linenum, arg ? arg : "<NONE>"); | 701 | filename, linenum, arg ? arg : "<NONE>"); |
701 | if (*activep && (LogLevel) *intptr == SYSLOG_LEVEL_NOT_SET) | 702 | if (*activep && *log_level_ptr == SYSLOG_LEVEL_NOT_SET) |
702 | *intptr = (LogLevel) value; | 703 | *log_level_ptr = (LogLevel) value; |
703 | break; | 704 | break; |
704 | 705 | ||
705 | case oLocalForward: | 706 | case oLocalForward: |
diff --git a/servconf.c b/servconf.c index d4c01f7ff..4e3140fe3 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.173 2007/12/27 14:22:08 dtucker Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.174 2007/12/31 10:41:31 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -621,6 +621,8 @@ process_server_config_line(ServerOptions *options, char *line, | |||
621 | { | 621 | { |
622 | char *cp, **charptr, *arg, *p; | 622 | char *cp, **charptr, *arg, *p; |
623 | int cmdline = 0, *intptr, value, n; | 623 | int cmdline = 0, *intptr, value, n; |
624 | SyslogFacility *log_facility_ptr; | ||
625 | LogLevel *log_level_ptr; | ||
624 | ServerOpCodes opcode; | 626 | ServerOpCodes opcode; |
625 | u_short port; | 627 | u_short port; |
626 | u_int i, flags = 0; | 628 | u_int i, flags = 0; |
@@ -976,25 +978,25 @@ parse_flag: | |||
976 | goto parse_flag; | 978 | goto parse_flag; |
977 | 979 | ||
978 | case sLogFacility: | 980 | case sLogFacility: |
979 | intptr = (int *) &options->log_facility; | 981 | log_facility_ptr = &options->log_facility; |
980 | arg = strdelim(&cp); | 982 | arg = strdelim(&cp); |
981 | value = log_facility_number(arg); | 983 | value = log_facility_number(arg); |
982 | if (value == SYSLOG_FACILITY_NOT_SET) | 984 | if (value == SYSLOG_FACILITY_NOT_SET) |
983 | fatal("%.200s line %d: unsupported log facility '%s'", | 985 | fatal("%.200s line %d: unsupported log facility '%s'", |
984 | filename, linenum, arg ? arg : "<NONE>"); | 986 | filename, linenum, arg ? arg : "<NONE>"); |
985 | if (*intptr == -1) | 987 | if (*log_facility_ptr == -1) |
986 | *intptr = (SyslogFacility) value; | 988 | *log_facility_ptr = (SyslogFacility) value; |
987 | break; | 989 | break; |
988 | 990 | ||
989 | case sLogLevel: | 991 | case sLogLevel: |
990 | intptr = (int *) &options->log_level; | 992 | log_level_ptr = &options->log_level; |
991 | arg = strdelim(&cp); | 993 | arg = strdelim(&cp); |
992 | value = log_level_number(arg); | 994 | value = log_level_number(arg); |
993 | if (value == SYSLOG_LEVEL_NOT_SET) | 995 | if (value == SYSLOG_LEVEL_NOT_SET) |
994 | fatal("%.200s line %d: unsupported log level '%s'", | 996 | fatal("%.200s line %d: unsupported log level '%s'", |
995 | filename, linenum, arg ? arg : "<NONE>"); | 997 | filename, linenum, arg ? arg : "<NONE>"); |
996 | if (*intptr == -1) | 998 | if (*log_level_ptr == -1) |
997 | *intptr = (LogLevel) value; | 999 | *log_level_ptr = (LogLevel) value; |
998 | break; | 1000 | break; |
999 | 1001 | ||
1000 | case sAllowTcpForwarding: | 1002 | case sAllowTcpForwarding: |