[PATCH] update Fedora config files

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 0ee70529c4edb923b053c104570a9a1a1623532c..e5d7800ecf73f5d3173d71f791e0c6ee614a6f83 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -41,7 +41,6 @@
 
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
 {
        va_list args;
@@ -118,6 +117,7 @@ int main(int argc, char *argv[], char *envp[])
        udev_init_config();
 
        /* set signal handlers */
+       memset(&act, 0x00, sizeof(act));
        act.sa_handler = (void (*) (int))sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
@@ -187,7 +187,7 @@ int main(int argc, char *argv[], char *envp[])
 
                        wait_for_class_device(class_dev, &error);
 
-                       /* init rules, permissions */
+                       /* init rules */
                        namedev_init();
 
                        /* name, create node, store in db */
@@ -209,9 +209,10 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-               if (udev_dev_d && udev.devname[0] != '\0') {
+               if (udev.devname[0] != '\0') {
                        setenv("DEVNAME", udev.devname, 1);
-                       udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+                       if (udev_dev_d)
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                }
        } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
                if (strcmp(action, "add") == 0) {