BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / sendmail / src / conf.c

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index efe7819..48a978c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -3,23 +3,37 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 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[] = "@(#)conf.c     5.26 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)conf.c     5.28 (Berkeley) 3/12/91";

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


@@ -156,6 +170,7 @@ setdefaults()
        FileMode = 0644;
        DefUid = 1;
        DefGid = 1;
        FileMode = 0644;
        DefUid = 1;
        DefGid = 1;

+       CheckpointInterval = 10;

        setdefuser();
 }
 
        setdefuser();
 }
 


@@ -224,7 +239,6 @@ username()
        static char *myname = NULL;
        extern char *getlogin();
        register struct passwd *pw;
        static char *myname = NULL;
        extern char *getlogin();
        register struct passwd *pw;

-       extern struct passwd *getpwuid();

 
        /* cache the result */
        if (myname == NULL)
 
        /* cache the result */
        if (myname == NULL)


@@ -549,17 +563,18 @@ setproctitle(fmt, a, b, c)
 # include <sys/wait.h>
 # endif VMUNIX
 
 # include <sys/wait.h>
 # endif VMUNIX
 

+void

 reapchild()
 {
 # ifdef WNOHANG
        union wait status;
 
 reapchild()
 {
 # ifdef WNOHANG
        union wait status;
 

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

                continue;
 # else WNOHANG
        auto int status;
 
                continue;
 # else WNOHANG
        auto int status;
 

-       while (wait(&status) > 0)
+       while (wait((int *)&status) > 0)

                continue;
 # endif WNOHANG
 }
                continue;
 # endif WNOHANG
 }