BSD 4_4_Lite1 release

[unix-history] / usr / src / libexec / talkd / process.c

diff --git a/usr/src/libexec/talkd/process.c b/usr/src/libexec/talkd/process.c
index d8f3351..dd05e6b 100644 (file)
--- a/usr/src/libexec/talkd/process.c
+++ b/usr/src/libexec/talkd/process.c
@@ -1,24 +1,38 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The 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[] = "@(#)process.c  5.9 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)process.c  8.2 (Berkeley) 11/16/93";

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


@@ -29,17 +43,17 @@ static char sccsid[] = "@(#)process.c       5.9 (Berkeley) 6/1/90";
  *               in the table for the local user
  *     DELETE - delete invitation
  */
  *               in the table for the local user
  *     DELETE - delete invitation
  */

-#include <sys/types.h>
+#include <sys/param.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <stdio.h>
-#include <syslog.h>
-#include <netdb.h>
+#include <sys/socket.h>

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

-

 #include <protocols/talkd.h>
 #include <protocols/talkd.h>

+#include <netdb.h>
+#include <syslog.h>
+#include <stdio.h>
+#include <string.h>

 #include <paths.h>
 
 #include <paths.h>
 

-char   *strcpy();

 CTL_MSG *find_request();
 CTL_MSG *find_match();
 
 CTL_MSG *find_request();
 CTL_MSG *find_match();
 


@@ -129,7 +143,7 @@ do_announce(mp, rp)
                return;
        }
 #define        satosin(sa)     ((struct sockaddr_in *)(sa))
                return;
        }
 #define        satosin(sa)     ((struct sockaddr_in *)(sa))

-       hp = gethostbyaddr(&satosin(&mp->ctl_addr)->sin_addr,
+       hp = gethostbyaddr((char *)&satosin(&mp->ctl_addr)->sin_addr,

                sizeof (struct in_addr), AF_INET);
        if (hp == (struct hostent *)0) {
                rp->answer = MACHINE_UNKNOWN;
                sizeof (struct in_addr), AF_INET);
        if (hp == (struct hostent *)0) {
                rp->answer = MACHINE_UNKNOWN;


@@ -168,7 +182,8 @@ find_user(name, tty)
        int status;
        FILE *fd;
        struct stat statb;
        int status;
        FILE *fd;
        struct stat statb;

-       char ftty[20];
+       char line[sizeof(ubuf.ut_line) + 1];
+       char ftty[sizeof(_PATH_DEV) - 1 + sizeof(line)];

 
        if ((fd = fopen(_PATH_UTMP, "r")) == NULL) {
                fprintf(stderr, "talkd: can't read %s.\n", _PATH_UTMP);
 
        if ((fd = fopen(_PATH_UTMP, "r")) == NULL) {
                fprintf(stderr, "talkd: can't read %s.\n", _PATH_UTMP);


@@ -179,19 +194,22 @@ find_user(name, tty)
        (void) strcpy(ftty, _PATH_DEV);
        while (fread((char *) &ubuf, sizeof ubuf, 1, fd) == 1)
                if (SCMPN(ubuf.ut_name, name) == 0) {
        (void) strcpy(ftty, _PATH_DEV);
        while (fread((char *) &ubuf, sizeof ubuf, 1, fd) == 1)
                if (SCMPN(ubuf.ut_name, name) == 0) {

+                       strncpy(line, ubuf.ut_line, sizeof(ubuf.ut_line));
+                       line[sizeof(ubuf.ut_line)] = '\0';

                        if (*tty == '\0') {
                                status = PERMISSION_DENIED;
                                /* no particular tty was requested */
                        if (*tty == '\0') {
                                status = PERMISSION_DENIED;
                                /* no particular tty was requested */

-                               (void) strcpy(ftty+5, ubuf.ut_line);
-                               if (stat(ftty,&statb) == 0) {
+                               (void) strcpy(ftty + sizeof(_PATH_DEV) - 1,
+                                   line);
+                               if (stat(ftty, &statb) == 0) {

                                        if (!(statb.st_mode & 020))
                                                continue;
                                        if (!(statb.st_mode & 020))
                                                continue;

-                                       (void) strcpy(tty, ubuf.ut_line);
+                                       (void) strcpy(tty, line);

                                        status = SUCCESS;
                                        break;
                                }
                        }
                                        status = SUCCESS;
                                        break;
                                }
                        }

-                       if (strcmp(ubuf.ut_line, tty) == 0) {
+                       if (strcmp(line, tty) == 0) {

                                status = SUCCESS;
                                break;
                        }
                                status = SUCCESS;
                                break;
                        }