summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--logintest.c6
-rw-r--r--openbsd-compat/bsd-misc.c6
-rw-r--r--scp.c4
-rw-r--r--sftp-server.c4
-rw-r--r--sftp.c4
-rw-r--r--ssh-add.c6
-rw-r--r--ssh-agent.c4
-rw-r--r--ssh-keygen.c4
-rw-r--r--ssh-keyscan.c4
-rw-r--r--ssh-keysign.c4
-rw-r--r--ssh-rand-helper.c6
-rw-r--r--ssh.c4
-rw-r--r--sshd.c4
14 files changed, 14 insertions, 54 deletions
diff --git a/ChangeLog b/ChangeLog
index f6447bb86..a36c1dd22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120040717
2 - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c
3 ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
4 openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c. Reduces
5 diff vs OpenBSD; ok mouring@, tested by tim@ too.
6
120040711 720040711
2 - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows 8 - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
3 the monitor to properly clean up the PAM thread (Debian bug #252676). 9 the monitor to properly clean up the PAM thread (Debian bug #252676).
@@ -1503,4 +1509,4 @@
1503 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1509 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1504 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1510 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1505 1511
1506$Id: ChangeLog,v 1.3473 2004/07/11 06:54:08 dtucker Exp $ 1512$Id: ChangeLog,v 1.3474 2004/07/17 04:07:42 dtucker Exp $
diff --git a/logintest.c b/logintest.c
index 3f3997d10..95cce5a3a 100644
--- a/logintest.c
+++ b/logintest.c
@@ -43,13 +43,9 @@
43 43
44#include "loginrec.h" 44#include "loginrec.h"
45 45
46RCSID("$Id: logintest.c,v 1.10 2003/08/21 23:34:41 djm Exp $"); 46RCSID("$Id: logintest.c,v 1.11 2004/07/17 04:07:42 dtucker Exp $");
47 47
48#ifdef HAVE___PROGNAME
49extern char *__progname; 48extern char *__progname;
50#else
51char *__progname;
52#endif
53 49
54#define PAUSE_BEFORE_LOGOUT 3 50#define PAUSE_BEFORE_LOGOUT 3
55 51
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index c58cce0f4..07b7c0755 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -17,7 +17,11 @@
17#include "includes.h" 17#include "includes.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
19 19
20RCSID("$Id: bsd-misc.c,v 1.22 2004/06/25 04:03:34 dtucker Exp $"); 20RCSID("$Id: bsd-misc.c,v 1.23 2004/07/17 04:07:42 dtucker Exp $");
21
22#ifndef HAVE__PROGNAME
23char *__progname;
24#endif
21 25
22/* 26/*
23 * NB. duplicate __progname in case it is an alias for argv[0] 27 * NB. duplicate __progname in case it is an alias for argv[0]
diff --git a/scp.c b/scp.c
index e559122a1..33c5891f2 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 $");
80#include "misc.h" 80#include "misc.h"
81#include "progressmeter.h" 81#include "progressmeter.h"
82 82
83#ifdef HAVE___PROGNAME
84extern char *__progname; 83extern char *__progname;
85#else
86char *__progname;
87#endif
88 84
89void bwlimit(int); 85void bwlimit(int);
90 86
diff --git a/sftp-server.c b/sftp-server.c
index 1ff4750ea..e82280057 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 $");
31#define get_string(lenp) buffer_get_string(&iqueue, lenp); 31#define get_string(lenp) buffer_get_string(&iqueue, lenp);
32#define TRACE debug 32#define TRACE debug
33 33
34#ifdef HAVE___PROGNAME
35extern char *__progname; 34extern char *__progname;
36#else
37char *__progname;
38#endif
39 35
40/* input and output queue */ 36/* input and output queue */
41Buffer iqueue; 37Buffer iqueue;
diff --git a/sftp.c b/sftp.c
index 1bc91a16e..4002304ec 100644
--- a/sftp.c
+++ b/sftp.c
@@ -55,11 +55,7 @@ int sort_flag;
55int remote_glob(struct sftp_conn *, const char *, int, 55int remote_glob(struct sftp_conn *, const char *, int,
56 int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */ 56 int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */
57 57
58#ifdef HAVE___PROGNAME
59extern char *__progname; 58extern char *__progname;
60#else
61char *__progname;
62#endif
63 59
64/* Separators for interactive commands */ 60/* Separators for interactive commands */
65#define WHITESPACE " \t\r\n" 61#define WHITESPACE " \t\r\n"
diff --git a/ssh-add.c b/ssh-add.c
index 709a36bc1..06a52464e 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 $");
49#include "pathnames.h" 49#include "pathnames.h"
50#include "misc.h" 50#include "misc.h"
51 51
52#ifdef HAVE___PROGNAME
53extern char *__progname;
54#else
55char *__progname;
56#endif
57
58/* argv0 */ 52/* argv0 */
59extern char *__progname; 53extern char *__progname;
60 54
diff --git a/ssh-agent.c b/ssh-agent.c
index ea84f2196..54ab4d7a2 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -106,11 +106,7 @@ char socket_dir[1024];
106int locked = 0; 106int locked = 0;
107char *lock_passwd = NULL; 107char *lock_passwd = NULL;
108 108
109#ifdef HAVE___PROGNAME
110extern char *__progname; 109extern char *__progname;
111#else
112char *__progname;
113#endif
114 110
115/* Default lifetime (0 == forever) */ 111/* Default lifetime (0 == forever) */
116static int lifetime = 0; 112static int lifetime = 0;
diff --git a/ssh-keygen.c b/ssh-keygen.c
index d4d19d3a1..e8e579b5d 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -76,11 +76,7 @@ int print_generic = 0;
76char *key_type_name = NULL; 76char *key_type_name = NULL;
77 77
78/* argv0 */ 78/* argv0 */
79#ifdef HAVE___PROGNAME
80extern char *__progname; 79extern char *__progname;
81#else
82char *__progname;
83#endif
84 80
85char hostname[MAXHOSTNAMELEN]; 81char hostname[MAXHOSTNAMELEN];
86 82
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 01615b5c3..fd3185adf 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -49,11 +49,7 @@ int timeout = 5;
49int maxfd; 49int maxfd;
50#define MAXCON (maxfd - 10) 50#define MAXCON (maxfd - 10)
51 51
52#ifdef HAVE___PROGNAME
53extern char *__progname; 52extern char *__progname;
54#else
55char *__progname;
56#endif
57fd_set *read_wait; 53fd_set *read_wait;
58size_t read_wait_size; 54size_t read_wait_size;
59int ncon; 55int ncon;
diff --git a/ssh-keysign.c b/ssh-keysign.c
index e642948a0..cf8b0c2d2 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 $");
45/* XXX readconf.c needs these */ 45/* XXX readconf.c needs these */
46uid_t original_real_uid; 46uid_t original_real_uid;
47 47
48#ifdef HAVE___PROGNAME
49extern char *__progname; 48extern char *__progname;
50#else
51char *__progname;
52#endif
53 49
54static int 50static int
55valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, 51valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 471e7295b..86af3893d 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -39,7 +39,7 @@
39#include "pathnames.h" 39#include "pathnames.h"
40#include "log.h" 40#include "log.h"
41 41
42RCSID("$Id: ssh-rand-helper.c,v 1.17 2004/06/15 00:34:08 djm Exp $"); 42RCSID("$Id: ssh-rand-helper.c,v 1.18 2004/07/17 04:07:42 dtucker Exp $");
43 43
44/* Number of bytes we write out */ 44/* Number of bytes we write out */
45#define OUTPUT_SEED_SIZE 48 45#define OUTPUT_SEED_SIZE 48
@@ -63,11 +63,7 @@ RCSID("$Id: ssh-rand-helper.c,v 1.17 2004/06/15 00:34:08 djm Exp $");
63# define SSH_PRNG_COMMAND_FILE SSHDIR "/ssh_prng_cmds" 63# define SSH_PRNG_COMMAND_FILE SSHDIR "/ssh_prng_cmds"
64#endif 64#endif
65 65
66#ifdef HAVE___PROGNAME
67extern char *__progname; 66extern char *__progname;
68#else
69char *__progname;
70#endif
71 67
72#define WHITESPACE " \t\n" 68#define WHITESPACE " \t\n"
73 69
diff --git a/ssh.c b/ssh.c
index 767d99ca9..f0c284df0 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 $");
76#include "scard.h" 76#include "scard.h"
77#endif 77#endif
78 78
79#ifdef HAVE___PROGNAME
80extern char *__progname; 79extern char *__progname;
81#else
82char *__progname;
83#endif
84 80
85/* Flag indicating whether debug mode is on. This can be set on the command line. */ 81/* Flag indicating whether debug mode is on. This can be set on the command line. */
86int debug_flag = 0; 82int debug_flag = 0;
diff --git a/sshd.c b/sshd.c
index 101419bed..6df8f252a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -103,11 +103,7 @@ int deny_severity = LOG_WARNING;
103#define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3) 103#define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3)
104#define REEXEC_MIN_FREE_FD (STDERR_FILENO + 4) 104#define REEXEC_MIN_FREE_FD (STDERR_FILENO + 4)
105 105
106#ifdef HAVE___PROGNAME
107extern char *__progname; 106extern char *__progname;
108#else
109char *__progname;
110#endif
111 107
112/* Server configuration options. */ 108/* Server configuration options. */
113ServerOptions options; 109ServerOptions options;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 02:52:31 +0000