diff options
author | tim <tim> | 2012-02-14 18:03:30 +0000 |
---|---|---|
committer | tim <tim> | 2012-02-14 18:03:30 +0000 |
commit | 61be551d4706108c1e2f88e4642b0bc140e5ac7f (patch) | |
tree | 5c085c54084c471318c93a5418991d0943299a93 | |
parent | a8e0ea90df0c3012d5e6fbeb90f2adf3057bb266 (diff) | |
download | openssh-61be551d4706108c1e2f88e4642b0bc140e5ac7f.tar.gz |
- (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@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/bsd-misc.h | 4 | ||||
-rw-r--r-- | sshd.c | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -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 - (djm) [openbsd-compat/bsd-cygwin_util.c] Add PROGRAMFILES to list of preserved Cygwin environment variables; from Corinna Vinschen diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index e70c3f9e..e3717562 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h @@ -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> @@ -86,7 +86,7 @@ int tcsendbreak(int, int); #endif #ifndef HAVE_UNSETENV -void unsetenv(const char *); +int unsetenv(const char *); #endif /* wrapper for signal interface */ @@ -1511,7 +1511,7 @@ main(int ac, char **av) * root's environment */ if (getenv("KRB5CCNAME") != NULL) - unsetenv("KRB5CCNAME"); + (void) unsetenv("KRB5CCNAME"); #ifdef _UNICOS /* Cray can define user privs drop all privs now! |