patches/PolicyKit-02-dirfd.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 874 69c134bdcaef
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
874
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- PolicyKit-0.7/configure.in-orig	2008-02-06 01:23:37.911792000 -0600
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ PolicyKit-0.7/configure.in	2008-02-06 01:24:16.554869000 -0600
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -288,6 +288,43 @@ AM_CONDITIONAL(POLKIT_AUTHDB_DEFAULT, [t
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
 
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
 
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
 dnl ---------------------------------------------------------------------------
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
+dnl - Check for dirfd
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
+dnl ---------------------------------------------------------------------------
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
+
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
+AC_MSG_CHECKING(for dirfd)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    11
+AC_TRY_LINK([
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    12
+#include <sys/types.h>
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    13
+#include <dirent.h>
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    14
+],[
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    15
+DIR *dirp;
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    16
+dirp = opendir(".");
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    17
+dirfd(dirp);
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    18
+closedir(dirp);
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    19
+],
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    20
+dbus_have_dirfd=yes, dbus_have_dirfd=no)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    21
+AC_MSG_RESULT($dbus_have_dirfd)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    22
+if test "$dbus_have_dirfd" = yes; then
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    23
+        AC_DEFINE(HAVE_DIRFD,1,[Have dirfd function])
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    24
+else
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    25
+        AC_MSG_CHECKING(for DIR *dirp->dd_fd)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    26
+        AC_TRY_LINK([
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    27
+#include <sys/types.h>
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    28
+#include <dirent.h>
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    29
+        ],[
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    30
+DIR *dirp;
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    31
+int fd;
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    32
+dirp = opendir(".");
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    33
+fd = dirp->dd_fd;
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    34
+closedir(dirp);
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    35
+        ],
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    36
+        dbus_have_ddfd=yes, dbus_have_ddfd=no)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    37
+        AC_MSG_RESULT($dbus_have_ddfd)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    38
+        if test "$dbus_have_ddfd" = yes; then
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    39
+                AC_DEFINE(HAVE_DDFD,1,[Have the ddfd member of DIR])
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    40
+        fi
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    41
+fi
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    42
+
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    43
+dnl ---------------------------------------------------------------------------
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    44
 dnl - Check for PAM
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    45
 dnl ---------------------------------------------------------------------------
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    46
 
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    47
--- PolicyKit-0.7/src/polkit-dbus/polkit-read-auth-helper.c-orig	2008-02-06 01:22:30.289636000 -0600
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    48
+++ PolicyKit-0.7/src/polkit-dbus/polkit-read-auth-helper.c	2008-02-06 01:20:42.957310000 -0600
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    49
@@ -167,7 +171,14 @@ dump_auths_all (const char *root)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    50
                 goto out;
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    51
         }
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    52
 
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    53
+#if defined(HAVE_DIRFD)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    54
         dfd = dirfd (dir);
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    55
+#elif defined(HAVE_DDFD)
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    56
+        dfd = dir->dd_fd;
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    57
+#else
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    58
+        dfd = dir->__dd_fd;
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    59
+#endif
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    60
+
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    61
         if (dfd == -1) {
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    62
                 fprintf (stderr, "polkit-read-auth-helper: error calling dirfd(): %m\n");
69c134bdcaef 2008-02-06 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    63
                 goto out;