- (stevek) Reworked progname support.

 - (bal) Misplaced #include "includes.h" in bsd-setproctitle.c.  Patch by
   Shinichi Maruyama <marya@st.jip.co.jp>

I assume the progname patch was finished.  I believe stevek is on vacation,
but it passes compiling under Linux and NeXTStep.

1 files changed, 4 insertions, 3 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 76edc5301..3653fc244 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -74,9 +74,9 @@ char *key_type_name = NULL;
 /* argv0 */
 #ifdef HAVE___PROGNAME
 extern char *__progname;
-#else /* HAVE___PROGNAME */
-static const char *__progname = "ssh-keygen";
-#endif /* HAVE___PROGNAME */
+#else
+char *__progname;
+#endif
 
 char hostname[MAXHOSTNAMELEN];
 
@@ -610,6 +610,7 @@ main(int ac, char **av)
         extern int optind;
         extern char *optarg;
 
+        __progname = get_progname(av[0]);
         init_rng();
 
         SSLeay_add_all_algorithms();