- (djm) Fix compilation for NetBSD from dtucker@zip.com.au

diff --git a/ChangeLog b/ChangeLog
index 9c64c24e5127b110b2763927177b700df752ab8a..2f9adb86461823d61dbdfc8fe04e90bf74885c4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20030120
+ - (djm) Fix compilation for NetBSD from dtucker@zip.com.au
+
 20030118
  - (djm) Revert fix for Bug #442 for now.
 
@@ -1034,4 +1037,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2575 2003/01/18 05:24:06 djm Exp $
+$Id: ChangeLog,v 1.2576 2003/01/20 02:15:10 djm Exp $

diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index 14d5d2f3cab22cd3c96fa7806132054098b64faf..07af7e9c0919a700495c93d5c580bc61f73a47bb 100644 (file)
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -31,7 +31,7 @@
  * to contain some useful information. Mechanism differs wildly across
  * platforms.
  *
- * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.4 2003/01/12 23:04:59 djm Exp $
+ * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.5 2003/01/20 02:15:11 djm Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * various details abducted from various places
@@ -51,8 +51,6 @@
 #include <sys/exec.h>
 #endif
 
-extern char **environ;
-
 /*------
  * Alternative ways of updating ps display:
  *
@@ -86,6 +84,9 @@ extern char **environ;
 #ifndef SETPROCTITLE_PS_PADDING
 # define SETPROCTITLE_PS_PADDING       ' '
 #endif
+#endif /* HAVE_SETPROCTITLE */
+
+extern char **environ;
 
 /*
  * argv clobbering uses existing argv space, all other methods need a buffer
@@ -104,6 +105,7 @@ static char **save_argv;
 
 extern char *__progname;
 
+#ifndef HAVE_SETPROCTITLE
 /*
  * Call this to update the ps status display to a fixed prefix plus an
  * indication of what you're currently doing passed in the argument.