summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/setproctitle.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 078ff6e20..8b983b857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 [reconfigure.sh] 4 [reconfigure.sh]
5 missing $SUDO; from dtucker@zip.com.au 5 missing $SUDO; from dtucker@zip.com.au
6 - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. 6 - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.
7 - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before
8 testing its value.
7 9
820030618 1020030618
9 - (djm) OpenBSD CVS Sync 11 - (djm) OpenBSD CVS Sync
@@ -567,4 +569,4 @@
567 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 569 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
568 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 570 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
569 571
570$Id: ChangeLog,v 1.2817 2003/06/22 02:33:27 dtucker Exp $ 572$Id: ChangeLog,v 1.2818 2003/06/22 08:32:10 dtucker Exp $
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index f05cb0e8c..b41100fc6 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -62,7 +62,7 @@ static size_t argv_env_len = 0;
62void 62void
63compat_init_setproctitle(int argc, char *argv[]) 63compat_init_setproctitle(int argc, char *argv[])
64{ 64{
65#if SPT_TYPE == SPT_REUSEARGV 65#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
66 extern char **environ; 66 extern char **environ;
67 char *lastargv = NULL; 67 char *lastargv = NULL;
68 char **envp = environ; 68 char **envp = environ;