[src/trunk]: src/usr.sbin/inetd Change the log that is produced when the maxi...

[rumble <rumble%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c5ddd586159
branches:  trunk
changeset: 569963:1c5ddd586159
user:      rumble <rumble%NetBSD.org@localhost>
date:      Tue Sep 14 17:42:31 2004 +0000

description:
Change the log that is produced when the maximum spawn count per
last 60 second interval is reached to more accurately reflect
what has happened.

Also, break up a few long strings, obey 80 columns, and remove a
superfluous newline passed to syslog(3).

diffstat:

 usr.sbin/inetd/inetd.c |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 0fd2e998e514 -r 1c5ddd586159 usr.sbin/inetd/inetd.c
--- a/usr.sbin/inetd/inetd.c    Tue Sep 14 17:40:59 2004 +0000
+++ b/usr.sbin/inetd/inetd.c    Tue Sep 14 17:42:31 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inetd.c,v 1.95 2004/01/25 10:00:17 cube Exp $  */
+/*     $NetBSD: inetd.c,v 1.96 2004/09/14 17:42:31 rumble Exp $        */
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)inetd.c    8.4 (Berkeley) 4/13/94";
 #else
-__RCSID("$NetBSD: inetd.c,v 1.95 2004/01/25 10:00:17 cube Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.96 2004/09/14 17:42:31 rumble Exp $");
 #endif
 #endif /* not lint */
 
@@ -550,9 +550,10 @@
                        if (ev->ident != sep->se_fd)
                                continue;
                        if (debug)
-                               fprintf(stderr, "someone wants %s\n", sep->se_service);
+                               fprintf(stderr, "someone wants %s\n",
+                                   sep->se_service);
                        if (!sep->se_wait && sep->se_socktype == SOCK_STREAM) {
-                               /* XXX here do the libwrap check-before-accept */
+                               /* XXX here do the libwrap check-before-accept*/
                                ctrl = accept(sep->se_fd, NULL, NULL);
                                if (debug)
                                        fprintf(stderr, "accept, ctrl %d\n",
@@ -595,8 +596,10 @@
                                sep->se_count = 1;
                        } else {
                                syslog(LOG_ERR,
-                       "%s/%s server failing (looping), service terminated\n",
-                                   sep->se_service, sep->se_proto);
+                                   "%s/%s max spawn rate (%d in %d seconds) "
+                                   "exceeded; service not started",
+                                   sep->se_service, sep->se_proto,
+                                   sep->se_max, CNT_INTVL);
                                if (!sep->se_wait && sep->se_socktype ==
                                    SOCK_STREAM)
                                        close(ctrl);
@@ -883,7 +886,8 @@
                        s = socket(sep->se_family, SOCK_DGRAM, 0);
                        if (s < 0) {
                                syslog(LOG_WARNING,
-"%s/%s: %s: the address family is not supported by the kernel",
+                                   "%s/%s: %s: the address family is not "
+                                   "supported by the kernel",
                                    sep->se_service, sep->se_proto,
                                    sep->se_hostaddr);
                                sep->se_checked = 0;