summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Lemon <source@isc.org>2002-02-20 22:28:18 +0000
committerTed Lemon <source@isc.org>2002-02-20 22:28:18 +0000
commitec6d75fbf9ac032506124b228aad89fd0d31dbcc (patch)
treeca3fbc23f10a38e75a52b74f6148d5eb5aaf4baa
parent16515ad4e953c5edda10372e9385f3f6de5703ba (diff)
downloadisc-dhcp-ec6d75fbf9ac032506124b228aad89fd0d31dbcc.tar.gz
Fix up some conversion warnings.
-rw-r--r--common/dns.c25
-rw-r--r--server/ddns.c20
2 files changed, 26 insertions, 19 deletions
diff --git a/common/dns.c b/common/dns.c
index dab20368..897d78da 100644
--- a/common/dns.c
+++ b/common/dns.c
@@ -42,7 +42,7 @@
#ifndef lint
static char copyright[] =
-"$Id: dns.c,v 1.35.2.11 2002/02/09 03:17:19 mellon Exp $ Copyright (c) 2001 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dns.c,v 1.35.2.12 2002/02/20 22:28:17 mellon Exp $ Copyright (c) 2001 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -633,8 +633,8 @@ isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
if (result == ISC_R_SUCCESS) {
log_info ("Added new forward map from %.*s to %s",
- ddns_fwd_name -> len,
- ddns_fwd_name -> data, ddns_address);
+ (int)ddns_fwd_name -> len,
+ (const char *)ddns_fwd_name -> data, ddns_address);
goto error;
}
@@ -654,8 +654,8 @@ isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
if (result != (rrsetp ? ISC_R_YXRRSET : ISC_R_YXDOMAIN)) {
log_error ("Unable to add forward map from %.*s to %s: %s",
- ddns_fwd_name -> len,
- ddns_fwd_name -> data, ddns_address,
+ (int)ddns_fwd_name -> len,
+ (const char *)ddns_fwd_name -> data, ddns_address,
isc_result_totext (result));
goto error;
}
@@ -729,18 +729,19 @@ isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
if (result == YXRRSET || result == YXDOMAIN ||
result == NXRRSET || result == NXDOMAIN)
log_error ("Forward map from %.*s to %s already in use",
- ddns_fwd_name -> len,
- ddns_fwd_name -> data, ddns_address);
+ (int)ddns_fwd_name -> len,
+ (const char *)ddns_fwd_name -> data,
+ ddns_address);
else
log_error ("Can't update forward map %.*s to %s: %s",
- ddns_fwd_name -> len,
- ddns_fwd_name -> data, ddns_address,
- isc_result_totext (result));
+ (int)ddns_fwd_name -> len,
+ (const char *)ddns_fwd_name -> data,
+ ddns_address, isc_result_totext (result));
} else {
log_info ("Added new forward map from %.*s to %s",
- ddns_fwd_name -> len,
- ddns_fwd_name -> data, ddns_address);
+ (int)ddns_fwd_name -> len,
+ (const char *)ddns_fwd_name -> data, ddns_address);
}
#if defined (DEBUG_DNS_UPDATES)
print_dns_status ((int)result, &updqueue);
diff --git a/server/ddns.c b/server/ddns.c
index 7b433523..6aae2c46 100644
--- a/server/ddns.c
+++ b/server/ddns.c
@@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
-"$Id: ddns.c,v 1.15.2.8 2002/02/20 07:18:35 mellon Exp $ Copyright (c) 2000-2001 The Internet Software Consortium. All rights reserved.\n";
+"$Id: ddns.c,v 1.15.2.9 2002/02/20 22:28:18 mellon Exp $ Copyright (c) 2000-2001 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -126,12 +126,16 @@ static isc_result_t ddns_update_ptr (struct data_string *ddns_fwd_name,
#endif
if (result == ISC_R_SUCCESS) {
log_info ("added reverse map from %.*s to %.*s",
- ddns_rev_name -> len, ddns_rev_name -> data,
- ddns_fwd_name -> len, ddns_fwd_name -> data);
+ (int)ddns_rev_name -> len,
+ (const char *)ddns_rev_name -> data,
+ (int)ddns_fwd_name -> len,
+ (const char *)ddns_fwd_name -> data);
} else {
log_error ("unable to add reverse map from %.*s to %.*s: %s",
- ddns_rev_name -> len, ddns_rev_name -> data,
- ddns_fwd_name -> len, ddns_fwd_name -> data,
+ (int)ddns_rev_name -> len,
+ (const char *)ddns_rev_name -> data,
+ (int)ddns_fwd_name -> len,
+ (const char *)ddns_fwd_name -> data,
isc_result_totext (result));
}
@@ -191,11 +195,13 @@ static isc_result_t ddns_remove_ptr (struct data_string *ddns_rev_name)
#endif
if (result == ISC_R_SUCCESS) {
log_info ("removed reverse map on %.*s",
- ddns_rev_name -> len, ddns_rev_name -> data);
+ (int)ddns_rev_name -> len,
+ (const char *)ddns_rev_name -> data);
} else {
if (result != ISC_R_NXRRSET && result != ISC_R_NXDOMAIN)
log_error ("can't remove reverse map on %.*s: %s",
- ddns_rev_name -> len, ddns_rev_name -> data,
+ (int)ddns_rev_name -> len,
+ (const char *)ddns_rev_name -> data,
isc_result_totext (result));
}