14 files changed, 22 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 081b07907..ded30f05a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030822
+ - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal 
+   -lbroken; ok dtucker 
+
 20030821
  - (dtucker) OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2003/08/14 16:08:58
@@ -845,4 +849,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2896 2003/08/21 07:58:29 dtucker Exp $
+$Id: ChangeLog,v 1.2897 2003/08/21 23:34:41 djm Exp $
diff --git a/logintest.c b/logintest.c
index a0c08118b..3f3997d10 100644
--- a/logintest.c
+++ b/logintest.c
@@ -43,7 +43,7 @@
 
 #include "loginrec.h"
 
-RCSID("$Id: logintest.c,v 1.9 2003/06/02 00:42:17 djm Exp $");
+RCSID("$Id: logintest.c,v 1.10 2003/08/21 23:34:41 djm Exp $");
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
 {
         printf("Platform-independent login recording test driver\n");
 
-        __progname = get_progname(argv[0]);
+        __progname = ssh_get_progname(argv[0]);
         if (argc == 2) {
                 if (strncmp(argv[1], "-i", 3) == 0)
                         compile_opts_only = 1;
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index d4c793724..56cb45ade 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,13 +25,13 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.17 2003/08/13 10:48:07 dtucker Exp $");
+RCSID("$Id: bsd-misc.c,v 1.18 2003/08/21 23:34:42 djm Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
  * Otherwise it may get clobbered by setproctitle()
  */
-char *get_progname(char *argv0)
+char *ssh_get_progname(char *argv0)
 {
 #ifdef HAVE___PROGNAME
         extern char *__progname;
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index f2fbdc2e3..2857de59b 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -22,14 +22,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: bsd-misc.h,v 1.10 2003/08/13 10:48:07 dtucker Exp $ */
+/* $Id: bsd-misc.h,v 1.11 2003/08/21 23:34:42 djm Exp $ */
 
 #ifndef _BSD_MISC_H
 #define _BSD_MISC_H
 
 #include "config.h"
 
-char *get_progname(char *);
+char *ssh_get_progname(char *);
 
 #ifndef HAVE_SETSID
 #define setsid() setpgrp(0, getpid())
diff --git a/scp.c b/scp.c
index cf979f250..4f9247c2d 100644
--- a/scp.c
+++ b/scp.c
@@ -222,7 +222,7 @@ main(int argc, char **argv)
         extern char *optarg;
         extern int optind;
 
-        __progname = get_progname(argv[0]);
+        __progname = ssh_get_progname(argv[0]);
 
         args.list = NULL;
         addargs(&args, "ssh");          /* overwritten with ssh_program */
diff --git a/sftp-server.c b/sftp-server.c
index 250814d72..9166853ed 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1030,7 +1030,7 @@ main(int ac, char **av)
 
         /* XXX should use getopt */
 
-        __progname = get_progname(av[0]);
+        __progname = ssh_get_progname(av[0]);
         handle_init();
 
 #ifdef DEBUG_SFTP_SERVER
diff --git a/sftp.c b/sftp.c
index 4354bfd44..c2a6593b8 100644
--- a/sftp.c
+++ b/sftp.c
@@ -132,7 +132,7 @@ main(int argc, char **argv)
         extern int optind;
         extern char *optarg;
 
-        __progname = get_progname(argv[0]);
+        __progname = ssh_get_progname(argv[0]);
         args.list = NULL;
         addargs(&args, "ssh");          /* overwritten with ssh_program */
         addargs(&args, "-oForwardX11 no");
diff --git a/ssh-add.c b/ssh-add.c
index 5b0fbbce6..2e394e5c1 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -319,7 +319,7 @@ main(int argc, char **argv)
         char *sc_reader_id = NULL;
         int i, ch, deleting = 0, ret = 0;
 
-        __progname = get_progname(argv[0]);
+        __progname = ssh_get_progname(argv[0]);
         init_rng();
         seed_rng();
 
diff --git a/ssh-agent.c b/ssh-agent.c
index 6c8ff30dd..c05c61468 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1024,7 +1024,7 @@ main(int ac, char **av)
 
         SSLeay_add_all_algorithms();
 
-        __progname = get_progname(av[0]);
+        __progname = ssh_get_progname(av[0]);
         init_rng();
         seed_rng();
 
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 2ce5553f6..dbc514737 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -809,7 +809,7 @@ main(int ac, char **av)
         extern int optind;
         extern char *optarg;
 
-        __progname = get_progname(av[0]);
+        __progname = ssh_get_progname(av[0]);
 
         SSLeay_add_all_algorithms();
         log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 358a1e353..9fa8aaebc 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -697,7 +697,7 @@ main(int argc, char **argv)
         extern int optind;
         extern char *optarg;
 
-        __progname = get_progname(argv[0]);
+        __progname = ssh_get_progname(argv[0]);
         init_rng();
         seed_rng();
         TAILQ_INIT(&tq);
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 88e6e7c05..7e65e4569 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -39,7 +39,7 @@
 #include "pathnames.h"
 #include "log.h"
 
-RCSID("$Id: ssh-rand-helper.c,v 1.12 2003/07/06 05:20:46 dtucker Exp $");
+RCSID("$Id: ssh-rand-helper.c,v 1.13 2003/08/21 23:34:41 djm Exp $");
 
 /* Number of bytes we write out */
 #define OUTPUT_SEED_SIZE        48
@@ -769,7 +769,7 @@ main(int argc, char **argv)
         extern char *optarg;
         LogLevel ll;
 
-        __progname = get_progname(argv[0]);
+        __progname = ssh_get_progname(argv[0]);
         log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
 
         ll = SYSLOG_LEVEL_INFO;
diff --git a/ssh.c b/ssh.c
index 694bb5acc..46640a857 100644
--- a/ssh.c
+++ b/ssh.c
@@ -212,7 +212,7 @@ main(int ac, char **av)
         extern int optind, optreset;
         extern char *optarg;
 
-        __progname = get_progname(av[0]);
+        __progname = ssh_get_progname(av[0]);
         init_rng();
 
         /*
diff --git a/sshd.c b/sshd.c
index dc275b0cb..0e1bde3a3 100644
--- a/sshd.c
+++ b/sshd.c
@@ -819,7 +819,7 @@ main(int ac, char **av)
 #ifdef HAVE_SECUREWARE
         (void)set_auth_parameters(ac, av);
 #endif
-        __progname = get_progname(av[0]);
+        __progname = ssh_get_progname(av[0]);
         init_rng();
 
         /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */