Changeset 86824 in vbox for trunk/src/VBox/Additions/common/pam/pam_vbox.cpp

Timestamp:

Nov 6, 2020 1:00:51 PM (4 years ago)

Author:

vboxsync

Message:

Additions/pam: For the PAM module guest properties (VBOX_WITH_GUEST_PROPS) are mandatory.

File:

• trunk/src/VBox/Additions/common/pam/pam_vbox.cpp (modified) (13 diffs)

trunk/src/VBox/Additions/common/pam/pam_vbox.cpp

@@ -40 +40 @@
 #include <iprt/assert.h>
 #include <iprt/buildconfig.h>
+#include <iprt/err.h>
 #include <iprt/env.h>
 #include <iprt/initterm.h>
@@ -51 +52 @@
 
 #include <VBox/log.h>
-#ifdef VBOX_WITH_GUEST_PROPS
-# include <VBox/HostServices/GuestPropertySvc.h>
-#endif
+#include <VBox/HostServices/GuestPropertySvc.h>
 
 #define VBOX_MODULE_NAME                    "pam_vbox"
@@ -382 +381 @@
 }
 
-
-#ifdef VBOX_WITH_GUEST_PROPS
 /**
  * Reads a guest property.
@@ -550 +547 @@
     return rc;
 }
-#endif
 
 /**
@@ -570 +566 @@
     uint64_t u64StartMS = RTTimeMilliTS();
 
-#ifdef VBOX_WITH_GUEST_PROPS
     uint32_t uClientID = 0;
     rc = VbglR3GuestPropConnect(&uClientID);
@@ -580 +575 @@
     {
         pam_vbox_log(pUserData->hPAM, "pam_vbox_wait_thread: clientID=%u\n", uClientID);
-#endif
+
         for (;;)
         {
-#ifdef VBOX_WITH_GUEST_PROPS
+
             if (uClientID)
             {
@@ -619 +614 @@
                 }
             }
-#endif
+
             if (   RT_SUCCESS(rc)
                 || rc == VERR_TIMEOUT)
@@ -633 +628 @@
                     /* No credentials found, but try next round (if there's
                      * time left for) ... */
-#ifndef VBOX_WITH_GUEST_PROPS
                     RTThreadSleep(500); /* Wait 500 ms. */
-#endif
                 }
                 else
@@ -654 +647 @@
             }
         }
-#ifdef VBOX_WITH_GUEST_PROPS
     }
     VbglR3GuestPropDisconnect(uClientID);
-#endif
 
     /* Save result. */
@@ -668 +659 @@
     return rc;
 }
-
 
 /**
@@ -706 +696 @@
 }
 
-
 DECLEXPORT(int) pam_sm_authenticate(pam_handle_t *hPAM, int iFlags, int argc, const char **argv)
 {
@@ -727 +716 @@
     bool fFallback = true;
 
-#ifdef VBOX_WITH_GUEST_PROPS
     uint32_t uClientId;
     rc = VbglR3GuestPropConnect(&uClientId);
@@ -816 +804 @@
         VbglR3GuestPropDisconnect(uClientId);
     }
-#endif /* VBOX_WITH_GUEST_PROPS */
 
     if (fFallback)