From: dtucker <dtucker>
Date: Sat, 17 Jul 2004 04:07:42 +0000 (+0000)
Subject:  - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c
X-Git-Tag: V_3_9_P1~44
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/35cf0057646c4553084339c6c20c5af29543c28a

 - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c
   ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
   openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c.  Reduces
   diff vs OpenBSD; ok mouring@, tested by tim@ too.
---

diff --git a/ChangeLog b/ChangeLog
index 22264583..963e100d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20040717
+ - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c
+   ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
+   openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c.  Reduces
+   diff vs OpenBSD; ok mouring@, tested by tim@ too.
+
 20040711
  - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
    the monitor to properly clean up the PAM thread (Debian bug #252676).
diff --git a/logintest.c b/logintest.c
index 19229879..15287613 100644
--- a/logintest.c
+++ b/logintest.c
@@ -45,11 +45,7 @@
 
 RCSID("$Id$");
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 #define PAUSE_BEFORE_LOGOUT 3
 
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 7a6dc14b..23e66b1c 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -19,6 +19,10 @@
 
 RCSID("$Id$");
 
+#ifndef HAVE__PROGNAME
+char *__progname;
+#endif
+
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
  * Otherwise it may get clobbered by setproctitle()
diff --git a/scp.c b/scp.c
index e559122a..33c5891f 100644
--- a/scp.c
+++ b/scp.c
@@ -80,11 +80,7 @@ RCSID("$OpenBSD: scp.c,v 1.116 2004/07/08 12:47:21 dtucker Exp $");
 #include "misc.h"
 #include "progressmeter.h"
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 void bwlimit(int);
 
diff --git a/sftp-server.c b/sftp-server.c
index 1ff4750e..e8228005 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -31,11 +31,7 @@ RCSID("$OpenBSD: sftp-server.c,v 1.47 2004/06/25 05:38:48 dtucker Exp $");
 #define get_string(lenp)		buffer_get_string(&iqueue, lenp);
 #define TRACE				debug
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* input and output queue */
 Buffer iqueue;
diff --git a/sftp.c b/sftp.c
index 1bc91a16..4002304e 100644
--- a/sftp.c
+++ b/sftp.c
@@ -55,11 +55,7 @@ int sort_flag;
 int remote_glob(struct sftp_conn *, const char *, int,
     int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Separators for interactive commands */
 #define WHITESPACE " \t\r\n"
diff --git a/ssh-add.c b/ssh-add.c
index 709a36bc..06a52464 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -49,12 +49,6 @@ RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $");
 #include "pathnames.h"
 #include "misc.h"
 
-#ifdef HAVE___PROGNAME
-extern char *__progname;
-#else
-char *__progname;
-#endif
-
 /* argv0 */
 extern char *__progname;
 
diff --git a/ssh-agent.c b/ssh-agent.c
index ea84f219..54ab4d7a 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -106,11 +106,7 @@ char socket_dir[1024];
 int locked = 0;
 char *lock_passwd = NULL;
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Default lifetime (0 == forever) */
 static int lifetime = 0;
diff --git a/ssh-keygen.c b/ssh-keygen.c
index d4d19d3a..e8e579b5 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -76,11 +76,7 @@ int print_generic = 0;
 char *key_type_name = NULL;
 
 /* argv0 */
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 char hostname[MAXHOSTNAMELEN];
 
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 01615b5c..fd3185ad 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -49,11 +49,7 @@ int timeout = 5;
 int maxfd;
 #define MAXCON (maxfd - 10)
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 fd_set *read_wait;
 size_t read_wait_size;
 int ncon;
diff --git a/ssh-keysign.c b/ssh-keysign.c
index e642948a..cf8b0c2d 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -45,11 +45,7 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.16 2004/04/18 23:10:26 djm Exp $");
 /* XXX readconf.c needs these */
 uid_t original_real_uid;
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 static int
 valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 5fed283f..2d8707ee 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -63,11 +63,7 @@ RCSID("$Id$");
 # define SSH_PRNG_COMMAND_FILE   SSHDIR "/ssh_prng_cmds"
 #endif
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 #define WHITESPACE " \t\n"
 
diff --git a/ssh.c b/ssh.c
index 767d99ca..f0c284df 100644
--- a/ssh.c
+++ b/ssh.c
@@ -76,11 +76,7 @@ RCSID("$OpenBSD: ssh.c,v 1.222 2004/06/23 14:31:01 dtucker Exp $");
 #include "scard.h"
 #endif
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Flag indicating whether debug mode is on.  This can be set on the command line. */
 int debug_flag = 0;
diff --git a/sshd.c b/sshd.c
index 101419be..6df8f252 100644
--- a/sshd.c
+++ b/sshd.c
@@ -103,11 +103,7 @@ int deny_severity = LOG_WARNING;
 #define REEXEC_CONFIG_PASS_FD		(STDERR_FILENO + 3)
 #define REEXEC_MIN_FREE_FD		(STDERR_FILENO + 4)
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Server configuration options. */
 ServerOptions options;