backout import of openssh-SNAP-20040105

[gssapi-openssh.git] / openssh / openbsd-compat / setenv.c

diff --git a/openssh/openbsd-compat/setenv.c b/openssh/openbsd-compat/setenv.c
index 1dff15c73d80af774a446d23ecf7bd309cdd9e79..c9941c1957269fe8a0ea06f231bca7d7f5f585f8 100644 (file)
--- a/openssh/openbsd-compat/setenv.c
+++ b/openssh/openbsd-compat/setenv.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -35,12 +31,14 @@
 #ifndef HAVE_SETENV
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setenv.c,v 1.4 2001/07/09 06:57:45 deraadt Exp $";
+static char *rcsid = "$OpenBSD: setenv.c,v 1.6 2003/06/02 20:18:38 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
 #include <string.h>
 
+char *__findenv(const char *name, int *offset);
+
 /*
  * __findenv --
  *     Returns pointer to value associated with name, if any, else NULL.
@@ -92,7 +90,6 @@ setenv(name, value, rewrite)
        static int alloced;                     /* if allocated space before */
        register char *C;
        int l_value, offset;
-       char *__findenv();
 
        if (*value == '=')                      /* no `=' in value */
                ++value;