diff options
| author | tv <tv@pkgsrc.org> | 2005-11-07 19:50:20 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-11-07 19:50:20 +0000 |
| commit | dd47e790f2b67591601833af505547c16cb6c48b (patch) | |
| tree | 8762e033fd13318d0f179c2834aa410cd00b4bb7 /security/openssh | |
| parent | 36ed3d55a0a80ca6b97f9575d9835ec37aa63581 (diff) | |
| download | pkgsrc-dd47e790f2b67591601833af505547c16cb6c48b.tar.gz | |
Skip two more setgroups(3) instances on Interix; openssh now builds again.
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/distinfo | 4 | ||||
| -rw-r--r-- | security/openssh/patches/patch-av | 28 |
2 files changed, 23 insertions, 9 deletions
diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 789dff91f57..bac8cf05128 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2005/11/07 19:35:23 tv Exp $ +$NetBSD: distinfo,v 1.50 2005/11/07 19:50:20 tv Exp $ SHA1 (openssh-4.2p1.tar.gz) = 5e7231cfa8ec673ea856ce291b78fac8b380eb78 RMD160 (openssh-4.2p1.tar.gz) = e1f45333e66d0afceb9934ab73401b4ca06f03a6 @@ -27,4 +27,4 @@ SHA1 (patch-ar) = fe7d5b715ac51bece44d6f3ba9c3c6245d27d00d SHA1 (patch-as) = 6af976b7c018c1a9b0841617edbffdb8b977a2d6 SHA1 (patch-at) = 2468567cc0e91ea375f43c9ebae57644f50a5f27 SHA1 (patch-au) = 052b0b6d8869ad09144e4fc9e1b3c5e03c669c44 -SHA1 (patch-av) = 5efc471716cecfaa7317c05771ee6d6293ecd1e3 +SHA1 (patch-av) = e4116ca18ca2f182761270ae8022987b1553c6b7 diff --git a/security/openssh/patches/patch-av b/security/openssh/patches/patch-av index 44c8b3083a5..2ee1bf87622 100644 --- a/security/openssh/patches/patch-av +++ b/security/openssh/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.2 2005/09/21 18:07:09 reed Exp $ +$NetBSD: patch-av,v 1.3 2005/11/07 19:50:20 tv Exp $ ---- sshd.c.orig 2005-07-26 06:54:56.000000000 -0500 +--- sshd.c.orig 2005-07-26 07:54:56.000000000 -0400 +++ sshd.c -@@ -574,10 +574,15 @@ +@@ -574,10 +574,15 @@ privsep_preauth_child(void) /* XXX not ready, too heavy after chroot */ do_setusercontext(pw); #else @@ -18,7 +18,7 @@ $NetBSD: patch-av,v 1.2 2005/09/21 18:07:09 reed Exp $ #endif } -@@ -617,7 +622,7 @@ +@@ -617,7 +622,7 @@ privsep_preauth(Authctxt *authctxt) close(pmonitor->m_sendfd); /* Demote the child */ @@ -27,7 +27,7 @@ $NetBSD: patch-av,v 1.2 2005/09/21 18:07:09 reed Exp $ privsep_preauth_child(); setproctitle("%s", "[net]"); } -@@ -630,7 +635,7 @@ +@@ -630,7 +635,7 @@ privsep_postauth(Authctxt *authctxt) #ifdef DISABLE_FD_PASSING if (1) { #else @@ -36,16 +36,19 @@ $NetBSD: patch-av,v 1.2 2005/09/21 18:07:09 reed Exp $ #endif /* File descriptor passing is broken or root login */ monitor_apply_keystate(pmonitor); -@@ -911,7 +916,7 @@ +@@ -911,8 +916,10 @@ main(int ac, char **av) av = saved_argv; #endif - if (geteuid() == 0 && setgroups(0, NULL) == -1) ++#ifndef HAVE_INTERIX + if (geteuid() == ROOTUID && setgroups(0, NULL) == -1) debug("setgroups(): %.200s", strerror(errno)); ++#endif /* Initialize configuration options to their default values. */ -@@ -1168,7 +1173,7 @@ + initialize_server_options(&options); +@@ -1168,7 +1175,7 @@ main(int ac, char **av) (st.st_uid != getuid () || (st.st_mode & (S_IWGRP|S_IWOTH)) != 0)) #else @@ -54,3 +57,14 @@ $NetBSD: patch-av,v 1.2 2005/09/21 18:07:09 reed Exp $ #endif fatal("%s must be owned by root and not group or " "world-writable.", _PATH_PRIVSEP_CHROOT_DIR); +@@ -1185,8 +1192,10 @@ main(int ac, char **av) + * to create a file, and we can't control the code in every + * module which might be used). + */ ++#ifndef HAVE_INTERIX + if (setgroups(0, NULL) < 0) + debug("setgroups() failed: %.200s", strerror(errno)); ++#endif + + if (rexec_flag) { + rexec_argv = xmalloc(sizeof(char *) * (rexec_argc + 2)); |