Module Name: src
Committed By: christos
Date: Tue Apr 9 16:38:21 UTC 2013
Modified Files:
src/usr.sbin/sup/source: supfilesrv.c
Log Message:
return busy for checkchild instead of killing the connection
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.sbin/sup/source/supfilesrv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sup/source/supfilesrv.c
diff -u src/usr.sbin/sup/source/supfilesrv.c:1.49 src/usr.sbin/sup/source/supfilesrv.c:1.50
--- src/usr.sbin/sup/source/supfilesrv.c:1.49 Fri Mar 8 15:58:35 2013
+++ src/usr.sbin/sup/source/supfilesrv.c Tue Apr 9 12:38:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: supfilesrv.c,v 1.49 2013/03/08 20:58:35 christos Exp $ */
+/* $NetBSD: supfilesrv.c,v 1.50 2013/04/09 16:38:18 christos Exp $ */
/*
* Copyright (c) 1992 Carnegie Mellon University
@@ -496,7 +496,7 @@ main(int argc, char **argv)
* If we are being bombarded, don't even spend time forking
* or conversing
*/
- if (nchildren >= maxchildren || !checkchild()) {
+ if (nchildren > maxchildren) {
(void) servicekill();
continue;
}
@@ -1011,7 +1011,7 @@ srvsetup(void)
if (x < 0)
goaway("Can't stat base/prefix directory (%s)",
strerror(errno));
- if (nchildren >= maxchildren) {
+ if (nchildren >= maxchildren || !checkchild()) {
setupack = FSETUPBUSY;
(void) msgsetupack();
if (protver >= 6)
