BSD 4_3_Net_2 release

[unix-history] / usr / src / libexec / uucpd / uucpd.c

diff --git a/usr/src/libexec/uucpd/uucpd.c b/usr/src/libexec/uucpd/uucpd.c
index f865587..76a994c 100644 (file)
--- a/usr/src/libexec/uucpd/uucpd.c
+++ b/usr/src/libexec/uucpd/uucpd.c
@@ -5,19 +5,33 @@
  * This code is derived from software contributed to Berkeley by
  * Rick Adams.
  *
  * This code is derived from software contributed to Berkeley by
  * Rick Adams.
  *

- * 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


@@ -27,7 +41,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)uucpd.c    5.9 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)uucpd.c    5.10 (Berkeley) 2/26/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -36,16 +50,21 @@ static char sccsid[] = "@(#)uucpd.c 5.9 (Berkeley) 6/1/90";
  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

-#include <sys/socket.h>

 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>

-#include <sys/file.h>
+#include <sys/socket.h>

 #include <netinet/in.h>
 #include <netinet/in.h>

+#include <arpa/inet.h>

 #include <netdb.h>
 #include <signal.h>
 #include <netdb.h>
 #include <signal.h>

-#include <errno.h>
+#include <fcntl.h>
+#include <time.h>

 #include <pwd.h>
 #include <pwd.h>

+#include <unistd.h>
+#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 #include "pathnames.h"
 
 struct sockaddr_in hisctladdr;
 #include "pathnames.h"
 
 struct sockaddr_in hisctladdr;


@@ -221,9 +240,9 @@ dologout()
        int pid, wtmp;
 
 #ifdef BSDINETD
        int pid, wtmp;
 
 #ifdef BSDINETD

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

 #else  !BSDINETD
 #else  !BSDINETD

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

 #endif !BSDINETD
                wtmp = open(_PATH_WTMP, O_WRONLY|O_APPEND);
                if (wtmp >= 0) {
 #endif !BSDINETD
                wtmp = open(_PATH_WTMP, O_WRONLY|O_APPEND);
                if (wtmp >= 0) {


@@ -247,7 +266,7 @@ struct sockaddr_in *sin;
        char line[32];
        char remotehost[32];
        int wtmp, f;
        char line[32];
        char remotehost[32];
        int wtmp, f;

-       struct hostent *hp = gethostbyaddr(&sin->sin_addr,
+       struct hostent *hp = gethostbyaddr((char *)&sin->sin_addr,

                sizeof (struct in_addr), AF_INET);
 
        if (hp) {
                sizeof (struct in_addr), AF_INET);
 
        if (hp) {