summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-06-02 08:07:31 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-06-02 08:07:31 +1000
commitf60845fde29cead9d75e812db1c04916b4c58ffd (patch)
treea69fe76f6dd73057e46625867d1b4282e8a5a040 /session.c
parent12f6533215c0a36ab29d11ff52a853fce45573b4 (diff)
- (dtucker) [M auth-chall.c auth-krb5.c auth-pam.c cipher-aes.c cipher-ctr.c
groupaccess.c loginrec.c monitor.c monitor_wrap.c session.c sshd.c sshlogin.c uidswap.c openbsd-compat/bsd-cygwin_util.c openbsd-compat/getrrsetbyname-ldns.c openbsd-compat/port-aix.c openbsd-compat/port-linux.c] Replace portable-specific instances of xfree with the equivalent calls to free.
Diffstat (limited to 'session.c')
-rw-r--r--session.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/session.c b/session.c
index f47cc1788..1424825ca 100644
--- a/session.c
+++ b/session.c
@@ -1092,8 +1092,8 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
1092 umask((mode_t)mask); 1092 umask((mode_t)mask);
1093 1093
1094 for (i = 0; tmpenv[i] != NULL; i++) 1094 for (i = 0; tmpenv[i] != NULL; i++)
1095 xfree(tmpenv[i]); 1095 free(tmpenv[i]);
1096 xfree(tmpenv); 1096 free(tmpenv);
1097} 1097}
1098#endif /* HAVE_ETC_DEFAULT_LOGIN */ 1098#endif /* HAVE_ETC_DEFAULT_LOGIN */
1099 1099
@@ -1109,7 +1109,7 @@ copy_environment(char **source, char ***env, u_int *envsize)
1109 for(i = 0; source[i] != NULL; i++) { 1109 for(i = 0; source[i] != NULL; i++) {
1110 var_name = xstrdup(source[i]); 1110 var_name = xstrdup(source[i]);
1111 if ((var_val = strstr(var_name, "=")) == NULL) { 1111 if ((var_val = strstr(var_name, "=")) == NULL) {
1112 xfree(var_name); 1112 free(var_name);
1113 continue; 1113 continue;
1114 } 1114 }
1115 *var_val++ = '\0'; 1115 *var_val++ = '\0';
@@ -1117,7 +1117,7 @@ copy_environment(char **source, char ***env, u_int *envsize)
1117 debug3("Copy environment: %s=%s", var_name, var_val); 1117 debug3("Copy environment: %s=%s", var_name, var_val);
1118 child_set_env(env, envsize, var_name, var_val); 1118 child_set_env(env, envsize, var_name, var_val);
1119 1119
1120 xfree(var_name); 1120 free(var_name);
1121 } 1121 }
1122} 1122}
1123 1123