mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 13:57:50 +00:00
Code Issues Releases Wiki Activity

Correct ordering of log arguments.

Browse Source
This commit is contained in:
Ted Lemon
1999-10-14 17:40:05 +00:00
parent 6f2e946022
commit 1c0166794d
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
client/dhclient.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char ocopyright[] = static char ocopyright[] =
"$Id: dhclient.c,v 1.85 1999/10/12 16:00:18 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: dhclient.c,v 1.86 1999/10/14 17:40:05 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -1202,25 +1202,21 @@ void state_panic (cpp)
yet need renewal, go into BOUND state and yet need renewal, go into BOUND state and
timeout at the renewal time. */ timeout at the renewal time. */
if (!script_go (client)) { if (!script_go (client)) {
if (cur_time < if (cur_time < client -> active -> renewal) {
client -> active -> renewal) { client -> state = S_BOUND;
client -> state = S_BOUND; log_info ("bound: renewal in %ld %s.",
log_info ("bound: renewal in %s %ld.", (long)(client -> active -> renewal -
"seconds", cur_time), "seconds");
(long) add_timeout (client -> active -> renewal,
(client -> active -> renewal state_bound, client);
- cur_time)); } else {
add_timeout ((client -> client -> state = S_BOUND;
active -> renewal), log_info ("bound: immediate renewal.");
state_bound, client); state_bound (client);
} else { }
client -> state = S_BOUND; reinitialize_interfaces ();
log_info ("bound: immediate renewal."); go_daemon ();
state_bound (client); return;
}
reinitialize_interfaces ();
go_daemon ();
return;
} }
} }