tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (tim) [openbsd-compat/bsd-misc.h sshd.c] Fix conflicting return type for 

unsetenv due to rev 1.14 change to setenv.c. Cast unsetenv to void in sshd.c
   ok dtucker@
This commit is contained in:
Tim Rice 2012-02-14 10:03:30 -08:00
parent 7b7901c330
commit e3609c935c
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
20120215
- (tim) [openbsd-compat/bsd-misc.h sshd.c] Fix conflicting return type for
unsetenv due to rev 1.14 change to setenv.c. Cast unsetenv to void in sshd.c
ok dtucker@
20120214 20120214
- (djm) [openbsd-compat/bsd-cygwin_util.c] Add PROGRAMFILES to list of - (djm) [openbsd-compat/bsd-cygwin_util.c] Add PROGRAMFILES to list of
preserved Cygwin environment variables; from Corinna Vinschen preserved Cygwin environment variables; from Corinna Vinschen

4
openbsd-compat/bsd-misc.h
View File

@ -1,4 +1,4 @@
/* $Id: bsd-misc.h,v 1.19 2010/11/08 22:26:23 tim Exp $ */ /* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim Exp $ */
/* /*
* Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
@ -86,7 +86,7 @@ int tcsendbreak(int, int);
#endif #endif
#ifndef HAVE_UNSETENV #ifndef HAVE_UNSETENV
void unsetenv(const char *); int unsetenv(const char *);
#endif #endif
/* wrapper for signal interface */ /* wrapper for signal interface */

2
sshd.c
View File

@ -1511,7 +1511,7 @@ main(int ac, char **av)
* root's environment * root's environment
*/ */
if (getenv("KRB5CCNAME") != NULL) if (getenv("KRB5CCNAME") != NULL)
unsetenv("KRB5CCNAME"); (void) unsetenv("KRB5CCNAME");
#ifdef _UNICOS #ifdef _UNICOS
/* Cray can define user privs drop all privs now! /* Cray can define user privs drop all privs now!