use getpeereid

This commit is contained in:
espie 2002-04-08 23:12:26 +00:00
parent 20de392348
commit 651f8b05e8
5 changed files with 70 additions and 11 deletions

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-config_h_in,v 1.1 2002/04/08 23:12:26 espie Exp $
--- config.h.in.orig Tue Apr 9 00:10:28 2002
+++ config.h.in Tue Apr 9 00:14:03 2002
@@ -64,6 +64,9 @@
/* Define if you have gethostname prototype */
#undef HAVE_GETHOSTNAME_PROTO
+/* Define if you have the `getpeereid' function. */
+#undef HAVE_GETPEEREID
+
/* Define if you have the `getpt' function. */
#undef HAVE_GETPT

View File

@ -1,5 +1,5 @@
--- configure.in.orig Sat Nov 10 08:47:36 2001
+++ configure.in Sun Dec 30 20:49:07 2001
+++ configure.in Tue Apr 9 00:01:43 2002
@@ -36,7 +36,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM
@ -9,7 +9,15 @@
KDE_SET_PREFIX
@@ -790,6 +790,11 @@ if test "x$with_cdparanoia" = "xCHECK" ;
@@ -488,6 +488,7 @@ AC_TRY_RUN([
], nogroup=nogroup, nogroup=65534, nogroup=65534)
AC_MSG_RESULT($nogroup)
AC_SUBST(nogroup)
+AC_CHECK_FUNCS(getpeereid)
dnl this is for kdm:
@@ -790,6 +791,11 @@ if test "x$with_cdparanoia" = "xCHECK" ;
break
fi
done
@ -21,7 +29,7 @@
if test "$with_cdparanoia" = FOUND; then
if test "$ext" = la; then
grep "^library_names='*[a-z]*'" $para_libdir/libcdda_paranoia.$ext 2>&1 > /dev/null || with_cdparanoia=NOTFOUND
@@ -891,9 +896,11 @@ NOTFOUND) AC_MSG_RESULT(searched but not
@@ -891,9 +897,11 @@ NOTFOUND) AC_MSG_RESULT(searched but not
fi
non_compile=no
if test "x$enable_lametest" = xyes ; then
@ -33,7 +41,7 @@
LIBS="$LIBS $all_libraries $LAME_LIBS"
rm -f conf.lametest conf.wrongver
AC_TRY_RUN([
@@ -916,6 +923,7 @@ int main ()
@@ -916,6 +924,7 @@ int main ()
}
], , non_compile=yes , [echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
@ -41,7 +49,7 @@
LIBS="$ac_save_LIBS"
# bogus return value, but it _did_ run correctly
test -f conf.lametest && non_compile=no
@@ -933,6 +941,7 @@ int main ()
@@ -933,6 +942,7 @@ int main ()
# only do this test, if it really didn't run
echo "*** Could not run Lame test program, checking why..."
CFLAGS="$CFLAGS $all_includes $LAME_INCS"
@ -49,7 +57,7 @@
LIBS="$LIBS $all_libraries $LAME_LIBS"
AC_TRY_LINK([
#include <stdio.h>
@@ -959,6 +968,7 @@ echo "*** or that you have moved Lame si
@@ -959,6 +969,7 @@ echo "*** or that you have moved Lame si
# ac_save_* still set, because this else part is only entered if the
# enable_lametest was yes, in which case also ac_save_* was set.
CFLAGS="$ac_save_CFLAGS"
@ -57,7 +65,7 @@
LIBS="$ac_save_LIBS"
fi
LAME_INCS=
@@ -1297,6 +1307,7 @@ AC_MSG_CHECKING(if ksysguardd can be com
@@ -1297,6 +1308,7 @@ AC_MSG_CHECKING(if ksysguardd can be com
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
@ -65,7 +73,7 @@
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
*) ksysguard_compile=no; UNAME='' ;;
esac
@@ -1305,7 +1316,8 @@ AC_SUBST(UNAME)
@@ -1305,7 +1317,8 @@ AC_SUBST(UNAME)
AC_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
AC_SUBST(LIBSENSORS)
@ -75,7 +83,7 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE kxkb" )
dnl
dnl
@@ -1661,8 +1673,8 @@ kdcop/Makefile \
@@ -1661,8 +1674,8 @@ kdcop/Makefile \
kdebugdialog/Makefile \
kdeprint/Makefile \
kdeprint/descriptions/Makefile \

View File

@ -0,0 +1,8 @@
$OpenBSD: patch-kdesu_configure_in_in,v 1.1 2002/04/08 23:12:26 espie Exp $
--- kdesu/configure.in.in.orig Tue Mar 14 15:42:46 2000
+++ kdesu/configure.in.in Tue Apr 9 00:01:55 2002
@@ -23,3 +23,4 @@ AC_TRY_RUN([
], nogroup=nogroup, nogroup=65534, nogroup=65534)
AC_MSG_RESULT($nogroup)
AC_SUBST(nogroup)
+AC_CHECK_FUNCS(getpeereid)

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-kdesu_kdesud_secure_cpp,v 1.1 2002/04/08 23:12:26 espie Exp $
--- kdesu/kdesud/secure.cpp.orig Mon Apr 8 22:47:14 2002
+++ kdesu/kdesud/secure.cpp Mon Apr 8 22:51:26 2002
@@ -42,6 +42,20 @@ SocketSecurity::SocketSecurity(int sockf
}
#else
+# if defined(HAVE_GETPEEREID)
+SocketSecurity::SocketSecurity(int sockfd)
+{
+ uid_t euid;
+ gid_t egid;
+ if (getpeereid(sockfd, &euid, &egid) == 0) {
+ cred.uid = euid;
+ cred.gid = egid;
+ cred.pid = -1;
+ ok = true;
+ }
+}
+
+# else
/**
@@ -63,4 +77,5 @@ SocketSecurity::SocketSecurity(int sockf
ok = true;
}
+# endif
#endif

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ksysguard_configure_in_in,v 1.3 2002/01/03 09:39:30 espie Exp $
$OpenBSD: patch-ksysguard_configure_in_in,v 1.4 2002/04/08 23:12:26 espie Exp $
--- ksysguard/configure.in.in.orig Sun May 13 23:20:29 2001
+++ ksysguard/configure.in.in Sun Dec 30 20:41:58 2001
+++ ksysguard/configure.in.in Tue Apr 9 00:05:03 2002
@@ -3,6 +3,7 @@ AC_MSG_CHECKING(if ksysguardd can be com
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;