[Fedora-directory-commits] mod_admserv mod_admserv.c,1.26,1.27

[Robert Crittenden (rcritten)]

Author: rcritten

Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32710

Modified Files:
	mod_admserv.c 
Log Message:
200988

Use a macro so HP/ux can use their own setresuid() call instead of
seteuid. apxs provides the define we need via: apxs -q EXTRA_CPPFLAGS



Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_admserv.c	17 Jul 2006 19:01:29 -0000	1.26
+++ mod_admserv.c	8 Aug 2006 20:04:43 -0000	1.27
@@ -65,6 +65,12 @@
 
 #include "mod_admserv.h"
 
+#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
+#define SETEUID(id) setresuid((uid_t) -1, id, (uid_t) -1)
+#else
+#define SETEUID(id) seteuid(id)
+#endif
+
 /*
  * These are keys for items we store in r->notes to pass data from one stage
  * in the request to another.  They must be unique.  If necessary, prefix
@@ -2031,7 +2037,7 @@
 #ifdef CHANGE_EUID
     /* make sure pset creates the cache file owned by the server uid, not root */
     if (geteuid() == 0) {
-        seteuid(unixd_config.user_id);
+        SETEUID(unixd_config.user_id);
         reseteuid = 1;
     }
 #endif /* CHANGE_EUID */
@@ -2044,7 +2050,7 @@
 
 #ifdef CHANGE_EUID
     if (reseteuid) {
-        seteuid(0);
+        SETEUID(0);
     }
 #endif /* CHANGE_EUID */