Changeset 38471 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 16, 2011 11:50:02 AM (13 years ago)

Author:

vboxsync

Message:

PAM: Solaris build fixes, misc. bugfixes.

File:

• trunk/src/VBox/Additions/common/pam/pam_vbox.cpp (modified) (1 diff)

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

@@ -140 +140 @@
     int rc = VINF_SUCCESS;
 
-    struct pam_message msg;
+    pam_message msg;
     msg.msg_style = iStyle;
+#ifdef RT_OS_SOLARIS
+    msg.msg = (char*)pszText;
+#else
     msg.msg = pszText;
-
-    const struct pam_conv *conv;
+#endif
+
+#ifdef RT_OS_SOLARIS
+    pam_conv *conv = NULL;
+    int pamrc = pam_get_item(hPAM, PAM_CONV, (void **)&conv);
+#else
+    const pam_conv *conv = NULL;
     int pamrc = pam_get_item(hPAM, PAM_CONV, (const void **)&conv);
-    if (pamrc == PAM_SUCCESS)
-    {
-        struct pam_response *resp;
-        const struct pam_message *msg_p = &msg;
+#endif
+    if (   pamrc == PAM_SUCCESS
+        && conv)
+    {
+        pam_response *resp = NULL;
+#ifdef RT_OS_SOLARIS
+        pam_message *msg_p = &msg;
+#else
+        const pam_message *msg_p = &msg;
+#endif
+        pam_vbox_log(hPAM, "Showing message \"%s\" (type %d)", pszText, iStyle);
+
         pamrc = conv->conv(1 /* One message only */, &msg_p, &resp, conv->appdata_ptr);
-        if (pamrc == PAM_SUCCESS)
-        {
-            pam_vbox_log(hPAM, "Showing message (type %d): %s", msg, pszText);
+        if (resp != NULL) /* If we use PAM_TEXT_INFO we never will get something back! */
+        {
+            if (resp->resp)
+            {
+                pam_vbox_log(hPAM, "Response to message \"%s\" was \"%s\"",
+                             pszText, resp->resp);
+                /** @todo Save response!  */
+                free(resp->resp);
+            }
             free(resp);
         }