diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-12-10 10:28:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-12-10 10:28:41 +0000 |
| commit | 95132f4317ef872d80285fc36cd0895ceb81c2d4 (patch) | |
| tree | 94f591e2f9370ec33831a4c7a3717402146934a2 /usr.sbin/inetd/inetd.c | |
| parent | 9a9eedae6f9ba315109168d73efb4170f153acdb (diff) | |
repair various bugs in -d mode
Diffstat (limited to 'usr.sbin/inetd/inetd.c')
| -rw-r--r-- | usr.sbin/inetd/inetd.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index dd13436d8d5..b6c51628c2f 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inetd.c,v 1.57 1999/12/08 13:21:17 itojun Exp $ */ +/* $OpenBSD: inetd.c,v 1.58 1999/12/10 10:28:40 deraadt Exp $ */ /* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */ /* * Copyright (c) 1983,1991 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/ -static char rcsid[] = "$OpenBSD: inetd.c,v 1.57 1999/12/08 13:21:17 itojun Exp $"; +static char rcsid[] = "$OpenBSD: inetd.c,v 1.58 1999/12/10 10:28:40 deraadt Exp $"; #endif /* not lint */ /* @@ -672,7 +672,7 @@ config(sig) { register struct servtab *sep, *cp, **sepp; int omask; - int n; + int n, add; char protoname[10]; if (!setconfig()) { @@ -686,6 +686,7 @@ config(sig) for (sep = servtab; sep; sep = sep->se_next) if (matchconf(sep, cp)) break; + add = 0; if (sep != 0) { int i; @@ -714,12 +715,9 @@ config(sig) sep->se_rpcversh = cp->se_rpcversh; sigsetmask(omask); freeconfig(cp); - if (debug) - print_service("REDO", sep); + add = 1; } else { sep = enter(cp); - if (debug) - print_service("ADD ", sep); } sep->se_checked = 1; @@ -860,6 +858,8 @@ config(sig) free (cp); cp = getconfigent(); } + if (debug) + print_service(add ? "REDO" : "ADD", sep); } endconfig(); /* @@ -1933,7 +1933,8 @@ print_service(action, sep) fprintf(stderr, " wait.max=%hd.%d user:group=%s.%s builtin=%lx server=%s\n", - sep->se_wait, sep->se_max, sep->se_user, sep->se_group, + sep->se_wait, sep->se_max, sep->se_user, + sep->se_group ? sep->se_group : "wheel", (long)sep->se_bi, sep->se_server); } |