Changeset 39880 in vbox for trunk

Timestamp:

Jan 25, 2012 5:26:55 PM (13 years ago)

Author:

vboxsync

Message:

pam_vbox: Don't try to retrieve credentials twice, logging adjustments.

File:

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

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

@@ -55 +55 @@
 #endif
 
-#define VBOX_MODULE_NAME "pam_vbox"
+#define VBOX_MODULE_NAME                    "pam_vbox"
+
+#define VBOX_PAM_FLAG_SILENT                "PAM_SILENT"
+#define VBOX_PAM_FLAG_DISALLOW_NULL_AUTHTOK "PAM_DISALLOW_NULL_AUTHTOK"
+#define VBOX_PAM_FLAG_ESTABLISH_CRED        "PAM_ESTABLISH_CRED"
+#define VBOX_PAM_FLAG_DELETE_CRED           "PAM_DELETE_CRED"
+#define VBOX_PAM_FLAG_REINITIALIZE_CRED     "PAM_REINITIALIZE_CRED"
+#define VBOX_PAM_FLAG_REFRESH_CRED          "PAM_REFRESH_CRED"
 
 RT_C_DECLS_BEGIN
@@ -676 +683 @@
     int rc = RTThreadCreate(&threadWait, pam_vbox_wait_thread,
                             (void *)&threadData, 0,
-                            RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "pam_vbox");
+                            RTTHREADTYPE_DEFAULT, NULL /* Non-waitable */, "pam_vbox");
     if (RT_SUCCESS(rc))
     {
@@ -703 +710 @@
             g_verbosity = 1;
         else
-            pam_vbox_error(hPAM, "pam_sm_authenticate: unknown command line argument \"%s\"\n", argv[i]);
+            pam_vbox_error(hPAM, "pam_vbox_authenticate: unknown command line argument \"%s\"\n", argv[i]);
     }
     pam_vbox_log(hPAM, "pam_vbox_authenticate called\n");
@@ -737 +744 @@
                 if (!uTimeoutMS)
                 {
-                    pam_vbox_error(hPAM, "pam_sm_authenticate: invalid waiting timeout value specified, defaulting to infinite timeout\n");
+                    pam_vbox_error(hPAM, "pam_vbox_authenticate: invalid waiting timeout value specified, defaulting to infinite timeout\n");
                     uTimeoutMS = RT_INDEFINITE_WAIT;
                 }
@@ -755 +762 @@
                                pszWaitMsg ? pszWaitMsg : "Waiting for credentials ...");
             if (RT_FAILURE(rc2)) /* Not critical. */
-                pam_vbox_error(hPAM, "pam_sm_authenticate: error setting waiting information message, rc=%Rrc\n", rc2);
+                pam_vbox_error(hPAM, "pam_vbox_authenticate: error setting waiting information message, rc=%Rrc\n", rc2);
 
             if (RT_SUCCESS(rc))
@@ -765 +772 @@
                 {
                     rc = pam_vbox_wait_for_creds(hPAM, uClientId, uTimeoutMS);
-                    if (RT_SUCCESS(rc))
+                    if (rc == VERR_TIMEOUT)
                     {
-                        /* Waiting for credentials succeeded, try getting those ... */
-                        rc = pam_vbox_check_creds(hPAM);
-                        if (RT_FAILURE(rc))
-                            pam_vbox_error(hPAM, "pam_sm_authenticate: no credentials given, even when waited for it, rc=%Rrc\n", rc);
-                    }
-                    else if (rc == VERR_TIMEOUT)
-                    {
-                        pam_vbox_log(hPAM, "pam_sm_authenticate: no credentials given within time\n");
+                        pam_vbox_log(hPAM, "pam_vbox_authenticate: no credentials given within time\n");
 
                         rc2 = pam_vbox_read_prop(hPAM, uClientId,
@@ -788 +788 @@
                     else if (rc == VERR_CANCELLED)
                     {
-                        pam_vbox_log(hPAM, "pam_sm_authenticate: waiting aborted\n");
+                        pam_vbox_log(hPAM, "pam_vbox_authenticate: waiting aborted\n");
 
                         rc2 = pam_vbox_read_prop(hPAM, uClientId,