diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/setproctitle.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20130122 | ||
2 | - (djm) [openbsd-compat/setproctitle.c] Don't fail to compile if a | ||
3 | platform that is expected to use the reuse-argv style setproctitle | ||
4 | hack surprises us by providing a setproctitle in libc; ok dtucker | ||
5 | |||
1 | 20140121 | 6 | 20140121 |
2 | - (dtucker) [configure.ac] Make PIE a configure-time option which defaults | 7 | - (dtucker) [configure.ac] Make PIE a configure-time option which defaults |
3 | to on platforms where it's known to be reliably detected and off elsewhere. | 8 | to on platforms where it's known to be reliably detected and off elsewhere. |
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c index a69db22a2..9f7ca14c2 100644 --- a/openbsd-compat/setproctitle.c +++ b/openbsd-compat/setproctitle.c | |||
@@ -67,7 +67,8 @@ static size_t argv_env_len = 0; | |||
67 | void | 67 | void |
68 | compat_init_setproctitle(int argc, char *argv[]) | 68 | compat_init_setproctitle(int argc, char *argv[]) |
69 | { | 69 | { |
70 | #if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV | 70 | #if !defined(HAVE_SETPROCTITLE) && \ |
71 | defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV | ||
71 | extern char **environ; | 72 | extern char **environ; |
72 | char *lastargv = NULL; | 73 | char *lastargv = NULL; |
73 | char **envp = environ; | 74 | char **envp = environ; |