Attachment 13726 Details for Bug 14082 – fall back to stat() if readdir() can't detect type

[patch] fall back to stat() if readdir() can't detect type

03_readdir_filetype_unknown.patch (text/plain), 3.15 KB, created by Martin Pitt on 2008-01-15 08:04:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2008-01-15 08:04:39 UTC

Size: 3.15 KB

patch

obsolete

>diff -Nur -x '*.orig' -x '*~' policykit-0.7/src/polkit/polkit-policy-cache.c policykit-0.7.new/src/polkit/polkit-policy-cache.c
>--- policykit-0.7/src/polkit/polkit-policy-cache.c	2007-11-29 07:14:09.000000000 +0100
>+++ policykit-0.7.new/src/polkit/polkit-policy-cache.c	2008-01-15 16:59:48.000000000 +0100
>@@ -37,6 +37,7 @@
> #include <stdlib.h>
> #include <string.h>
> #include <sys/types.h>
>+#include <sys/stat.h>
> #include <pwd.h>
> #include <grp.h>
> #include <unistd.h>
>@@ -99,6 +100,7 @@
> {
>         DIR *dir;
>         struct dirent64 *d;
>+        struct stat st;
>         PolKitPolicyCache *pc;
> 
>         dir = NULL;
>@@ -127,7 +129,7 @@
>                 char *filename;
>                 static const char suffix[] = ".policy";
> 
>-                if (d->d_type != DT_REG)
>+                if (d->d_type != DT_REG && d->d_type != DT_UNKNOWN)
>                         continue;
> 
>                 filename = d->d_name;
>@@ -141,6 +143,17 @@
>                         goto out;
>                 }
> 
>+                /* we have to check if it's a regular file if readdir() could
>+                 * not figure it out */
>+                if (d->d_type == DT_UNKNOWN) {
>+                        if (stat(path, &st) != 0) {
>+                                polkit_error_set_error (error, POLKIT_ERROR_POLICY_FILE_INVALID, path);
>+                                goto out;
>+                        }
>+                        if (!S_ISREG(st.st_mode))
>+                                continue;
>+                }
>+
>                 _pk_debug ("Loading %s", path);
>                 pk_error = NULL;
>                 pf = polkit_policy_file_new (path, load_descriptions, &pk_error);
>diff -Nur -x '*.orig' -x '*~' policykit-0.7/src/polkit-dbus/polkit-read-auth-helper.c policykit-0.7.new/src/polkit-dbus/polkit-read-auth-helper.c
>--- policykit-0.7/src/polkit-dbus/polkit-read-auth-helper.c	2007-11-29 05:33:10.000000000 +0100
>+++ policykit-0.7.new/src/polkit-dbus/polkit-read-auth-helper.c	2008-01-15 16:59:58.000000000 +0100
>@@ -157,6 +157,7 @@
>         DIR *dir;
>         int dfd;
>         struct dirent64 *d;
>+        struct stat st;
>         polkit_bool_t ret;
> 
>         ret = FALSE;
>@@ -183,7 +184,7 @@
>                 static const char suffix[] = ".auths";
>                 struct passwd *pw;
> 
>-                if (d->d_type != DT_REG)
>+                if (d->d_type != DT_REG && d->d_type != DT_UNKNOWN)
>                         continue;
> 
>                 if (d->d_name == NULL)
>@@ -236,6 +237,18 @@
>                         goto out;
>                 }
> 
>+                /* we have to check if it's a regular file if readdir() could
>+                 * not figure it out */
>+                if (d->d_type == DT_UNKNOWN) {
>+                        if (stat(path, &st) != 0) {
>+                                fprintf (stderr, "polkit-read-auth-helper: could not stat %s: %s\n",
>+                                    path, strerror (errno));
>+                                goto out;
>+                        }
>+                        if (!S_ISREG(st.st_mode))
>+                                continue;
>+                }
>+
>                 if (!dump_auths_from_file (path, uid))
>                         goto out;
>         }

Actions: View | Splinter Review

Attachments on bug 14082: 13726

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.