3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ed1c07cba..201f2cb1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e70c3f9e9..e37175625 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 */
diff --git a/sshd.c b/sshd.c
index c8d71f8fe..b63aaa428 100644
--- a/sshd.c
+++ b/sshd.c
@@ -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!