Merge remote-tracking branch 'origin/pr/175'

* origin/pr/175:
  daemon: log a bit more info on errors

Author: marmarek

daemon/qrexec-daemon-common.c

@@ -211,7 +211,7 @@ int connect_unix_socket(const char *domname)
     struct sockaddr_un remote;
 
     if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
-        LOG(ERROR, "socket() failed: %m");
+        LOGE(ERROR, "socket() failed: %m");
         return -1;
     }
 
@@ -229,7 +229,7 @@ int connect_unix_socket(const char *domname)
     len = (size_t)res + 1 + offsetof(struct sockaddr_un, sun_path);
     if (connect(s, (struct sockaddr *) &remote, len) == -1) {
         int saved_errno = errno;
-        LOG(ERROR, "connect %s", remote.sun_path);
+        LOGE(ERROR, "connect %s", remote.sun_path);
         close(s);
         return (saved_errno == ENOENT || saved_errno == ECONNREFUSED) ? -2 : -1;
     }

daemon/qrexec-daemon.c

@@ -1052,7 +1052,7 @@ static enum policy_response connect_daemon_socket(
     pid = fork();
     switch (pid) {
         case -1:
-            LOG(ERROR, "Could not fork!");
+            LOGE(ERROR, "Could not fork!");
             daemon__exit(QREXEC_EXIT_PROBLEM);
         case 0:
             if (close(fds[0]))
@@ -1093,7 +1093,7 @@ static enum policy_response connect_daemon_socket(
                 }
             } while (!WIFEXITED(status));
             if (WEXITSTATUS(status) != 0) {
-                LOG(ERROR, "qrexec-policy-exec failed");
+                LOG(ERROR, "qrexec-policy-exec failed: %d", WEXITSTATUS(status));
                 daemon__exit(QREXEC_EXIT_PROBLEM);
             }
             // This leaks 'result', but as the code execs later anyway this isn't a problem.