2 files changed, 5 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 1ce552d71..7b9b6a516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (dtucker) [openbsd-compat/getenv.c] Merge changes for __findenv from
    OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of
    "register").
+ - (dtucker) [openbsd-compat/getenv.c] Make __findenv static, remove
+   unnecessary prototype.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3244,4 +3246,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3955 2005/11/09 23:10:10 dtucker Exp $
+$Id: ChangeLog,v 1.3956 2005/11/09 23:13:06 dtucker Exp $
diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c
index 9f746ded0..7894c485a 100644
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@@ -39,9 +39,7 @@ static char *rcsid = "$OpenBSD: setenv.c,v 1.6 2003/06/02 20:18:38 millert Exp $
 #include <stdlib.h>
 #include <string.h>
 
-char *__findenv(const char *name, int *offset);
-
-/* OpenSSH Portable: __findenv is from getenv.c rev 1.8 */
+/* OpenSSH Portable: __findenv is from getenv.c rev 1.8, made static */
 
 /*
  * __findenv --
@@ -49,10 +47,8 @@ char *__findenv(const char *name, int *offset);
  *      Sets offset to be the offset of the name/value combination in the
  *      environmental array, for use by setenv(3) and unsetenv(3).
  *      Explicitly removes '=' in argument name.
- *
- *      This routine *should* be a static; don't use it.
  */
-char *
+static char *
 __findenv(const char *name, int *offset)
 {
         extern char **environ;