- markus@cvs.openbsd.org 2001/02/10 1:46:28

     [ssh.c]
     remove mapping of argv[0] -> hostname

2 files changed, 5 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e1aadb9d..742d969b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
    - djm@cvs.openbsd.org 2001/02/10 0:45:52
      [scp.1]
      Mention that you can quote pathnames with spaces in them
+   - markus@cvs.openbsd.org 2001/02/10 1:46:28
+     [ssh.c]
+     remove mapping of argv[0] -> hostname
  - (bal) Minor correction to sftp-client.c I made.  Should return 'status'
    instead of '0'  (from the OpenBSD tree)
  - (bal) Synced ssh.1 w/ OpenBSD
@@ -3810,4 +3813,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.721 2001/02/10 22:08:03 mouring Exp $
+$Id: ChangeLog,v 1.722 2001/02/10 22:11:13 mouring Exp $
diff --git a/ssh.c b/ssh.c
index ddf28c538..4ca1e7bf8 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.93 2001/02/08 19:30:52 itojun Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.94 2001/02/10 01:46:28 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -288,21 +288,6 @@ main(int ac, char **av)
         /* Parse command-line arguments. */
         host = NULL;
 
-        /* If program name is not one of the standard names, use it as host name. */
-        cp = __progname;
-#ifdef HAVE_CYGWIN
-        if (strcasecmp(cp, "rsh") && strcasecmp(cp, "ssh") &&
-            strcasecmp(cp, "rlogin") && strcasecmp(cp, "slogin") &&
-            strcasecmp(cp, "remsh") &&
-            strcasecmp(cp, "rsh.exe") && strcasecmp(cp, "ssh.exe") &&
-            strcasecmp(cp, "rlogin.exe") && strcasecmp(cp, "slogin.exe") &&
-            strcasecmp(cp, "remsh.exe"))
-#else
-        if (strcmp(cp, "rsh") && strcmp(cp, "ssh") && strcmp(cp, "rlogin") &&
-            strcmp(cp, "slogin") && strcmp(cp, "remsh"))
-#endif
-                host = cp;
-
         for (optind = 1; optind < ac; optind++) {
                 if (av[optind][0] != '-') {
                         if (host)