BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / named / ns_maint.c

diff --git a/usr/src/usr.sbin/named/ns_maint.c b/usr/src/usr.sbin/named/ns_maint.c
index f8b2337..48bc78a 100644 (file)
--- a/usr/src/usr.sbin/named/ns_maint.c
+++ b/usr/src/usr.sbin/named/ns_maint.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1986, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1986, 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ns_maint.c 4.37 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)ns_maint.c 4.39 (Berkeley) 3/2/91";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -371,7 +385,7 @@ union wait {
  * SIGCHLD signal handler: process exit of xfer's.
  * (Note: also called when outgoing transfer completes.)
  */
  * SIGCHLD signal handler: process exit of xfer's.
  * (Note: also called when outgoing transfer completes.)
  */

-VOID
+SIG_FN

 endxfer()
 {
        register struct zoneinfo *zp;   
 endxfer()
 {
        register struct zoneinfo *zp;   


@@ -386,7 +400,8 @@ endxfer()
        status.w_retcode = stat >> 8;
        }
 #else /* SYSV */
        status.w_retcode = stat >> 8;
        }
 #else /* SYSV */

-       while ((pid = wait3(&status, WNOHANG, (struct rusage *)NULL)) > 0) {
+       while ((pid =
+           wait3((int *)&status, WNOHANG, (struct rusage *)NULL)) > 0) {

 #endif /* SYSV */
                for (zp = zones; zp < &zones[nzones]; zp++)
                    if (zp->z_xferpid == pid) {
 #endif /* SYSV */
                for (zp = zones; zp < &zones[nzones]; zp++)
                    if (zp->z_xferpid == pid) {