Reverting to revision 1.7. This change should first be audited by

audit@ since it may be bypassing security restrictions.

Pointed out by:	kris

3 files changed, 3 insertions, 12 deletions

diff --git a/www/jakarta-tomcat4/files/daemonctl.c b/www/jakarta-tomcat4/files/daemonctl.c
index 1bc36368241f..765a870fd4e8 100644
--- a/www/jakarta-tomcat4/files/daemonctl.c
+++ b/www/jakarta-tomcat4/files/daemonctl.c
@@ -4,7 +4,7 @@
  *
  * Daemon control program.
  *
- * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat4/files/Attic/daemonctl.c,v 1.8 2002-08-28 09:29:59 znerd Exp $
+ * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat4/files/Attic/daemonctl.c,v 1.9 2002-08-28 22:54:21 znerd Exp $
  */
 
 #include <assert.h>
@@ -78,9 +78,6 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
-	/* Set the UID to the effective UID to fix SUID */
-	setuid(geteuid());
-
 	argument = argv[1];
 	if (strcmp("start", argument) == 0) {
 		start();
diff --git a/www/jakarta-tomcat41/files/daemonctl.c b/www/jakarta-tomcat41/files/daemonctl.c
index 7ce8126de778..60bb58201a6b 100644
--- a/www/jakarta-tomcat41/files/daemonctl.c
+++ b/www/jakarta-tomcat41/files/daemonctl.c
@@ -4,7 +4,7 @@
  *
  * Daemon control program.
  *
- * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/daemonctl.c,v 1.8 2002-08-28 09:29:59 znerd Exp $
+ * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/daemonctl.c,v 1.9 2002-08-28 22:54:21 znerd Exp $
  */
 
 #include <assert.h>
@@ -78,9 +78,6 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
-	/* Set the UID to the effective UID to fix SUID */
-	setuid(geteuid());
-
 	argument = argv[1];
 	if (strcmp("start", argument) == 0) {
 		start();
diff --git a/www/tomcat41/files/daemonctl.c b/www/tomcat41/files/daemonctl.c
index a1e280b5a715..260e156807f7 100644
--- a/www/tomcat41/files/daemonctl.c
+++ b/www/tomcat41/files/daemonctl.c
@@ -4,7 +4,7 @@
  *
  * Daemon control program.
  *
- * $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/daemonctl.c,v 1.8 2002-08-28 09:29:59 znerd Exp $
+ * $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/daemonctl.c,v 1.9 2002-08-28 22:54:21 znerd Exp $
  */
 
 #include <assert.h>
@@ -78,9 +78,6 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
-	/* Set the UID to the effective UID to fix SUID */
-	setuid(geteuid());
-
 	argument = argv[1];
 	if (strcmp("start", argument) == 0) {
 		start();