*** empty log message ***

diff --git a/config.h.in b/config.h.in
index fc92890837d0021e98105cb210da849cfbf5ff3b..d3a6f9337b238137c27db20f5136bd9e2171cd87 100644 (file)
--- 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 9db31f2b1ef1ce26103e906153aa19aa7ef32625..16884afc7c4d9ea128768de0e3e3c1b6813f79a6 100755 (executable)
--- 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 5293e29f39050eadee83e70ebf12a6b31d47780a..8cd8d8169b76e7a67825c958b8a0eedea42af55b 100644 (file)
--- 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 a687dea7c86e0aa6d5117e21ffeb653ae0cc9d17..5181bed31b4960d21f3d1168b79b9f540335cdcb 100644 (file)
--- 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 9fba2396076ed507394ca537bda7436e7b061c4c..55fa6176dca1264b179b883bb3c20f6c3a5b4b9c 100644 (file)
--- 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 f816d5f8f608e4147303dc86a813ac0f191e9c3c..888c5f75663300e7fcac1f79079682ec3f46f2e4 100644 (file)
--- 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