diff options
| author | Damien Miller <djm@mindrot.org> | 2014-01-22 16:30:15 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-01-22 16:30:15 +1100 |
| commit | ee87838786cef0194db36ae0675b3e7c4e8ec661 (patch) | |
| tree | a7df25deb4b1d3becbcac8022f03bd3bb03960d7 /openbsd-compat/setproctitle.c | |
| parent | 5c96a154c7940fa67b1f11c421e390dbbc159f27 (diff) | |
| download | openssh-git-ee87838786cef0194db36ae0675b3e7c4e8ec661.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
Diffstat (limited to 'openbsd-compat/setproctitle.c')
| -rw-r--r-- | openbsd-compat/setproctitle.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |