X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/95f51977ddc18faa2e212f30c00a39540b39f325..1c15e88899094343f75aeba04122cd96a96b428e:/usr/src/usr.bin/tip/tip.c

diff --git a/usr/src/usr.bin/tip/tip.c b/usr/src/usr.bin/tip/tip.c
index 4e5608fcf4..7bc02d6804 100644
--- a/usr/src/usr.bin/tip/tip.c
+++ b/usr/src/usr.bin/tip/tip.c
@@ -1,18 +1,31 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983 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.
  */
 
 #ifndef lint
 char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+"@(#) Copyright (c) 1983 The Regents of the University of California.\n\
  All rights reserved.\n";
-#endif not lint
+#endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)tip.c	5.4 (Berkeley) 4/3/86";
-#endif not lint
+static char sccsid[] = "@(#)tip.c	5.13 (Berkeley) 6/1/90";
+#endif /* not lint */
 
 /*
  * tip - UNIX link to other systems
@@ -21,6 +34,7 @@ static char sccsid[] = "@(#)tip.c	5.4 (Berkeley) 4/3/86";
  *  cu phone-number [-s speed] [-l line] [-a acu]
  */
 #include "tip.h"
+#include "pathnames.h"
 
 /*
  * Baud rate mapping table
@@ -31,12 +45,11 @@ int bauds[] = {
 };
 
 int	disc = OTTYDISC;		/* tip normally runs this way */
-int	intprompt();
-int	timeout();
-int	cleanup();
+void	intprompt();
+void	timeout();
+void	cleanup();
 char	*sname();
 char	PNbuf[256];			/* This limits the size of a number */
-extern char *sprintf();
 
 main(argc, argv)
 	char *argv[];
@@ -46,6 +59,10 @@ main(argc, argv)
 	register char *p;
 	char sbuf[12];
 
+	gid = getgid();
+	egid = getegid();
+	uid = getuid();
+	euid = geteuid();
 	if (equal(sname(argv[0]), "cu")) {
 		cumode = 1;
 		cumain(argc, argv);
@@ -99,13 +116,14 @@ main(argc, argv)
 	for (p = system; *p; p++)
 		*p = '\0';
 	PN = PNbuf;
-	system = sprintf(sbuf, "tip%d", BR);
+	(void)sprintf(sbuf, "tip%d", BR);
+	system = sbuf;
 
 notnumber:
-	signal(SIGINT, cleanup);
-	signal(SIGQUIT, cleanup);
-	signal(SIGHUP, cleanup);
-	signal(SIGTERM, cleanup);
+	(void)signal(SIGINT, cleanup);
+	(void)signal(SIGQUIT, cleanup);
+	(void)signal(SIGHUP, cleanup);
+	(void)signal(SIGTERM, cleanup);
 
 	if ((i = hunt(system)) == 0) {
 		printf("all ports busy\n");
@@ -113,7 +131,7 @@ notnumber:
 	}
 	if (i == -1) {
 		printf("link down\n");
-		delock(uucplock);
+		(void)uu_unlock(uucplock);
 		exit(3);
 	}
 	setbuf(stdout, NULL);
@@ -124,12 +142,12 @@ notnumber:
 	 *   in the right order, so force it here
 	 */
 	if ((PH = getenv("PHONES")) == NOSTR)
-		PH = "/etc/phones";
+		PH = _PATH_PHONES;
 	vinit();				/* init variables */
 	setparity("even");			/* set the parity table */
 	if ((i = speed(number(value(BAUDRATE)))) == NULL) {
 		printf("tip: bad baud rate %d\n", number(value(BAUDRATE)));
-		delock(uucplock);
+		(void)uu_unlock(uucplock);
 		exit(3);
 	}
 
@@ -140,12 +158,7 @@ notnumber:
 	 *  so we can get the original permissions back
 	 *  for removing the uucp lock.
 	 */
-	gid = getgid();
-	egid = getegid();
-	uid = getuid();
-	euid = geteuid();
-	setregid(egid, gid);
-	setreuid(euid, uid);
+	user_uid();
 
 	/*
 	 * Hardwired connections require the
@@ -156,9 +169,8 @@ notnumber:
 		ttysetup(i);
 	if (p = connect()) {
 		printf("\07%s\n[EOT]\n", p);
-		setreuid(uid, euid);
-		setregid(gid, egid);
-		delock(uucplock);
+		daemon_uid();
+		(void)uu_unlock(uucplock);
 		exit(1);
 	}
 	if (!HW)
@@ -183,7 +195,7 @@ cucommon:
 	raw();
 
 	pipe(fildes); pipe(repdes);
-	signal(SIGALRM, timeout);
+	(void)signal(SIGALRM, timeout);
 
 	/*
 	 * Everything's set up now:
@@ -200,19 +212,53 @@ cucommon:
 	/*NOTREACHED*/
 }
 
+void
 cleanup()
 {
 
-	if (uid != getuid()) {
-		setreuid(uid, euid);
-		setregid(gid, egid);
-	}
-	delock(uucplock);
+	daemon_uid();
+	(void)uu_unlock(uucplock);
 	if (odisc)
 		ioctl(0, TIOCSETD, (char *)&odisc);
 	exit(0);
 }
 
+/*
+ * Muck with user ID's.  We are setuid to the owner of the lock
+ * directory when we start.  user_uid() reverses real and effective
+ * ID's after startup, to run with the user's permissions.
+ * daemon_uid() switches back to the privileged uid for unlocking.
+ * Finally, to avoid running a shell with the wrong real uid,
+ * shell_uid() sets real and effective uid's to the user's real ID.
+ */
+static int uidswapped;
+
+user_uid()
+{
+	if (uidswapped == 0) {
+		setregid(egid, gid);
+		setreuid(euid, uid);
+		uidswapped = 1;
+	}
+}
+
+daemon_uid()
+{
+
+	if (uidswapped) {
+		setreuid(uid, euid);
+		setregid(gid, egid);
+		uidswapped = 0;
+	}
+}
+
+shell_uid()
+{
+
+	setreuid(uid, uid);
+	setregid(gid, gid);
+}
+
 /*
  * put the controlling keyboard into raw mode
  */
@@ -250,11 +296,11 @@ prompt(s, p)
 	register char *p;
 {
 	register char *b = p;
-	int (*oint)(), (*oquit)();
+	sig_t oint, oquit;
 
 	stoprompt = 0;
 	oint = signal(SIGINT, intprompt);
-	oint = signal(SIGQUIT, SIG_IGN);
+	oquit = signal(SIGQUIT, SIG_IGN);
 	unraw();
 	printf("%s", s);
 	if (setjmp(promptbuf) == 0)
@@ -263,18 +309,19 @@ prompt(s, p)
 	*p = '\0';
 
 	raw();
-	signal(SIGINT, oint);
-	signal(SIGQUIT, oint);
+	(void)signal(SIGINT, oint);
+	(void)signal(SIGQUIT, oquit);
 	return (stoprompt || p == b);
 }
 
 /*
  * Interrupt service routine during prompting
  */
+void
 intprompt()
 {
 
-	signal(SIGINT, SIG_IGN);
+	(void)signal(SIGINT, SIG_IGN);
 	stoprompt = 1;
 	printf("\r\n");
 	longjmp(promptbuf, 1);
@@ -338,7 +385,7 @@ escape()
 	gch = (getchar()&0177);
 	for (p = etable; p->e_char; p++)
 		if (p->e_char == gch) {
-			if ((p->e_flags&PRIV) && getuid())
+			if ((p->e_flags&PRIV) && uid)
 				continue;
 			printf("%s", ctrl(c));
 			(*p->e_func)(gch);
@@ -434,7 +481,7 @@ help(c)
 
 	printf("%c\r\n", c);
 	for (p = etable; p->e_char; p++) {
-		if ((p->e_flags&PRIV) && getuid())
+		if ((p->e_flags&PRIV) && uid)
 			continue;
 		printf("%2s", ctrl(character(value(ESCAPE))));
 		printf("%-2s %c   %s\r\n", ctrl(p->e_char),
@@ -475,6 +522,7 @@ sname(s)
 }
 
 static char partab[0200];
+static int bits8;
 
 /*
  * Do a write to the remote machine with the correct parity.
@@ -491,10 +539,11 @@ pwrite(fd, buf, n)
 	extern int errno;
 
 	bp = buf;
-	for (i = 0; i < n; i++) {
-		*bp = partab[(*bp) & 0177];
-		bp++;
-	}
+	if (bits8 == 0)
+		for (i = 0; i < n; i++) {
+			*bp = partab[(*bp) & 0177];
+			bp++;
+		}
 	if (write(fd, buf, n) < 0) {
 		if (errno == EIO)
 			abort("Lost carrier.");
@@ -516,6 +565,11 @@ setparity(defparity)
 	if (value(PARITY) == NOSTR)
 		value(PARITY) = defparity;
 	parity = value(PARITY);
+	if (equal(parity, "none")) {
+		bits8 = 1;
+		return;
+	} else
+		bits8 = 0;
 	for (i = 0; i < 0200; i++)
 		partab[i] = evenpartab[i];
 	if (equal(parity, "even"))
@@ -525,7 +579,7 @@ setparity(defparity)
 			partab[i] ^= 0200;	/* reverse bit 7 */
 		return;
 	}
-	if (equal(parity, "none") || equal(parity, "zero")) {
+	if (equal(parity, "zero")) {
 		for (i = 0; i < 0200; i++)
 			partab[i] &= ~0200;	/* turn off bit 7 */
 		return;