As with wall and syslogd, talkd wasn't strictly terminating the string

it passes to ttymsg() (and strcmp()). I also got rid of some magic
constants.
From: Craig Leres <leres@ee.lbl.gov>

SCCS-vsn: libexec/talkd/process.c 8.2
SCCS-vsn: libexec/talkd/process.c 8.2

diff --git a/usr/src/libexec/talkd/process.c b/usr/src/libexec/talkd/process.c
index ead1588..4807f64 100644 (file)
--- a/usr/src/libexec/talkd/process.c
+++ b/usr/src/libexec/talkd/process.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)process.c  8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)process.c  8.2 (Berkeley) %G%";

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


@@ -156,7 +156,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);


@@ -167,19 +168,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;
                        }