2
0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 22:35:25 +00:00

[master] Merge branch 'rt25901_atf'

Conflicts:
	configure
This commit is contained in:
Tomek Mrugalski
2012-08-14 15:20:46 +02:00
39 changed files with 5487 additions and 1424 deletions

View File

@@ -58,7 +58,9 @@ static const char url [] =
# undef group
#endif /* PARANOIA */
#ifndef UNIT_TEST
static void usage(void);
#endif
struct iaddr server_identifier;
int server_identifier_matched;
@@ -1200,7 +1202,7 @@ void postdb_startup (void)
}
/* Print usage message. */
#ifndef UNIT_TEST
static void
usage(void) {
log_info("%s %s", message, PACKAGE_VERSION);
@@ -1224,6 +1226,7 @@ usage(void) {
" [-pf pid-file] [--no-pid] [-s server]\n"
" [if0 [...ifN]]");
}
#endif
void lease_pinged (from, packet, length)
struct iaddr from;