- (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal

   -lbroken; ok dtucker

diff --git a/ChangeLog b/ChangeLog
index 0e39d8522b07d0855cd3a95e446e7d4655c69d12..0ec65402517b799e4f0cbe64a03456a4ee0c053f 100644 (file)
--- 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

diff --git a/logintest.c b/logintest.c
index c480f9c97269161747ed233390d297228ca2a928..19229879f2cae75fc439cc99479e36dd2411eddb 100644 (file)
--- a/logintest.c
+++ b/logintest.c
@@ -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 db9c47713206fbb0ed976dc2c22e41ae041c72b8..836b2b53a4baa04e63ed33c9ea05350a871c6396 100644 (file)
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -31,7 +31,7 @@ RCSID("$Id$");
  * 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 d8a366ace8d39015f53c97d4a083d0d7eafd638c..edb84fc3b5db161541d209fcfaef44c780694d3f 100644 (file)
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -29,7 +29,7 @@
 
 #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 cf979f2501c7799aabc682f64f2422d50ffc602f..4f9247c2dfcf27b8a26266618330c421bd7fa408 100644 (file)
--- 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 250814d72295eb2749cb22d174be5c7453ea8a2a..9166853ed7fb143174b3fc0cc6621aae3ebe4de8 100644 (file)
--- 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 4354bfd44cde1b5e94c020e0c5e7b522571d5391..c2a6593b83809163b2ce1822ab62e21eea69560c 100644 (file)
--- 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 5b0fbbce6c0f4d9bd8db498dfc27859b52584dbc..2e394e5c1e5f9eda7e55f064f97989a1049436e7 100644 (file)
--- 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 6c8ff30dddc469b39167eeda2c6803eb22390a63..c05c61468c93e22ce0d62413b72acf12aadbb414 100644 (file)
--- 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 2ce5553f65a54c7efebe928ef2a9bc4f6785527b..dbc514737b22c2f840da37bbdafe0becd1c6edcf 100644 (file)
--- 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 358a1e3539c4def5f4dade1fffa0a599018dad09..9fa8aaebcab9a0b4a8794f374daf2dc2d2a39536 100644 (file)
--- 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 7a1fb6fde9cfabd4955630c2cd8b0fd58030fd83..79f78d980b27df7c42cc228b724b091f97e0f9cc 100644 (file)
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -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 694bb5acc05da632860a7595fbc3a67c0afefea6..46640a857ea2740f86bc3e89a067cd3c1f5c6175 100644 (file)
--- 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 dc275b0cb4482743616f5b6bb1dd9bdab5b3bf87..0e1bde3a3003055dbcf8d2059e4c2d8e59aefd83 100644 (file)
--- 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 */