summaryrefslogtreecommitdiff
path: root/usr.sbin/popa3d/startup.c
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2004-07-17 20:54:25 +0000
committerBrad Smith <brad@cvs.openbsd.org>2004-07-17 20:54:25 +0000
commit9cd0aac99160e4593314efe7856c1f4da1b6c477 (patch)
tree2a885be32785f2eca66d2d001cabcdc5ab238be5 /usr.sbin/popa3d/startup.c
parent9c135ead40bb12a1f8e24882ade5db4c1004e036 (diff)
the IPv4/IPv6 standalone mode patch has some issues so back it out for now.
requested by deraadt@
Diffstat (limited to 'usr.sbin/popa3d/startup.c')
-rw-r--r--usr.sbin/popa3d/startup.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/usr.sbin/popa3d/startup.c b/usr.sbin/popa3d/startup.c
index 206fd41f955..fc25a777b3b 100644
--- a/usr.sbin/popa3d/startup.c
+++ b/usr.sbin/popa3d/startup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: startup.c,v 1.4 2004/06/26 10:46:55 jmc Exp $ */
+/* $OpenBSD: startup.c,v 1.5 2004/07/17 20:54:24 brad Exp $ */
/*
* Command line option parsing.
@@ -8,8 +8,6 @@
#if POP_OPTIONS
-#include <sys/types.h>
-#include <sys/socket.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
@@ -32,11 +30,9 @@ extern char *__progname;
static char *progname;
#endif
-int af = PF_UNSPEC;
-
static void usage(void)
{
- fprintf(stderr, "Usage: %s [-46DV]\n", progname);
+ fprintf(stderr, "Usage: %s [-D] [-V]\n", progname);
exit(1);
}
@@ -56,20 +52,12 @@ int main(int argc, char **argv)
progname = POP_SERVER;
#endif
- while ((c = getopt(argc, argv, "DV46")) != -1) {
+ while ((c = getopt(argc, argv, "DV")) != -1) {
switch (c) {
case 'D':
standalone++;
break;
- case '4':
- af = AF_INET;
- break;
-
- case '6':
- af = AF_INET6;
- break;
-
case 'V':
version();