diff options
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -924,11 +924,11 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid) | |||
924 | var = child_get_env(tmpenv, "PATH"); | 924 | var = child_get_env(tmpenv, "PATH"); |
925 | if (var != NULL) | 925 | if (var != NULL) |
926 | child_set_env(env, envsize, "PATH", var); | 926 | child_set_env(env, envsize, "PATH", var); |
927 | 927 | ||
928 | if ((var = child_get_env(tmpenv, "UMASK")) != NULL) | 928 | if ((var = child_get_env(tmpenv, "UMASK")) != NULL) |
929 | if (sscanf(var, "%5lo", &mask) == 1) | 929 | if (sscanf(var, "%5lo", &mask) == 1) |
930 | umask((mode_t)mask); | 930 | umask((mode_t)mask); |
931 | 931 | ||
932 | for (i = 0; tmpenv[i] != NULL; i++) | 932 | for (i = 0; tmpenv[i] != NULL; i++) |
933 | xfree(tmpenv[i]); | 933 | xfree(tmpenv[i]); |
934 | xfree(tmpenv); | 934 | xfree(tmpenv); |
@@ -953,7 +953,7 @@ void copy_environment(char **source, char ***env, u_int *envsize) | |||
953 | 953 | ||
954 | debug3("Copy environment: %s=%s", var_name, var_val); | 954 | debug3("Copy environment: %s=%s", var_name, var_val); |
955 | child_set_env(env, envsize, var_name, var_val); | 955 | child_set_env(env, envsize, var_name, var_val); |
956 | 956 | ||
957 | xfree(var_name); | 957 | xfree(var_name); |
958 | } | 958 | } |
959 | } | 959 | } |
@@ -1096,7 +1096,7 @@ do_setup_env(Session *s, const char *shell) | |||
1096 | */ | 1096 | */ |
1097 | if (options.use_pam) { | 1097 | if (options.use_pam) { |
1098 | char **p; | 1098 | char **p; |
1099 | 1099 | ||
1100 | p = fetch_pam_child_environment(); | 1100 | p = fetch_pam_child_environment(); |
1101 | copy_environment(p, &env, &envsize); | 1101 | copy_environment(p, &env, &envsize); |
1102 | free_pam_environment(p); | 1102 | free_pam_environment(p); |
@@ -2033,13 +2033,13 @@ session_tty_list(void) | |||
2033 | for (i = 0; i < MAX_SESSIONS; i++) { | 2033 | for (i = 0; i < MAX_SESSIONS; i++) { |
2034 | Session *s = &sessions[i]; | 2034 | Session *s = &sessions[i]; |
2035 | if (s->used && s->ttyfd != -1) { | 2035 | if (s->used && s->ttyfd != -1) { |
2036 | 2036 | ||
2037 | if (strncmp(s->tty, "/dev/", 5) != 0) { | 2037 | if (strncmp(s->tty, "/dev/", 5) != 0) { |
2038 | cp = strrchr(s->tty, '/'); | 2038 | cp = strrchr(s->tty, '/'); |
2039 | cp = (cp == NULL) ? s->tty : cp + 1; | 2039 | cp = (cp == NULL) ? s->tty : cp + 1; |
2040 | } else | 2040 | } else |
2041 | cp = s->tty + 5; | 2041 | cp = s->tty + 5; |
2042 | 2042 | ||
2043 | if (buf[0] != '\0') | 2043 | if (buf[0] != '\0') |
2044 | strlcat(buf, ",", sizeof buf); | 2044 | strlcat(buf, ",", sizeof buf); |
2045 | strlcat(buf, cp, sizeof buf); | 2045 | strlcat(buf, cp, sizeof buf); |