From cf83c9ecea4a676c8f4da07f47436a5fa4ce180a Mon Sep 17 00:00:00 2001
From: mycroft <mycroft>
Date: Tue, 21 Nov 2000 23:37:02 +0000
Subject: Nuke all usage of setre[ug]id(), even though they appear to be
 `safe'.

---
 sysutils/cdrecord/files/patch-sum  |  3 +-
 sysutils/cdrecord/patches/patch-ah | 74 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/cdrecord/patches/patch-ah

(limited to 'sysutils/cdrecord')

diff --git a/sysutils/cdrecord/files/patch-sum b/sysutils/cdrecord/files/patch-sum
index 71efac06e5a..3347b20259b 100644
--- a/sysutils/cdrecord/files/patch-sum
+++ b/sysutils/cdrecord/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2000/09/10 17:37:10 wiz Exp $
+$NetBSD: patch-sum,v 1.9 2000/11/21 23:37:02 mycroft Exp $
 
 MD5 (patch-aa) = 215cf68dff1a2f803801ec715a5a871b
 MD5 (patch-ab) = 3a20ed15fd69037fc67d9d7172125c23
@@ -6,3 +6,4 @@ MD5 (patch-ac) = ae67c9a36c6b7370ca040f8b86e3b5d0
 MD5 (patch-ae) = 4c3938baa5a03adc55193361aa43c697
 MD5 (patch-af) = 82018d82a174d9d22e4f0f09d2a20276
 MD5 (patch-ag) = 4f357b1413270e739ce18727f8d3e8c8
+MD5 (patch-ah) = e36dffc4823a576c7c98e45d1ecc4f9b
diff --git a/sysutils/cdrecord/patches/patch-ah b/sysutils/cdrecord/patches/patch-ah
new file mode 100644
index 00000000000..21492ba902b
--- /dev/null
+++ b/sysutils/cdrecord/patches/patch-ah
@@ -0,0 +1,74 @@
+$NetBSD: patch-ah,v 1.1 2000/11/21 23:37:02 mycroft Exp $
+
+--- cdda2wav/setuid.c.orig	Sat Apr 22 20:37:57 2000
++++ cdda2wav/setuid.c	Tue Nov 21 23:30:58 2000
+@@ -93,7 +93,7 @@
+     }
+     if (geteuid() == 0) return; /* nothing to do */
+ 
+-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
++#if defined (HAVE_SETEUID)
+     if (seteuid(effective_uid)) {
+ 	perror("seteuid in needroot()");
+ 	exit(1);
+@@ -127,7 +127,7 @@
+     }
+     if (geteuid() != 0) return; /* nothing to do */
+ 
+-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
++#if defined (HAVE_SETEUID)
+     if (seteuid(real_uid)) {
+ 	perror("seteuid in dontneedroot()");
+ 	exit(1);
+@@ -185,7 +185,7 @@
+ 
+     if (getegid() == effective_gid) return; /* nothing to do */
+ 
+-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
++#if defined (HAVE_SETEGID)
+     if (setegid(effective_gid)) {
+ 	perror("setegid in needgroup()");
+ 	exit(1);
+@@ -216,7 +216,7 @@
+ 	exit(1);
+     }
+     if (getegid() != effective_gid) return; /* nothing to do */
+-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
++#if defined (HAVE_SETEGID)
+     if (setegid(real_gid)) {
+ 	perror("setegid in dontneedgroup()");
+ 	exit(1);
+--- misc/readcd.c.orig	Thu Jul 20 16:18:45 2000
++++ misc/readcd.c	Tue Nov 21 23:31:13 2000
+@@ -293,11 +293,11 @@
+ 	/*
+ 	 * We don't need root privilleges anymore.
+ 	 */
+-#ifdef	HAVE_SETREUID
+-	if (setreuid(-1, getuid()) < 0)
+-#else
+ #ifdef	HAVE_SETEUID
+ 	if (seteuid(getuid()) < 0)
++#else
++#ifdef	HAVE_SETREUID
++	if (setreuid(-1, getuid()) < 0)
+ #else
+ 	if (setuid(getuid()) < 0)
+ #endif
+--- mkisofs/mkisofs.c.orig	Thu Jul 20 16:31:17 2000
++++ mkisofs/mkisofs.c	Tue Nov 21 23:31:20 2000
+@@ -1802,11 +1802,11 @@
+ 		}
+ 	}
+ 	/* We don't need root privilleges anymore. */
+-#ifdef	HAVE_SETREUID
+-	if (setreuid(-1, getuid()) < 0)
+-#else
+ #ifdef	HAVE_SETEUID
+ 	if (seteuid(getuid()) < 0)
++#else
++#ifdef	HAVE_SETREUID
++	if (setreuid(-1, getuid()) < 0)
+ #else
+ 	if (setuid(getuid()) < 0)
+ #endif
-- 
cgit v1.2.3