move environment stuff to separate file, allow specifying list of

environment files via login.conf


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

appl/login/login.c

@@ -41,51 +41,6 @@
 
 RCSID("$Id$");
 
-/*
- * the environment we will send to execle and the shell.
- */
-
-static char **env;
-static int num_env;
-
-static int login_timeout = 60;
-
-static void
-extend_env(char *str)
-{
-    env = realloc(env, (num_env + 1) * sizeof(*env));
-    if(env == NULL)
-	errx(1, "Out of memory!");
-    env[num_env++] = str;
-}
-
-static void
-add_env(const char *var, const char *value)
-{
-    int i;
-    char *str;
-    asprintf(&str, "%s=%s", var, value);
-    if(str == NULL)
-	errx(1, "Out of memory!");
-    for(i = 0; i < num_env; i++)
-	if(strncmp(env[i], var, strlen(var)) == 0 && 
-	   env[i][strlen(var)] == '='){
-	    free(env[i]);
-	    env[i] = str;
-	    return;
-	}
-    
-    extend_env(str);
-}
-
-static void
-copy_env(void)
-{
-    char **p;
-    for(p = environ; *p; p++)
-	extend_env(*p);
-}
-
 static int
 start_login_process(void)
 {
@@ -607,18 +562,17 @@ do_login(const struct passwd *pwd, char *tty, char *ttyn)
 #endif /* KRB4 */
 
     {
-	char **newenv;
+	char *str = login_conf_get_string("environment");
-	char *p;
+	char buf[MAXPATHLEN];
-	int i, j;
 
-	newenv = NULL;
+	if(str == NULL) {
-	i = read_environment(_PATH_ETC_ENVIRONMENT, &newenv);
+	    login_read_env(_PATH_ETC_ENVIRONMENT);
-	for (j = 0; j < i; j++) {
+	} else {
-	    p = strchr(newenv[j], '=');
+	    while(strsep_copy(&str, ",", buf, sizeof(buf)) != -1) {
-	    *p++ = 0;
+		if(buf[0] == '\0')
-	    add_env(newenv[j], p);
+		    continue;
-	    *--p = '=';
+		login_read_env(buf);
-	    free(newenv[j]);
+	    }
 	}
     }
     add_env("HOME", home_dir);