* 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 0b2e2219d63b0fe9c0cd74e5334d3aca306a86b3..8a6f53aea5cae5804ccec77f9e2f9c1dbeaec2c3 100644 (file)
--- 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 3f72d9df4c1dd6885112c1d5d38402b9b87fa41e..88151d9eda2f5129ce63bc58681c288d780d5748 100644 (file)
--- 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);