make roken not provide environ, its really something that doesnt work in a multinamespace enviroments (read mac os x)

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23943 ec53bebd-3082-4978-b11e-865c3cabbd6b

appl/login/env.c

@@ -69,6 +69,11 @@ add_env(const char *var, const char *value)
     extend_env(str);
 }
 
+#if !HAVE_DECL_ENVIRON
+extern char **environ;
+#endif
+
+
 void
 copy_env(void)
 {

appl/su/su.c

@@ -64,6 +64,10 @@ RCSID("$Id$");
 
 #include "supaths.h"
 
+#if !HAVE_DECL_ENVIRON
+extern char **environ;
+#endif
+
 int kerberos_flag = 1;
 int csh_f_flag;
 int full_login;
@@ -506,7 +510,7 @@ main(int argc, char **argv)
         if (ok == 5)
            krb5_start_session();
 #endif
-	execv(shell, args);
+	execve(shell, args, environ);
     }
 
     exit(1);

appl/telnet/telnet/commands.c

@@ -1553,8 +1553,8 @@ env_find(unsigned char *var)
 	return(NULL);
 }
 
-#ifdef IRIX4
-#define environ _environ
+#if !HAVE_DECL_ENVIRON
+extern char **environ;
 #endif
 
 void

appl/telnet/telnetd/sys_term.c

@@ -1186,7 +1186,9 @@ startslave(const char *host, const char *utmp_host,
 }
 
 char	*envinit[3];
+#if !HAVE_DECL_ENVIRON
 extern char **environ;
+#endif
 
 void
 init_env(void)

lib/roken/environment.c

@@ -63,7 +63,7 @@ find_var(char **env, char *assignment, size_t len)
  */
 
 static int
-rk_read_env_file(FILE *F, char ***env, int *assigned)
+read_env_file(FILE *F, char ***env, int *assigned)
 {
     int idx = 0;
     int i;
@@ -139,7 +139,7 @@ read_environment(const char *file, char ***env)
     if ((F = fopen(file, "r")) == NULL)
 	return 0;
 
-    rk_read_env_file(F, env, &assigned);
+    read_env_file(F, env, &assigned);
     fclose(F);
     return assigned;
 }

lib/roken/putenv.c

@@ -38,7 +38,9 @@ RCSID("$Id$");
 
 #include <stdlib.h>
 
+#if !HAVE_DECL_ENVIRON
 extern char **environ;
+#endif
 
 /*
  * putenv --

lib/roken/roken.h.in

@@ -444,10 +444,6 @@ extern int optind;
 extern int opterr;
 #endif
 
-#if !HAVE_DECL_ENVIRON
-extern char **environ;
-#endif
-
 #ifndef HAVE_GETIPNODEBYNAME
 struct hostent * ROKEN_LIB_FUNCTION
 getipnodebyname (const char *, int, int, int *);

lib/roken/simple_exec.c

@@ -51,6 +51,10 @@ RCSID("$Id$");
 
 #include "roken.h"
 
+#if !HAVE_DECL_ENVIRON
+extern char **environ;
+#endif
+
 #define EX_NOEXEC	126
 #define EX_NOTFOUND	127
 

lib/roken/unsetenv.c

@@ -41,7 +41,9 @@ RCSID("$Id$");
 
 #include "roken.h"
 
+#if !HAVE_DECL_ENVIRON
 extern char **environ;
+#endif
 
 /*
  * unsetenv --