RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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
This commit is contained in:
Damien Miller 2014-01-22 16:30:15 +11:00
parent 5c96a154c7
commit ee87838786
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 20140121
- (dtucker) [configure.ac] Make PIE a configure-time option which defaults - (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. to on platforms where it's known to be reliably detected and off elsewhere.

3
openbsd-compat/setproctitle.c
View File

@ -67,7 +67,8 @@ static size_t argv_env_len = 0;
void void
compat_init_setproctitle(int argc, char *argv[]) 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; extern char **environ;
char *lastargv = NULL; char *lastargv = NULL;
char **envp = environ; char **envp = environ;