tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed __progname symbol collisions reported by Andre Lucas 

<andre.lucas@dial.pipex.com>
This commit is contained in:
Damien Miller 2000-05-01 20:59:50 +10:00
parent e59ce627a4
commit 70fb671d21
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@
- send debug messages in SSH2 format - send debug messages in SSH2 format
- Include missing headers for OpenSSL tests. Fix from Phil Karn - Include missing headers for OpenSSL tests. Fix from Phil Karn
<karn@ka9q.ampr.org> <karn@ka9q.ampr.org>
- Fixed __progname symbol collisions reported by Andre Lucas
<andre.lucas@dial.pipex.com>
20000430 20000430
- Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au> - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au>

2
session.c
View File

@ -70,7 +70,7 @@ extern ServerOptions options;
#ifdef HAVE___PROGNAME #ifdef HAVE___PROGNAME
extern char *__progname; extern char *__progname;
#else /* HAVE___PROGNAME */ #else /* HAVE___PROGNAME */
const char *__progname = "sshd"; static const char *__progname = "sshd";
#endif /* HAVE___PROGNAME */ #endif /* HAVE___PROGNAME */
extern int log_stderr; extern int log_stderr;

4
ssh-add.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #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/rsa.h>
#include <openssl/dsa.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 #ifdef HAVE___PROGNAME
extern char *__progname; extern char *__progname;
#else /* HAVE___PROGNAME */ #else /* HAVE___PROGNAME */
const char *__progname = "ssh-add"; static const char *__progname = "ssh-add";
#endif /* HAVE___PROGNAME */ #endif /* HAVE___PROGNAME */
void void

2
ssh-agent.c
View File

@ -55,7 +55,7 @@ char socket_dir[1024];
#ifdef HAVE___PROGNAME #ifdef HAVE___PROGNAME
extern char *__progname; extern char *__progname;
#else /* HAVE___PROGNAME */ #else /* HAVE___PROGNAME */
const char *__progname = "ssh-agent"; static const char *__progname = "ssh-agent";
#endif /* HAVE___PROGNAME */ #endif /* HAVE___PROGNAME */
void void

4
ssh-keygen.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -66,7 +66,7 @@ int dsa_mode = 0;
#ifdef HAVE___PROGNAME #ifdef HAVE___PROGNAME
extern char *__progname; extern char *__progname;
#else /* HAVE___PROGNAME */ #else /* HAVE___PROGNAME */
const char *__progname = "ssh-keygen"; static const char *__progname = "ssh-keygen";
#endif /* HAVE___PROGNAME */ #endif /* HAVE___PROGNAME */
char hostname[MAXHOSTNAMELEN]; char hostname[MAXHOSTNAMELEN];

4
ssh.c
View File

@ -11,7 +11,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/dsa.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 #ifdef HAVE___PROGNAME
extern char *__progname; extern char *__progname;
#else /* HAVE___PROGNAME */ #else /* HAVE___PROGNAME */
const char *__progname = "ssh"; static const char *__progname = "ssh";
#endif /* HAVE___PROGNAME */ #endif /* HAVE___PROGNAME */
/* Flag indicating whether IPv4 or IPv6. This can be set on the command line. /* Flag indicating whether IPv4 or IPv6. This can be set on the command line.

4
sshconnect.c
View File

@ -30,7 +30,11 @@ char *client_version_string = NULL;
char *server_version_string = NULL; char *server_version_string = NULL;
extern Options options; extern Options options;
#ifdef HAVE___PROGNAME
extern char *__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. * Connect to the given ssh server using a proxy command.