summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorMark Andrews <marka@isc.org>2010-09-09 06:52:37 +0000
committerMark Andrews <marka@isc.org>2010-09-09 06:52:37 +0000
commit3f4082addd406eb886549c8e7b0ff32c742c8090 (patch)
treee621452d55b2f07df6afd9ba839c1f2fa2826146 /server
parentf26c4a0bef7e566b33e142b2681da2a038c8f61d (diff)
downloadisc-dhcp-3f4082addd406eb886549c8e7b0ff32c742c8090.tar.gz
address builds where sizeof != int
Diffstat (limited to 'server')
-rw-r--r--server/dhcp.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/server/dhcp.c b/server/dhcp.c
index 374671c1..9d42a7ac 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -1086,8 +1086,9 @@ void dhcpinform (packet, ms_nulltp)
i = d1.len;
if (i >= sizeof(raw.file)) {
log_info("file name longer than packet field "
- "truncated - field: %d name: %d %.*s",
- sizeof(raw.file), i, i, d1.data);
+ "truncated - field: %lu name: %d %.*s",
+ (unsigned long)sizeof(raw.file), i, i,
+ d1.data);
i = sizeof(raw.file);
} else
raw.file[i] = 0;
@@ -1105,8 +1106,9 @@ void dhcpinform (packet, ms_nulltp)
i = d1.len;
if (i >= sizeof(raw.sname)) {
log_info("server name longer than packet field "
- "truncated - field: %d name: %d %.*s",
- sizeof(raw.sname), i, i, d1.data);
+ "truncated - field: %lu name: %d %.*s",
+ (unsigned long)sizeof(raw.sname), i, i,
+ d1.data);
i = sizeof(raw.sname);
} else
raw.sname[i] = 0;
@@ -3018,9 +3020,10 @@ void dhcp_reply (lease)
(sizeof raw.file) - state -> filename.len);
else
log_info("file name longer than packet field "
- "truncated - field: %d name: %d %.*s",
- sizeof(raw.file), state->filename.len,
- state->filename.len, state->filename.data);
+ "truncated - field: %lu name: %d %.*s",
+ (unsigned long)sizeof(raw.file),
+ state->filename.len, state->filename.len,
+ state->filename.data);
} else
bufs |= 1;
@@ -3036,8 +3039,9 @@ void dhcp_reply (lease)
(sizeof raw.sname) - state -> server_name.len);
else
log_info("server name longer than packet field "
- "truncated - field: %d name: %d %.*s",
- sizeof(raw.sname), state->server_name.len,
+ "truncated - field: %lu name: %d %.*s",
+ (unsigned long)sizeof(raw.sname),
+ state->server_name.len,
state->server_name.len,
state->server_name.data);
} else