summaryrefslogtreecommitdiff
path: root/sysutils/policykit/files/patch-src_polkit_polkit-context.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/policykit/files/patch-src_polkit_polkit-context.c')
-rw-r--r--sysutils/policykit/files/patch-src_polkit_polkit-context.c80
1 files changed, 31 insertions, 49 deletions
diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-context.c b/sysutils/policykit/files/patch-src_polkit_polkit-context.c
index b27cd8edd727..dd23504b8eee 100644
--- a/sysutils/policykit/files/patch-src_polkit_polkit-context.c
+++ b/sysutils/policykit/files/patch-src_polkit_polkit-context.c
@@ -1,9 +1,9 @@
---- src/polkit/polkit-context.c.orig 2007-12-04 20:22:41.000000000 -0500
-+++ src/polkit/polkit-context.c 2007-12-23 00:24:45.000000000 -0500
-@@ -39,7 +39,13 @@
- #include <grp.h>
- #include <unistd.h>
- #include <errno.h>
+--- src/polkit/polkit-context.c.orig 2008-04-15 20:31:16.000000000 -0400
++++ src/polkit/polkit-context.c 2008-04-18 01:12:13.000000000 -0400
+@@ -43,7 +43,13 @@
+ #include <port.h>
+ #include <sys/stat.h>
+ #else
+#ifdef HAVE_INOTIFY
#include <sys/inotify.h>
+#elif HAVE_KQUEUE
@@ -11,10 +11,10 @@
+#include <sys/time.h>
+#include <fcntl.h>
+#endif
+ #endif
#include <syslog.h>
- #include "polkit-config.h"
-@@ -106,11 +112,19 @@ struct _PolKitContext
+@@ -111,11 +117,19 @@ struct _PolKitContext
polkit_bool_t load_descriptions;
@@ -34,7 +34,7 @@
};
/**
-@@ -144,6 +158,10 @@ polkit_context_new (void)
+@@ -149,6 +163,10 @@ polkit_context_new (void)
polkit_bool_t
polkit_context_init (PolKitContext *pk_context, PolKitError **error)
{
@@ -45,15 +45,7 @@
kit_return_val_if_fail (pk_context != NULL, FALSE);
pk_context->policy_dir = kit_strdup (PACKAGE_DATA_DIR "/PolicyKit/policy");
-@@ -153,6 +171,7 @@ polkit_context_init (PolKitContext *pk_c
-
- /* NOTE: we don't load the configuration file until it's needed */
-
-+#ifdef HAVE_INOTIFY
- if (pk_context->io_add_watch_func != NULL) {
- pk_context->inotify_fd = inotify_init ();
- if (pk_context->inotify_fd < 0) {
-@@ -203,6 +222,88 @@ polkit_context_init (PolKitContext *pk_c
+@@ -209,7 +227,87 @@ polkit_context_init (PolKitContext *pk_c
goto error;
}
}
@@ -61,7 +53,7 @@
+ if (pk_context->io_add_watch_func != NULL) {
+ pk_context->kqueue_fd = kqueue ();
+ if (pk_context->kqueue_fd < 0) {
-+ _pk_debug ("failed to initialize kqueue: %s", strerror (errno));
++ polkit_debug ("failed to initialize kqueue: %s", strerror (errno));
+ /* TODO: set error */
+ goto error;
+ }
@@ -69,7 +61,7 @@
+ /* Watch the /etc/PolicyKit/PolicyKit.conf file */
+ pk_context->kqueue_config_fd = open (PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf", O_RDONLY);
+ if (pk_context->kqueue_config_fd < 0) {
-+ _pk_debug ("failed '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf' for reading: %s",
++ polkit_debug ("failed '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf' for reading: %s",
+ strerror (errno));
+ /* TODO: set error */
+ goto error;
@@ -80,7 +72,7 @@
+ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
+ 0, 0);
+ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) {
-+ _pk_debug ("failed to add watch on file '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf': %s",
++ polkit_debug ("failed to add watch on file '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf': %s",
+ strerror (errno));
+ close (pk_context->kqueue_config_fd);
+ /* TODO: set error */
@@ -90,7 +82,7 @@
+ /* Watch the /usr/share/PolicyKit/policy directory */
+ pk_context->kqueue_policy_fd = open (PACKAGE_DATA_DIR "/PolicyKit/policy", O_RDONLY);
+ if (pk_context->kqueue_policy_fd < 0) {
-+ _pk_debug ("failed to open '" PACKAGE_DATA_DIR "/PolicyKit/policy for reading: %s",
++ polkit_debug ("failed to open '" PACKAGE_DATA_DIR "/PolicyKit/policy for reading: %s",
+ strerror (errno));
+ /* TODO: set error */
+ goto error;
@@ -101,7 +93,7 @@
+ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
+ 0, 0);
+ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) {
-+ _pk_debug ("failed to add watch on directory '" PACKAGE_DATA_DIR "/PolicyKit/policy': %s",
++ polkit_debug ("failed to add watch on directory '" PACKAGE_DATA_DIR "/PolicyKit/policy': %s",
+ strerror (errno));
+ close (pk_context->kqueue_policy_fd);
+ /* TODO: set error */
@@ -112,7 +104,7 @@
+ /* Watch the /var/lib/misc/PolicyKit.reload file */
+ pk_context->kqueue_grant_perm_fd = open (PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload", O_RDONLY);
+ if (pk_context->kqueue_grant_perm_fd < 0) {
-+ _pk_debug ("failed to open '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload' for reading: %s",
++ polkit_debug ("failed to open '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload' for reading: %s",
+ strerror (errno));
+ /* TODO: set error */
+ goto error;
@@ -120,40 +112,31 @@
+
+ EV_SET (&ev, pk_context->kqueue_grant_perm_fd, EVFILT_VNODE,
+ EV_ADD | EV_ENABLE | EV_CLEAR,
-+ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
++ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME | NOTE_ATTRIB,
+ 0, 0);
+ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) {
-+ _pk_debug ("failed to add watch on file '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload': %s",
++ polkit_debug ("failed to add watch on file '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload': %s",
+ strerror (errno));
+ close (pk_context->kqueue_grant_perm_fd);
+ /* TODO: set error */
+ goto error;
+ }
+#endif
-+
+
+ pk_context->kqueue_fd_watch_id = pk_context->io_add_watch_func (pk_context, pk_context->kqueue_fd);
+ if (pk_context->kqueue_fd_watch_id == 0) {
-+ _pk_debug ("failed to add io watch");
++ polkit_debug ("failed to add io watch");
+ /* TODO: set error */
+ goto error;
+ }
+ }
-+#endif
-
- return TRUE;
- error:
-@@ -296,6 +397,7 @@ polkit_context_io_func (PolKitContext *p
-
- config_changed = FALSE;
-
-+#ifdef HAVE_INOTIFY
- if (fd == pk_context->inotify_fd) {
- /* size of the event structure, not counting name */
- #define EVENT_SIZE (sizeof (struct inotify_event))
-@@ -327,6 +429,36 @@ again:
- i += EVENT_SIZE + event->len;
+ #else
+ if (pk_context->io_add_watch_func != NULL) {
+ pk_context->inotify_fd = inotify_init ();
+@@ -444,6 +542,35 @@ polkit_context_io_func (PolKitContext *p
}
}
+
+#elif HAVE_KQUEUE
+ if (fd == pk_context->kqueue_fd) {
+ struct kevent ev[1024];
@@ -172,18 +155,17 @@
+ struct kevent *evptr;
+
+ evptr = &ev[i];
-+ _pk_debug ("ident=%d filter=%d flags=%u fflags=%u",
++ polkit_debug ("ident=%d filter=%d flags=%u fflags=%u",
+ evptr->ident, evptr->filter, evptr->flags, evptr->fflags);
-+ _pk_debug ("config changed!");
++ polkit_debug ("config changed!");
+ config_changed = TRUE;
+
+ i++;
+ }
+ } else {
-+ _pk_debug ("failed to read kqueue event: %s", strerror (errno));
++ polkit_debug ("failed to read kqueue event: %s", strerror (errno));
+ }
+ }
-+#endif
-
- if (config_changed) {
- polkit_context_force_reload (pk_context);
+ #else
+ if (fd == pk_context->inotify_fd) {
+ /* size of the event structure, not counting name */
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-06 09:23:18 +0000