diff options
| author | djm <djm> | 2014-01-22 05:30:15 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-01-22 05:30:15 +0000 |
| commit | 18e82cc6b94c292952a0249eba759216f041ccd3 (patch) | |
| tree | 1aa7e090683c7732663541eb470b6f9f1a48971d | |
| parent | 5d15a1787745da0d3d65f073fd2b0efb57bc2788 (diff) | |
| download | openssh-18e82cc6b94c292952a0249eba759216f041ccd3.tar.gz | |
- (djm) [openbsd-compat/setproctitle.c] Don't fail to compile if a
platform that is expected to use the reuse-argv style setproctitle
hack surprises us by providing a setproctitle in libc; ok dtucker
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | openbsd-compat/setproctitle.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +20130122 + - (djm) [openbsd-compat/setproctitle.c] Don't fail to compile if a + platform that is expected to use the reuse-argv style setproctitle + hack surprises us by providing a setproctitle in libc; ok dtucker + 20140121 - (dtucker) [configure.ac] Make PIE a configure-time option which defaults 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 a69db22a..9f7ca14c 100644 --- a/openbsd-compat/setproctitle.c +++ b/openbsd-compat/setproctitle.c @@ -67,7 +67,8 @@ static size_t argv_env_len = 0; void compat_init_setproctitle(int argc, char *argv[]) { -#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV +#if !defined(HAVE_SETPROCTITLE) && \ + defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV extern char **environ; char *lastargv = NULL; char **envp = environ; |