From 7c879143c6af188f0f2bce32888bc5381e355397 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Fri, 30 Aug 1996 04:07:43 +0000
Subject: call rcmdsh() if euid != 0 and port is shell/tcp.  This lets us get
 away with fewer setuid binaries.

---
 src/lib/libc/net/rcmd.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
index ef98e882a2..2530c9d5a2 100644
--- a/src/lib/libc/net/rcmd.c
+++ b/src/lib/libc/net/rcmd.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rcmd.c,v 1.11 1996/08/19 08:29:39 tholo Exp $";
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.12 1996/08/30 04:07:43 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -72,6 +72,13 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 	int s, lport, timo;
 	char c;
 
+	/* use rsh(1) if non-root and remote port is shell. */
+	if (geteuid()) {
+		struct servent *sp = getservbyname("shell", "tcp");
+		if (sp && sp->s_port == rport)
+			return(rcmdsh(ahost, rport, locuser, remuser, cmd, NULL));
+	}
+
 	pid = getpid();
 	hp = gethostbyname(*ahost);
 	if (hp == NULL) {
@@ -79,6 +86,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 		return (-1);
 	}
 	*ahost = hp->h_name;
+
 	oldmask = sigblock(sigmask(SIGURG));
 	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
 		s = rresvport(&lport);
-- 
cgit v1.2.3-55-g6feb