diff options
Diffstat (limited to 'security/openssh/patches/patch-ao')
| -rw-r--r-- | security/openssh/patches/patch-ao | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/openssh/patches/patch-ao b/security/openssh/patches/patch-ao index 6823d1e0080..2d3931130a0 100644 --- a/security/openssh/patches/patch-ao +++ b/security/openssh/patches/patch-ao @@ -1,12 +1,12 @@ -$NetBSD: patch-ao,v 1.12 2008/04/27 00:34:27 tnn Exp $ +$NetBSD: patch-ao,v 1.13 2009/05/21 03:22:29 taca Exp $ One more replacing 0 with ROOTUID is handled by using SUBST framework because patch can't handle it when hpn-patch option is enabled. So, don't simply update this file with mkpatch command. ---- session.c.orig 2008-03-27 01:03:05.000000000 +0100 +--- session.c.orig 2009-01-28 14:29:49.000000000 +0900 +++ session.c -@@ -955,7 +955,7 @@ read_etc_default_login(char ***env, u_in +@@ -1068,7 +1068,7 @@ read_etc_default_login(char ***env, u_in if (tmpenv == NULL) return; @@ -15,7 +15,7 @@ So, don't simply update this file with mkpatch command. var = child_get_env(tmpenv, "SUPATH"); else var = child_get_env(tmpenv, "PATH"); -@@ -1064,7 +1064,7 @@ do_setup_env(Session *s, const char *she +@@ -1177,7 +1177,7 @@ do_setup_env(Session *s, const char *she # endif /* HAVE_ETC_DEFAULT_LOGIN */ if (path == NULL || *path == '\0') { child_set_env(&env, &envsize, "PATH", @@ -24,7 +24,7 @@ So, don't simply update this file with mkpatch command. SUPERUSER_PATH : _PATH_STDPATH); } # endif /* HAVE_CYGWIN */ -@@ -1178,6 +1178,18 @@ do_setup_env(Session *s, const char *she +@@ -1291,6 +1291,18 @@ do_setup_env(Session *s, const char *she strcmp(pw->pw_dir, "/") ? pw->pw_dir : ""); read_environment_file(&env, &envsize, buf); } @@ -43,7 +43,7 @@ So, don't simply update this file with mkpatch command. if (debug_flag) { /* dump the environment */ fprintf(stderr, "Environment:\n"); -@@ -1351,9 +1363,9 @@ do_setusercontext(struct passwd *pw) +@@ -1464,9 +1476,9 @@ do_setusercontext(struct passwd *pw) (void)ssh_selinux_enabled(); #endif @@ -55,7 +55,7 @@ So, don't simply update this file with mkpatch command. { #ifdef HAVE_SETPCRED -@@ -1387,11 +1399,13 @@ do_setusercontext(struct passwd *pw) +@@ -1500,11 +1512,13 @@ do_setusercontext(struct passwd *pw) perror("setgid"); exit(1); } @@ -69,7 +69,7 @@ So, don't simply update this file with mkpatch command. endgrent(); # ifdef USE_PAM /* -@@ -2175,7 +2189,7 @@ session_pty_cleanup2(Session *s) +@@ -2328,7 +2342,7 @@ session_pty_cleanup2(Session *s) record_logout(s->pid, s->tty, s->pw->pw_name); /* Release the pseudo-tty. */ |