Fix a hole in SETXID_SUPPORT, but do not enable it by default yet.

3 files changed, 40 insertions, 8 deletions

diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
index cc3cb1d2487..68ef7e815d1 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1 1999/04/20 15:01:11 mycroft Exp $
+$NetBSD: patch-am,v 1.2 2000/02/23 01:32:11 mycroft Exp $
 
 --- src/cvs.h.orig	Sun Jul 26 22:54:11 1998
-+++ src/cvs.h	Tue Apr 20 10:15:03 1999
++++ src/cvs.h	Tue Feb 22 20:25:09 2000
 @@ -383,6 +383,7 @@
  
  extern int trace;		/* Show all commands */
@@ -10,3 +10,11 @@ $NetBSD: patch-am,v 1.1 1999/04/20 15:01:11 mycroft Exp $
  extern int logoff;		/* Don't write history entry */
  
  extern int top_level_admin;
+@@ -636,6 +637,7 @@
+ #define	RUN_STDOUT_APPEND	0x0004	/* append to stdout, don't truncate */
+ #define	RUN_STDERR_APPEND	0x0008	/* append to stderr, don't truncate */
+ #define	RUN_SIGIGNORE		0x0010	/* ignore interrupts for command */
++#define	RUN_UNSETXID		0x0020	/* undo setgid in child */
+ #define	RUN_TTY		(char *)0	/* for the benefit of lint */
+ 
+ void run_arg PROTO((const char *s));
diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at
index 73fd85b1035..d1ee79c55c2 100644
--- a/devel/cvs/patches/patch-at
+++ b/devel/cvs/patches/patch-at
@@ -1,11 +1,21 @@
-$NetBSD: patch-at,v 1.2 1999/05/23 14:01:37 mycroft Exp $
+$NetBSD: patch-at,v 1.3 2000/02/23 01:32:11 mycroft Exp $
 
 --- src/logmsg.c.orig	Sat Jan 10 12:46:19 1998
-+++ src/logmsg.c	Sun May 23 09:32:11 1999
-@@ -587,6 +587,15 @@
++++ src/logmsg.c	Tue Feb 22 20:25:09 2000
+@@ -285,7 +285,7 @@
+     run_setup (editinfo_editor ? editinfo_editor : Editor);
+     run_arg (fname);
+     if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
+-			     RUN_NORMAL | RUN_SIGIGNORE)) != 0)
++			     RUN_NORMAL | RUN_SIGIGNORE | RUN_UNSETXID)) != 0)
+ 	error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
+ 	       editinfo_editor ? "Logfile verification failed" :
+ 	       "warning: editor session failed");
+@@ -586,6 +586,15 @@
+ 			xrealloc (str_list,
  				  strlen (str_list) + strlen (p->key) + 5);
  		    (void) strcat (str_list, p->key);
- 		    break;
++		    break;
 +		case 't':
 +		    str_list =
 +			xrealloc (str_list,
@@ -14,7 +24,6 @@ $NetBSD: patch-at,v 1.2 1999/05/23 14:01:37 mycroft Exp $
 +				   + 10)
 +				  );
 +		    (void) strcat (str_list, (li->tag ? li->tag : ""));
-+		    break;
+ 		    break;
  		case 'V':
  		    str_list =
- 			xrealloc (str_list,
diff --git a/devel/cvs/patches/patch-ay b/devel/cvs/patches/patch-ay
new file mode 100644
index 00000000000..153e6d3ee1c
--- /dev/null
+++ b/devel/cvs/patches/patch-ay
@@ -0,0 +1,15 @@
+$NetBSD: patch-ay,v 1.1 2000/02/23 01:32:12 mycroft Exp $
+
+--- src/run.c.orig	Thu Dec 18 10:18:50 1997
++++ src/run.c	Tue Feb 22 20:25:09 2000
+@@ -188,6 +188,10 @@
+ #endif
+     if (pid == 0)
+     {
++#ifdef SETXID_SUPPORT
++	if (flags & RUN_UNSETXID)
++	    (void) setgid (getgid ());
++#endif
+ 	if (shin != 0)
+ 	{
+ 	    (void) dup2 (shin, 0);