From: root <root>
Date: Wed, 25 Jan 2006 22:09:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=381463de6436bbbe6ddcc2abbab1ae3c4cba0fed;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/config.h.in b/config.h.in
index fc928908..d3a6f933 100644
--- a/config.h.in
+++ b/config.h.in
@@ -114,6 +114,9 @@
 /* Define to 1 if you have the `setreuid' function. */
 #undef HAVE_SETREUID
 
+/* Define to 1 if you have the `setuid' function. */
+#undef HAVE_SETUID
+
 /* Define to 1 if you have the `setutent' function. */
 #undef HAVE_SETUTENT
 
diff --git a/configure b/configure
index 9db31f2b..16884afc 100755
--- a/configure
+++ b/configure
@@ -9952,15 +9952,9 @@ _ACEOF
 
 
 
-
-
-
 for ac_func in \
 	unsetenv \
 	setutent \
-	seteuid \
-	setresuid \
-	setreuid \
 	on_exit \
 
 do
@@ -12246,12 +12240,20 @@ done
 
 
 
+
+
+
+
 for ac_func in \
   revoke \
   _getpty \
   getpt \
   posix_openpt \
   isastream \
+  setuid \
+  seteuid \
+  setreuid \
+  setresuid \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/configure.ac b/configure.ac
index 5293e29f..8cd8d816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,9 +654,6 @@ dnl> AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( \
 	unsetenv \
 	setutent \
-	seteuid \
-	setresuid \
-	setreuid \
 	on_exit \
 )
 
diff --git a/ptytty.m4 b/ptytty.m4
index a687dea7..5181bed3 100644
--- a/ptytty.m4
+++ b/ptytty.m4
@@ -17,6 +17,10 @@ AC_CHECK_FUNCS( \
   getpt \
   posix_openpt \
   isastream \
+  setuid \
+  seteuid \
+  setreuid \
+  setresuid \
 )
 
 have_clone=no
diff --git a/src/proxy.C b/src/proxy.C
index 9fba2396..55fa6176 100644
--- a/src/proxy.C
+++ b/src/proxy.C
@@ -328,6 +328,8 @@ ptytty::drop_privileges ()
 #elif HAVE_SETUID
   setgid (gid);
   setuid (uid);
+#else
+# error no way to drop privileges, configure failed?
 #endif
 
   if (uid != geteuid ()
diff --git a/src/xdefaults.C b/src/xdefaults.C
index f816d5f8..888c5f75 100644
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -381,8 +381,9 @@ static const char optionsstring[] = "options: "
                                     "pointerBlank,"
 #endif
 #if defined(NO_RESOURCES)
-                                    "NoResources"
+                                    "NoResources,"
 #endif
+                                    "v" VERSION
                                     "\nUsage: ";		/* Usage */
 
 #define INDENT 18