summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Lemon <source@isc.org>1996-05-31 18:18:10 +0000
committerTed Lemon <source@isc.org>1996-05-31 18:18:10 +0000
commit91c879c406c79dedac52744026fbbe01687808c4 (patch)
tree959f7dd165d5ccddb8973fb80bb3a3a376cd3b84
parentf57589dba85d1987ed006dc5ccf9c0c37a6a0252 (diff)
downloadisc-dhcp-91c879c406c79dedac52744026fbbe01687808c4.tar.gz
Lose bogus -a processing; display startup banner
-rw-r--r--dhcpd.c24
-rw-r--r--server/dhcpd.c24
2 files changed, 14 insertions, 34 deletions
diff --git a/dhcpd.c b/dhcpd.c
index 26ffa4d5..327ff7c9 100644
--- a/dhcpd.c
+++ b/dhcpd.c
@@ -42,7 +42,9 @@
#ifndef lint
static char copyright[] =
-"@(#) Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
+"Copyright 1995, 1996 The Internet Software Consortium.";
+static char arr [] = "All rights reserved.\n";
+static char message [] = "Internet Software Consortium DHCPD version $Name: $";
#endif /* not lint */
#include "dhcpd.h"
@@ -106,6 +108,10 @@ int main (argc, argv, envp)
/* Become session leader and get pid... */
pid = setsid ();
#endif
+ note (message);
+ note (copyright);
+ note (arr);
+
for (i = 1; i < argc; i++) {
if (!strcmp (argv [i], "-p")) {
if (++i == argc)
@@ -113,22 +119,6 @@ int main (argc, argv, envp)
server_port = htons (atoi (argv [i]));
debug ("binding to user-specified port %d",
ntohs (server_port));
-#if 0
- } else if (!strcmp (argv [i], "-a")) {
- if (++i == argc)
- usage ();
- if (inet_aton (argv [i], &addr)) {
- addrtree =
- tree_concat (addrtree,
- tree_const
- ((unsigned char *)&addr,
- sizeof addr));
- } else {
- addrtree = tree_concat (addrtree,
- tree_host_lookup
- (argv [i]));
- }
-#endif
} else
usage ();
}
diff --git a/server/dhcpd.c b/server/dhcpd.c
index 26ffa4d5..327ff7c9 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -42,7 +42,9 @@
#ifndef lint
static char copyright[] =
-"@(#) Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
+"Copyright 1995, 1996 The Internet Software Consortium.";
+static char arr [] = "All rights reserved.\n";
+static char message [] = "Internet Software Consortium DHCPD version $Name: $";
#endif /* not lint */
#include "dhcpd.h"
@@ -106,6 +108,10 @@ int main (argc, argv, envp)
/* Become session leader and get pid... */
pid = setsid ();
#endif
+ note (message);
+ note (copyright);
+ note (arr);
+
for (i = 1; i < argc; i++) {
if (!strcmp (argv [i], "-p")) {
if (++i == argc)
@@ -113,22 +119,6 @@ int main (argc, argv, envp)
server_port = htons (atoi (argv [i]));
debug ("binding to user-specified port %d",
ntohs (server_port));
-#if 0
- } else if (!strcmp (argv [i], "-a")) {
- if (++i == argc)
- usage ();
- if (inet_aton (argv [i], &addr)) {
- addrtree =
- tree_concat (addrtree,
- tree_const
- ((unsigned char *)&addr,
- sizeof addr));
- } else {
- addrtree = tree_concat (addrtree,
- tree_host_lookup
- (argv [i]));
- }
-#endif
} else
usage ();
}