- Fixed __progname symbol collisions reported by Andre Lucas

   <andre.lucas@dial.pipex.com>

7 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index bdb69ea9d..eeceec348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    - send debug messages in SSH2 format
  - Include missing headers for OpenSSL tests. Fix from Phil Karn 
    <karn@ka9q.ampr.org>
+ - Fixed __progname symbol collisions reported by Andre Lucas 
+   <andre.lucas@dial.pipex.com>
 
 20000430
  - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au>
diff --git a/session.c b/session.c
index c6253139c..0679d837c 100644
--- a/session.c
+++ b/session.c
@@ -70,7 +70,7 @@ extern ServerOptions options;
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 #else /* HAVE___PROGNAME */
-const char *__progname = "sshd";
+static const char *__progname = "sshd";
 #endif /* HAVE___PROGNAME */
 
 extern int log_stderr;
diff --git a/ssh-add.c b/ssh-add.c
index 0d388301d..ad9423977 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: ssh-add.c,v 1.17 2000/04/29 13:57:12 damien Exp $");
+RCSID("$Id: ssh-add.c,v 1.18 2000/05/01 10:59:50 damien Exp $");
 
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
@@ -23,7 +23,7 @@ RCSID("$Id: ssh-add.c,v 1.17 2000/04/29 13:57:12 damien Exp $");
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 #else /* HAVE___PROGNAME */
-const char *__progname = "ssh-add";
+static const char *__progname = "ssh-add";
 #endif /* HAVE___PROGNAME */
 
 void
diff --git a/ssh-agent.c b/ssh-agent.c
index e9f6b8062..30d99b955 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -55,7 +55,7 @@ char socket_dir[1024];
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 #else /* HAVE___PROGNAME */
-const char *__progname = "ssh-agent";
+static const char *__progname = "ssh-agent";
 #endif /* HAVE___PROGNAME */
 
 void
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 0155949fd..d86396896 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: ssh-keygen.c,v 1.14 2000/04/29 13:57:12 damien Exp $");
+RCSID("$Id: ssh-keygen.c,v 1.15 2000/05/01 10:59:51 damien Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -66,7 +66,7 @@ int dsa_mode = 0;
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 #else /* HAVE___PROGNAME */
-const char *__progname = "ssh-keygen";
+static const char *__progname = "ssh-keygen";
 #endif /* HAVE___PROGNAME */
 
 char hostname[MAXHOSTNAMELEN];
diff --git a/ssh.c b/ssh.c
index cffd56676..c46243462 100644
--- a/ssh.c
+++ b/ssh.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: ssh.c,v 1.28 2000/04/30 00:00:54 damien Exp $");
+RCSID("$Id: ssh.c,v 1.29 2000/05/01 10:59:51 damien Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/dsa.h>
@@ -34,7 +34,7 @@ RCSID("$Id: ssh.c,v 1.28 2000/04/30 00:00:54 damien Exp $");
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 #else /* HAVE___PROGNAME */
-const char *__progname = "ssh";
+static const char *__progname = "ssh";
 #endif /* HAVE___PROGNAME */
 
 /* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
diff --git a/sshconnect.c b/sshconnect.c
index 5554c0643..859450d36 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -30,7 +30,11 @@ char *client_version_string = NULL;
 char *server_version_string = NULL;
 
 extern Options options;
+#ifdef HAVE___PROGNAME
 extern char *__progname;
+#else /* HAVE___PROGNAME */
+static const char *__progname = "ssh";
+#endif /* HAVE___PROGNAME */
 
 /*
  * Connect to the given ssh server using a proxy command.