[PATCH] fix bug in permission handling.

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index a24e7d75ed47baedf863ad893225a7c69f7bc036..c738fe22459fc55e43211236e9125d3b18963b48 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -40,12 +40,17 @@
 #include "udevd.h"
 #include "logging.h"
 
+#ifdef LOG
 unsigned char logname[42];
-
-int log_ok(void)
+void log_message (int level, const char *format, ...)
 {
-       return 1;
+       va_list args;
+
+       va_start(args, format);
+       vsyslog(level, format, args);
+       va_end(args);
 }
+#endif
 
 static inline char *get_action(void)
 {
@@ -119,7 +124,7 @@ static int start_daemon(void)
 
 int main(int argc, char* argv[])
 {
-       struct hotplug_msg message;
+       struct hotplug_msg msg;
        char *action;
        char *devpath;
        char *subsystem;
@@ -174,12 +179,12 @@ int main(int argc, char* argv[])
        strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
        addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
-       size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
-       
+       size = build_hotplugmsg(&msg, action, devpath, subsystem, seq);
+
        /* If we can't send, try to start daemon and resend message */
        loop = UDEVSEND_CONNECT_RETRY;
        while (loop--) {
-               retval = sendto(sock, &message, size, 0, (struct sockaddr *)&saddr, addrlen);
+               retval = sendto(sock, &msg, size, 0, (struct sockaddr *)&saddr, addrlen);
                if (retval != -1) {
                        retval = 0;
                        goto close_and_exit;