Module Name: src
Committed By: christos
Date: Tue Aug 16 16:36:38 UTC 2011
Modified Files:
src/dist/dhcp/common: dns.c
src/dist/dhcp/dhcpctl: omshell.c
src/dist/dhcp/server: ddns.c
Log Message:
gcc-4.5 fixes
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/dist/dhcp/common/dns.c
cvs rdiff -u -r1.5 -r1.6 src/dist/dhcp/dhcpctl/omshell.c
cvs rdiff -u -r1.7 -r1.8 src/dist/dhcp/server/ddns.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/dhcp/common/dns.c
diff -u src/dist/dhcp/common/dns.c:1.6 src/dist/dhcp/common/dns.c:1.7
--- src/dist/dhcp/common/dns.c:1.6 Thu Aug 11 13:13:21 2005
+++ src/dist/dhcp/common/dns.c Tue Aug 16 12:36:38 2011
@@ -33,7 +33,7 @@
#ifndef lint
static char copyright[] =
-"$Id: dns.c,v 1.6 2005/08/11 17:13:21 drochner Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
+"$Id: dns.c,v 1.7 2011/08/16 16:36:38 christos Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -713,18 +713,23 @@
result = minires_nupdate (&resolver_state, ISC_LIST_HEAD (updqueue));
if (result != ISC_R_SUCCESS) {
- if (result == YXRRSET || result == YXDOMAIN ||
- result == NXRRSET || result == NXDOMAIN)
+ switch ((ns_rcode)result) {
+ case YXRRSET:
+ case YXDOMAIN:
+ case NXRRSET:
+ case NXDOMAIN:
log_error ("Forward map from %.*s to %s already in use",
(int)ddns_fwd_name -> len,
(const char *)ddns_fwd_name -> data,
ddns_address);
- else
+ break;
+ default:
log_error ("Can't update forward map %.*s to %s: %s",
(int)ddns_fwd_name -> len,
(const char *)ddns_fwd_name -> data,
ddns_address, isc_result_totext (result));
-
+ break;
+ }
} else {
log_info ("Added new forward map from %.*s to %s",
(int)ddns_fwd_name -> len,
Index: src/dist/dhcp/dhcpctl/omshell.c
diff -u src/dist/dhcp/dhcpctl/omshell.c:1.5 src/dist/dhcp/dhcpctl/omshell.c:1.6
--- src/dist/dhcp/dhcpctl/omshell.c:1.5 Thu Aug 11 13:13:21 2005
+++ src/dist/dhcp/dhcpctl/omshell.c Tue Aug 16 12:36:38 2011
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
-"$Id: omshell.c,v 1.5 2005/08/11 17:13:21 drochner Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
+"$Id: omshell.c,v 1.6 2011/08/16 16:36:38 christos Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include <time.h>
@@ -182,7 +182,7 @@
check(status, "new_parse()");
token = next_token (&val, (unsigned *)0, cfile);
- switch (token) {
+ switch ((int)token) {
default:
parse_warn (cfile, "unknown token: %s", val);
skip_to_semi (cfile);
Index: src/dist/dhcp/server/ddns.c
diff -u src/dist/dhcp/server/ddns.c:1.7 src/dist/dhcp/server/ddns.c:1.8
--- src/dist/dhcp/server/ddns.c:1.7 Thu Aug 11 13:13:30 2005
+++ src/dist/dhcp/server/ddns.c Tue Aug 16 12:36:38 2011
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
-"$Id: ddns.c,v 1.7 2005/08/11 17:13:30 drochner Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n";
+"$Id: ddns.c,v 1.8 2011/08/16 16:36:38 christos Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -724,7 +724,7 @@
try_rev:
if (find_bound_string (&ddns_rev_name,
lease -> scope, "ddns-rev-name")) {
- if (ddns_remove_ptr(&ddns_rev_name) == NOERROR) {
+ if ((ns_rcode)ddns_remove_ptr(&ddns_rev_name) == NOERROR) {
unset (lease -> scope, "ddns-rev-name");
if (client_updated)
unset (lease -> scope,
