From 9382c11c2bbb640e84fb6f68dfeca2694257ca12 Mon Sep 17 00:00:00 2001 From: Mike Karels Date: Sat, 12 Apr 1986 22:50:48 -0800 Subject: [PATCH] write => tty SCCS-vsn: usr.bin/talk/Makefile 5.4 SCCS-vsn: bin/Makefile 5.17 SCCS-vsn: usr.bin/login/login.c 5.15 SCCS-vsn: usr.bin/login/login.c.1 5.15 SCCS-vsn: usr.bin/login/login.c 5.15 SCCS-vsn: usr.bin/login/login.c.1 5.15 --- usr/src/bin/Makefile | 10 +++++----- usr/src/usr.bin/login/login.c | 12 ++++++------ usr/src/usr.bin/login/login.c.1 | 12 ++++++------ usr/src/usr.bin/talk/Makefile | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/usr/src/bin/Makefile b/usr/src/bin/Makefile index 90966191f8..16a4dc04b0 100644 --- a/usr/src/bin/Makefile +++ b/usr/src/bin/Makefile @@ -3,7 +3,7 @@ # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # -# @(#)Makefile 5.16 (Berkeley) %G% +# @(#)Makefile 5.17 (Berkeley) %G% # DESTDIR= CFLAGS= -O @@ -39,9 +39,9 @@ OPERATOR= df # KMEM= ps -# Programs that must run set-group-id write. +# Programs that must run set-group-id tty. # -WRITE= write +TTY= tty BINS= ${STD} ${NSTD} ${SETUID} ${OPERATOR} ${KMEM} ${WRITE} cp mv strip @@ -74,8 +74,8 @@ install: (install -g operator -m 2755 -s $$i ${DESTDIR}/bin/$$i); done -for i in ${KMEM}; do \ (install -g kmem -m 2755 -s $$i ${DESTDIR}/bin/$$i); done - -for i in ${WRITE}; do \ - (install -g write -m 2755 -s $$i ${DESTDIR}/bin/$$i); done + -for i in ${TTY}; do \ + (install -g tty -m 2755 -s $$i ${DESTDIR}/bin/$$i); done rm -f ${DESTDIR}/bin/[; ln ${DESTDIR}/bin/test ${DESTDIR}/bin/[ rm -f ${DESTDIR}/bin/e; ln ${DESTDIR}/bin/ed ${DESTDIR}/bin/e rm -f ${DESTDIR}/bin/chfn; ln ${DESTDIR}/bin/passwd ${DESTDIR}/bin/chfn diff --git a/usr/src/usr.bin/login/login.c b/usr/src/usr.bin/login/login.c index d8e5a44900..87b65d87cf 100644 --- a/usr/src/usr.bin/login/login.c +++ b/usr/src/usr.bin/login/login.c @@ -11,7 +11,7 @@ char copyright[] = #endif not lint #ifndef lint -static char sccsid[] = "@(#)login.c 5.14 (Berkeley) %G%"; +static char sccsid[] = "@(#)login.c 5.15 (Berkeley) %G%"; #endif not lint /* @@ -38,8 +38,8 @@ static char sccsid[] = "@(#)login.c 5.14 (Berkeley) %G%"; #include #include -#define WRITENAME "write" /* name of group to own ttys */ -#define WRITEGID(gid) write_gid(gid) /* gid that owns all ttys */ +#define TTYGRPNAME "tty" /* name of group to own ttys */ +#define TTYGID(gid) tty_gid(gid) /* gid that owns all ttys */ #define SCMPN(a, b) strncmp(a, b, sizeof(a)) #define SCPYN(a, b) strncpy(a, b, sizeof(a)) @@ -328,7 +328,7 @@ main(argc, argv) write(f, (char *) &ll, sizeof ll); close(f); } - chown(ttyn, pwd->pw_uid, WRITEGID(pwd->pw_gid)); + chown(ttyn, pwd->pw_uid, TTYGID(pwd->pw_gid)); if (!hflag && !rflag) /* XXX */ ioctl(0, TIOCSWINSZ, &win); chmod(ttyn, 0620); @@ -571,13 +571,13 @@ setenv(var, value, clobber) environ[++index] = NULL; } -write_gid(default_gid) +tty_gid(default_gid) int default_gid; { struct group *getgrnam(), *gr; int gid = default_gid; - gr = getgrnam(WRITENAME); + gr = getgrnam(TTYGRPNAME); if (gr != (struct group *) 0) gid = gr->gr_gid; diff --git a/usr/src/usr.bin/login/login.c.1 b/usr/src/usr.bin/login/login.c.1 index 2f2ff6edac..881bb43f05 100644 --- a/usr/src/usr.bin/login/login.c.1 +++ b/usr/src/usr.bin/login/login.c.1 @@ -11,7 +11,7 @@ char copyright[] = #endif not lint #ifndef lint -static char sccsid[] = "@(#)login.c.1 5.14 (Berkeley) %G%"; +static char sccsid[] = "@(#)login.c.1 5.15 (Berkeley) %G%"; #endif not lint /* @@ -38,8 +38,8 @@ static char sccsid[] = "@(#)login.c.1 5.14 (Berkeley) %G%"; #include #include -#define WRITENAME "write" /* name of group to own ttys */ -#define WRITEGID(gid) write_gid(gid) /* gid that owns all ttys */ +#define TTYGRPNAME "tty" /* name of group to own ttys */ +#define TTYGID(gid) tty_gid(gid) /* gid that owns all ttys */ #define SCMPN(a, b) strncmp(a, b, sizeof(a)) #define SCPYN(a, b) strncpy(a, b, sizeof(a)) @@ -328,7 +328,7 @@ main(argc, argv) write(f, (char *) &ll, sizeof ll); close(f); } - chown(ttyn, pwd->pw_uid, WRITEGID(pwd->pw_gid)); + chown(ttyn, pwd->pw_uid, TTYGID(pwd->pw_gid)); if (!hflag && !rflag) /* XXX */ ioctl(0, TIOCSWINSZ, &win); chmod(ttyn, 0620); @@ -571,13 +571,13 @@ setenv(var, value, clobber) environ[++index] = NULL; } -write_gid(default_gid) +tty_gid(default_gid) int default_gid; { struct group *getgrnam(), *gr; int gid = default_gid; - gr = getgrnam(WRITENAME); + gr = getgrnam(TTYGRPNAME); if (gr != (struct group *) 0) gid = gr->gr_gid; diff --git a/usr/src/usr.bin/talk/Makefile b/usr/src/usr.bin/talk/Makefile index 9b8e692d15..cb9b2d30cb 100644 --- a/usr/src/usr.bin/talk/Makefile +++ b/usr/src/usr.bin/talk/Makefile @@ -3,7 +3,7 @@ # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # -# @(#)Makefile 5.3 (Berkeley) %G% +# @(#)Makefile 5.4 (Berkeley) %G% # DESTDIR= OBJS= talk.o get_names.o display.o io.o ctl.o init_disp.o \ @@ -21,7 +21,7 @@ talk: ${OBJS} ${OBJS}: talk.h talk_ctl.h install: talk - install -g write -m 2755 -s talk ${DESTDIR}/usr/ucb/talk + install -g tty -m 2755 -s talk ${DESTDIR}/usr/ucb/talk clean: rm -f ${OBJS} a.out errs core talk -- 2.20.1