diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-13 02:00:52 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-13 02:00:52 +0000 |
| commit | 01f0de988ed6f359b1eb3a2c939621e1627d796b (patch) | |
| tree | 90fcf63bdbf5ed5dce16eeb8801caadc3c8de727 /usr.sbin | |
| parent | 5c4ae5509e3b5a8644567b51cc0829d7a11c4599 (diff) | |
remove the quiet option, we're being quiet by default
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/dhcrelay/dhcrelay.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/dhcrelay/dhcrelay.c | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/usr.sbin/dhcrelay/dhcrelay.8 b/usr.sbin/dhcrelay/dhcrelay.8 index 6078ab8f893..d81455d3bf7 100644 --- a/usr.sbin/dhcrelay/dhcrelay.8 +++ b/usr.sbin/dhcrelay/dhcrelay.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcrelay.8,v 1.2 2004/04/13 01:17:49 henning Exp $ +.\" $OpenBSD: dhcrelay.8,v 1.3 2004/04/13 02:00:50 henning Exp $ .\" .\" Copyright (c) 1997 The Internet Software Consortium. .\" All rights reserved. @@ -45,7 +45,6 @@ .Sh SYNOPSIS .Nm .Op Fl d -.Op Fl q .Op Fl p Ar port .Fl i Ar interface .Ar server0 Op Ar ... serverN @@ -104,13 +103,6 @@ to always run as a foreground process, the .Fl d flag should be specified. .Pp -.Nm -will normally print its network configuration on startup. -This can be annoying in a system startup script \- to disable this -behaviour, specify the -.Fl q -flag. -.Pp The name of at least one DHCP server to which DHCP and BOOTP requests should be relayed must be specified on the command line. .Sh SEE ALSO diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c index 548ae897650..0f12d3c7871 100644 --- a/usr.sbin/dhcrelay/dhcrelay.c +++ b/usr.sbin/dhcrelay/dhcrelay.c @@ -64,7 +64,7 @@ struct server_list { int main(int argc, char *argv[]) { - int ch, quiet = 0, no_daemon = 0; + int ch, no_daemon = 0; extern char *__progname; struct servent *ent; struct server_list *sp = NULL; @@ -74,7 +74,7 @@ main(int argc, char *argv[]) openlog(__progname, LOG_NDELAY, DHCPD_LOG_FACILITY); setlogmask(LOG_UPTO(LOG_INFO)); - while ((ch = getopt(argc, argv, "di:p:q")) != -1) { + while ((ch = getopt(argc, argv, "di:p:")) != -1) { switch (ch) { case 'd': no_daemon = 1; @@ -91,9 +91,6 @@ main(int argc, char *argv[]) case 'p': local_port = htons(atoi(optarg)); break; - case 'q': - quiet = 1; - break; default: usage(); /* not reached */ @@ -130,8 +127,7 @@ main(int argc, char *argv[]) argv++; } - if (!quiet) - log_perror = 0; + log_perror = 0; if (interfaces == NULL) error("no interface given"); |