- (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-agent.c b/ssh-agent.c
index 9f61aec3b..f5f87cca3 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -93,9 +93,9 @@ char socket_dir[1024];
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
-#else /* HAVE___PROGNAME */
-static const char *__progname = "ssh-agent";
-#endif /* HAVE___PROGNAME */
+#else
+char *__progname;
+#endif
 
 void
 idtab_init(void)
@@ -672,6 +672,7 @@ main(int ac, char **av)
         char *shell, *format, *pidstr, pidstrbuf[1 + 3 * sizeof pid];
         extern int optind;
         
+        __progname = get_progname(av[0]);
         init_rng();
         
 #ifdef __GNU_LIBRARY__