socket: rework things to have only one sockaddr formatter

[elogind.git] / src / login / pam-module.c

diff --git a/src/login/pam-module.c b/src/login/pam-module.c
index 3667425a8cabd8fd18374e7776f7a4522620f87c..61df3e9d890a64353b4858159cae764d3bd3e522 100644 (file)
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -183,7 +183,8 @@ _public_ PAM_EXTERN int pam_sm_open_session(
         const char *username, *id, *object_path, *runtime_path, *service = NULL, *tty = NULL, *display = NULL, *remote_user = NULL, *remote_host = NULL, *seat = NULL, *type = NULL, *class = NULL, *class_pam = NULL, *cvtnr = NULL;
         uint32_t uid, pid;
         int session_fd = -1;
         const char *username, *id, *object_path, *runtime_path, *service = NULL, *tty = NULL, *display = NULL, *remote_user = NULL, *remote_host = NULL, *seat = NULL, *type = NULL, *class = NULL, *class_pam = NULL, *cvtnr = NULL;
         uint32_t uid, pid;
         int session_fd = -1;

-        bool remote, existing;
+        bool remote;
+        unsigned existing;

         uint32_t vtnr = 0;
         int r;
 
         uint32_t vtnr = 0;
         int r;
 


@@ -317,8 +318,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                 !streq(remote_host, "localhost") &&
                 !streq(remote_host, "localhost.localdomain");
 
                 !streq(remote_host, "localhost") &&
                 !streq(remote_host, "localhost.localdomain");
 

-        /* Talk to logind over the message bug */
-
+        /* Talk to logind over the message bus */

         r = sd_bus_open_system(&bus);
         if (r < 0) {
                 pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", strerror(-r));
         r = sd_bus_open_system(&bus);
         if (r < 0) {
                 pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", strerror(-r));