Order of fields in DHCPv6 log lines now consistent with DHCPv4

This commit is contained in:
Simon Kelley
2012-02-27 11:49:37 +00:00
parent c239f7de25
commit 58dc02ebf2

View File

@@ -1341,19 +1341,19 @@ static void log6_packet(char *type, unsigned char *clid, int clid_len, struct in
daemon->dhcp_buff2[0] = 0; daemon->dhcp_buff2[0] = 0;
if(option_bool(OPT_LOG_OPTS)) if(option_bool(OPT_LOG_OPTS))
my_syslog(MS_DHCP | LOG_INFO, "%u %s(%s) %s %s%s", my_syslog(MS_DHCP | LOG_INFO, "%u %s(%s) %s%s %s",
xid, xid,
type, type,
iface, iface,
daemon->namebuff,
daemon->dhcp_buff2, daemon->dhcp_buff2,
daemon->namebuff,
string ? string : ""); string ? string : "");
else else
my_syslog(MS_DHCP | LOG_INFO, "%s(%s) %s %s%s", my_syslog(MS_DHCP | LOG_INFO, "%s(%s) %s%s %s",
type, type,
iface, iface,
daemon->namebuff,
daemon->dhcp_buff2, daemon->dhcp_buff2,
daemon->namebuff,
string ? string : ""); string ? string : "");
} }