From: Ken Raeburn <raeburn@mit.edu>
Date: Fri, 14 Sep 2001 02:06:02 +0000 (+0000)
Subject: * krlogin.c (try_normal): Permit "rsh" as well as "rlogin" as the program name,
X-Git-Tag: krb5-1.3-alpha1~1076
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bfcdeedb5ac12652b7d8a2b528d782792df6b566;p=krb5.git

* krlogin.c (try_normal): Permit "rsh" as well as "rlogin" as the program name,
for detecting when argv[0] is not the hostname.  If argv[0] isn't the hostname,
always replace it with the system rlogin pathname.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13747 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 0b2e2219d..8a6f53aea 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-13  Ken Raeburn  <raeburn@mit.edu>
+
+	* krlogin.c (try_normal): Permit "rsh" as well as "rlogin" as the
+	program name, for detecting when argv[0] is not the hostname.
+	If argv[0] isn't the hostname, always replace it with the system
+	rlogin pathname.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Use $(srcdir).
diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 3f72d9df4..88151d9ed 100644
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -1815,8 +1815,8 @@ void try_normal(argv)
       nhost++;
     else
       nhost = argv[0];
-    if (!strcmp(nhost, "rlogin"))
-      argv++;
+    if (!strcmp(nhost, "rlogin") || !strcmp(nhost, "rsh"))
+      argv[0] = UCB_RLOGIN;
     
 #ifdef POSIX_SIGNALS
     sigemptyset(&mask);