Changeset 34558 in vbox for trunk/src/VBox/HostServices/auth/pam

Timestamp:

Dec 1, 2010 10:56:44 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68349

Message:

Updated VBox authentication library interface, removed references to VRDP.

File:

• trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c (modified) (13 diffs)

trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c

@@ -147 +147 @@
 };
 
-static int vrdpauth_pam_init(void)
+static int auth_pam_init(void)
 {
     SymMap *iter;
@@ -155 +155 @@
     if (!gpvLibPam)
     {
-        debug_printf("vrdpauth_pam_init: dlopen %s failed\n", VRDP_PAM_LIB);
+        debug_printf("auth_pam_init: dlopen %s failed\n", VRDP_PAM_LIB);
         return PAM_SYSTEM_ERR;
     }
@@ -167 +167 @@
         if (pv == NULL)
         {
-            debug_printf("vrdpauth_pam_init: dlsym %s failed\n", iter->pszName);
+            debug_printf("auth_pam_init: dlsym %s failed\n", iter->pszName);
 
             dlclose(gpvLibPam);
@@ -183 +183 @@
 }
 
-static void vrdpauth_pam_close(void)
+static void auth_pam_close(void)
 {
     if (gpvLibPam)
@@ -194 +194 @@
 }
 #else
-static int vrdpauth_pam_init(void)
+static int auth_pam_init(void)
 {
     return PAM_SUCCESS;
 }
 
-static void vrdpauth_pam_close(void)
+static void auth_pam_close(void)
 {
     return;
@@ -205 +205 @@
 #endif /* VRDP_PAM_DLLOAD */
 
-static const char *vrdpauth_get_pam_service (void)
+static const char *auth_get_pam_service (void)
 {
     const char *service = getenv (VRDP_AUTH_PAM_SERVICE_NAME_ENV);
@@ -273 +273 @@
 }
 
-/* The VRDPAuth entry point must be visible. */
+/* The entry point must be visible. */
 #if defined(_MSC_VER) || defined(__OS2__)
 # define DECLEXPORT(type)       __declspec(dllexport) type
@@ -285 +285 @@
 
 /* prototype to prevent gcc warning */
-DECLEXPORT(VRDPAuthResult) VRDPAUTHCALL VRDPAuth (PVRDPAUTHUUID pUuid,
-                                                  VRDPAuthGuestJudgement guestJudgement,
-                                                  const char *szUser,
-                                                  const char *szPassword,
-                                                  const char *szDomain);
-DECLEXPORT(VRDPAuthResult) VRDPAUTHCALL VRDPAuth (PVRDPAUTHUUID pUuid,
-                                                  VRDPAuthGuestJudgement guestJudgement,
-                                                  const char *szUser,
-                                                  const char *szPassword,
-                                                  const char *szDomain)
-{
-    VRDPAuthResult result = VRDPAuthAccessDenied;
+DECLEXPORT(AuthResult) AUTHCALL VRDPAuth (PAUTHUUID pUuid,
+                                          AuthGuestJudgement guestJudgement,
+                                          const char *szUser,
+                                          const char *szPassword,
+                                          const char *szDomain);
+DECLEXPORT(AuthResult) AUTHCALL VRDPAuth (PAUTHUUID pUuid,
+                                          AuthGuestJudgement guestJudgement,
+                                          const char *szUser,
+                                          const char *szPassword,
+                                          const char *szDomain)
+{
+    AuthResult result = AuthResultAccessDenied;
 
     int rc;
@@ -313 +313 @@
     pam_conversation.appdata_ptr = &ctx;
 
-    rc = vrdpauth_pam_init ();
+    rc = auth_pam_init ();
 
     if (rc == PAM_SUCCESS)
@@ -319 +319 @@
         debug_printf("init ok\n");
 
-        rc = fn_pam_start(vrdpauth_get_pam_service (), szUser, &pam_conversation, &pam_handle);
+        rc = fn_pam_start(auth_get_pam_service (), szUser, &pam_conversation, &pam_handle);
 
         if (rc == PAM_SUCCESS)
@@ -344 +344 @@
                     debug_printf("access granted\n");
 
-                    result = VRDPAuthAccessGranted;
+                    result = AuthResultAccessGranted;
                 }
                 else
@@ -363 +363 @@
         }
 
-        vrdpauth_pam_close ();
-
-        debug_printf("vrdpauth_pam_close completed\n");
+        auth_pam_close ();
+
+        debug_printf("auth_pam_close completed\n");
     }
     else
     {
-        debug_printf("vrdpauth_pam_init failed %d\n", rc);
+        debug_printf("auth_pam_init failed %d\n", rc);
     }
 
@@ -376 +376 @@
 
 /* Verify the function prototype. */
-static PVRDPAUTHENTRY gpfnAuthEntry = VRDPAuth;
+static PAUTHENTRY gpfnAuthEntry = VRDPAuth;