Changeset 34563 in vbox

Timestamp:

Dec 1, 2010 11:39:52 AM (14 years ago)

Author:

vboxsync

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

68355

Message:

VRDPAuth -> VBoxAuth.

Location:

trunk

Files:

• doc/manual/en_US/SDKRef.xml (modified) (1 diff)
• doc/manual/en_US/user_AdvancedTopics.xml (modified) (4 diffs)
• doc/manual/en_US/user_Frontends.xml (modified) (1 diff)
• doc/manual/en_US/user_VBoxManage.xml (modified) (1 diff)
• include/VBox/VBoxAuth.h (moved) (moved from trunk/include/VBox/VRDPAuth.h ) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp (modified) (1 diff)
• src/VBox/HostServices/auth/Makefile.kmk (modified) (1 diff)
• src/VBox/HostServices/auth/directoryservice/directoryservice.cpp (modified) (1 diff)
• src/VBox/HostServices/auth/pam/VBoxAuthPAM.c (modified) (2 diffs)
• src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp (modified) (3 diffs)
• src/VBox/HostServices/auth/winlogon/winlogon.cpp (modified) (1 diff)
• src/VBox/Installer/freebsd/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/linux/debian/lintian-override.in (modified) (3 diffs)
• src/VBox/Installer/linux/deffiles (modified) (2 diffs)
• src/VBox/Installer/linux/install.sh (modified) (1 diff)
• src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• src/VBox/Main/SystemPropertiesImpl.cpp (modified) (2 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/ConsoleVRDPServer.h (modified) (1 diff)
• src/VBox/Main/include/VRDEServerImpl.h (modified) (1 diff)
• src/VBox/Main/webservice/vboxweb.cpp (modified) (1 diff)
• src/VBox/Main/webservice/websrv-cpp.xsl (modified) (1 diff)

trunk/doc/manual/en_US/SDKRef.xml

@@ -428 +428 @@
 
         <para>By default, after installation, the web service uses the
-        VRDPAuth module that ships with VirtualBox. This module uses PAM on
+        VBoxAuth module that ships with VirtualBox. This module uses PAM on
         Linux hosts to authenticate users. Any valid username/password
         combination is accepted, it does not have to be the username and

trunk/doc/manual/en_US/user_AdvancedTopics.xml

@@ -787 +787 @@
       entry point:</para>
 
-      <screen>#include "VRDPAuth.h"
+      <screen>#include "VBoxAuth.h"
 
 /**
@@ -807 +807 @@
  * Return code:
  *
- *   VRDPAuthAccessDenied    Client access has been denied.
- *   VRDPAuthAccessGranted   Client has the right to use the
- *                           virtual machine.
- *   VRDPAuthDelegateToGuest Guest operating system must
- *                           authenticate the client and the
- *                           library must be called again with
- *                           the result of the guest
- *                           authentication.
+ *   AuthResultAccessDenied    Client access has been denied.
+ *   AuthResultAccessGranted   Client has the right to use the
+ *                             virtual machine.
+ *   AuthResultDelegateToGuest Guest operating system must
+ *                             authenticate the client and the
+ *                             library must be called again with
+ *                             the result of the guest
+ *                             authentication.
  */
-VRDPAuthResult VRDPAUTHCALL VRDPAuth2(
+AuthResult AUTHCALL AuthEntry(
+    const char *szCaller,
     PVRDPAUTHUUID pUuid,
     VRDPAuthGuestJudgement guestJudgement,
@@ -826 +827 @@
 {
     /* process request against your authentication source of choice */
-    return VRDPAuthAccessGranted;
+    return AuthResultAccessGranted;
 }</screen>
 
@@ -853 +854 @@
       <para>The second arguments contains information about the guest
       authentication status. For the first call, it is always set to
-      <computeroutput>VRDPAuthGuestNotAsked</computeroutput>. In case the
+      <computeroutput>AuthGuestNotAsked</computeroutput>. In case the
       function returns
-      <computeroutput>VRDPAuthDelegateToGuest</computeroutput>, a guest
+      <computeroutput>AuthResultDelegateToGuest</computeroutput>, a guest
       authentication will be attempted and another call to the method is made
       with its result. This can be either granted / denied or no judgement

trunk/doc/manual/en_US/user_Frontends.xml

@@ -388 +388 @@
             <computeroutput>VBoxManage setproperty vrdeauthlibrary "VBoxAuthSimple"</computeroutput>.
             To enable the library for a VM, switch authentication to external using
-            <computeroutput>VBoxManage modifyvm "VM name" --vrdpauthtype external</computeroutput>.
+            <computeroutput>VBoxManage modifyvm "VM name" --vrdeauthtype external</computeroutput>.
             Last but not least, you have to configure users and passwords. Here is an example
             for the user "john" with the password "secret":

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -941 +941 @@
 
           <listitem>
-            <para><computeroutput>--vrdpauthtype
+            <para><computeroutput>--vrdeauthtype
             null|external|guest</computeroutput>: This allows you to choose
             whether and how authorization will be performed; see <xref

trunk/include/VBox/VBoxAuth.h

@@ -24 +24 @@
  */
 
-#ifndef ___VBox_vrdpauth_h
-#define ___VBox_vrdpauth_h
+#ifndef ___VBox_vboxauth_h
+#define ___VBox_vboxauth_h
 
 /* The following 2 enums are 32 bits values.*/

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1929 +1929 @@
                 else
                 {
-                    errorArgument("Invalid --vrdpauthtype argument '%s'", ValueUnion.psz);
+                    errorArgument("Invalid --vrdeauthtype argument '%s'", ValueUnion.psz);
                     rc = E_FAIL;
                 }

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -159 +159 @@
 
     {   kSupIFT_Dll,  kSupID_SharedLib,          true, "VRDPAuth" SUPLIB_DLL_SUFF },
+    {   kSupIFT_Dll,  kSupID_SharedLib,          true, "VBoxAuth" SUPLIB_DLL_SUFF },
     {   kSupIFT_Dll,  kSupID_SharedLib,          true, "VBoxVRDP" SUPLIB_DLL_SUFF },
 

trunk/src/VBox/HostServices/auth/Makefile.kmk

@@ -54 +54 @@
 VBoxAuth-sdkhdr_INST = $(INST_SDK)/bindings/auth/include/
 VBoxAuth-sdkhdr_MODE = a+r,u+w
-VBoxAuth-sdkhdr_SOURCES = $(PATH_ROOT)/include/VBox/VRDPAuth.h=>VRDPAuth.h
+VBoxAuth-sdkhdr_SOURCES = $(PATH_ROOT)/include/VBox/VBoxAuth.h=>VBoxAuth.h
 
 

trunk/src/VBox/HostServices/auth/directoryservice/directoryservice.cpp

@@ -22 +22 @@
 #include <iprt/assert.h>
 
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 
 #include <DirectoryService/DirectoryService.h>

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

@@ -28 +28 @@
  * service must be lowercase. See PAM documentation for details.
  *
- * The VRDPAuth module takes the PAM service name from the
+ * The Auth module takes the PAM service name from the
  * environment variable VRDP_AUTH_PAM_SERVICE. If the variable
  * is not specified, then the 'login' PAM service is used.
@@ -77 +77 @@
 #include <security/pam_appl.h>
 
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 
 #ifdef VRDP_PAM_DLLOAD

trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp

@@ -26 +26 @@
 #include <iprt/sha.h>
 
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 
 #include <VBox/com/com.h>
@@ -36 +36 @@
 
 /* If defined, debug messages will be written to the specified file. */
-//#define VRDPAUTH_DEBUG_FILE_NAME "/tmp/VRDPAuth.log"
+//#define AUTH_DEBUG_FILE_NAME "/tmp/VBoxAuth.log"
 
 
 static void dprintf(const char *fmt, ...)
 {
-#ifdef VRDPAUTH_DEBUG_FILE_NAME
+#ifdef AUTH_DEBUG_FILE_NAME
     va_list va;
 
@@ -50 +50 @@
     vsnprintf(buffer, sizeof(buffer), fmt, va);
 
-    FILE *f = fopen(VRDPAUTH_DEBUG_FILE_NAME, "ab");
+    FILE *f = fopen(AUTH_DEBUG_FILE_NAME, "ab");
     if (f)
     {

trunk/src/VBox/HostServices/auth/winlogon/winlogon.cpp

@@ -26 +26 @@
 #include <Windows.h>
 
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 
 static void dprintf(const char *fmt, ...)

trunk/src/VBox/Installer/freebsd/Makefile.kmk

@@ -182 +182 @@
  VBOX_FBSD_STRIP_BIN += \
         VBoxVRDP.so \
-        VRDPAuth.so
+        VBoxAuth.so
  VBOX_FBSD_NO_STRIP += \
         rdesktop-vrdp.tar.gz

trunk/src/VBox/Installer/linux/debian/lintian-override.in

@@ -15 +15 @@
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetDHCP.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVRDP.so
-%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VRDPAuth.so
+%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxAuth.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
@@ -49 +49 @@
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxGuestControlSvc.so
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxVRDP.so
-%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VRDPAuth.so
+%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxAuth.so
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/bin/rdesktop-vrdp /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDD.so /usr/lib/virtualbox
@@ -81 +81 @@
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxXPCOM.so /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxXPCOMIPCD /usr/lib/virtualbox
-%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VRDPAuth.so /usr/lib/virtualbox
+%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxAuth.so /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox.so /usr/lib/virtualbox

trunk/src/VBox/Installer/linux/deffiles

@@ -475 +475 @@
     sdk/include/ipcITransactionObserver.h \
     sdk/include/VirtualBox_XPCOM.h \
-    sdk/include/VRDPAuth.h \
+    sdk/include/VBoxAuth.h \
     sdk/installer/build/lib/vboxapi/VirtualBox_constants.py
     sdk/installer/build/lib/vboxapi/__init__.py
@@ -573 +573 @@
     sdk/webservice/vboxwebService.wsdl \
     sdk/samples/ \
-    sdk/samples/vrdpauth/ \
-    sdk/samples/vrdpauth/pam.cpp \
+    sdk/samples/auth/ \
+    sdk/samples/auth/pam.cpp \
     sdk/samples/API/ \
     sdk/samples/API/tstVBoxAPILinux.cpp \

trunk/src/VBox/Installer/linux/install.sh

@@ -334 +334 @@
     if [ -x /usr/bin/chcon ]; then
         chcon -t texrel_shlib_t $INSTALLATION_DIR/VBox* > /dev/null 2>&1
-        chcon -t texrel_shlib_t $INSTALLATION_DIR/VRDPAuth.so > /dev/null 2>&1
+        chcon -t texrel_shlib_t $INSTALLATION_DIR/VBoxAuth.so > /dev/null 2>&1
         chcon -t texrel_shlib_t $INSTALLATION_DIR/VirtualBox.so > /dev/null 2>&1
         chcon -t texrel_shlib_t $INSTALLATION_DIR/components/VBox*.so > /dev/null 2>&1

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -248 +248 @@
   chcon -t texrel_shlib_t /usr/lib/virtualbox/*VBox* > /dev/null 2>&1
   chcon -t texrel_shlib_t /usr/lib/virtualbox/VirtualBox.so > /dev/null 2>&1
-  chcon -t texrel_shlib_t /usr/lib/virtualbox/VRDPAuth.so > /dev/null 2>&1
+  chcon -t texrel_shlib_t /usr/lib/virtualbox/VBoxAuth.so > /dev/null 2>&1
   chcon -t texrel_shlib_t /usr/lib/virtualbox/components/VBox*.so > /dev/null 2>&1
   chcon -t java_exec_t    /usr/lib/virtualbox/VirtualBox > /dev/null 2>&1

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -1064 +1064 @@
         m->strVRDEAuthLibrary = aPath;
     else
-        m->strVRDEAuthLibrary = "VRDPAuth";
+        m->strVRDEAuthLibrary = "VBoxAuth";
 
     return S_OK;
@@ -1074 +1074 @@
         m->strWebServiceAuthLibrary = aPath;
     else
-        m->strWebServiceAuthLibrary = "VRDPAuth";
+        m->strWebServiceAuthLibrary = "VBoxAuth";
 
     return S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7512 +7512 @@
         system's default library path.
 
-        The default value of this property is <tt>"VRDPAuth"</tt>. There is a library
+        The default value of this property is <tt>"VBoxAuth"</tt>. There is a library
         of that name in one of the default VirtualBox library directories.
 
@@ -7539 +7539 @@
         no matter what user name and password are supplied.
 
-        The initial value of this property is <tt>"VRDPAuth"</tt>,
+        The initial value of this property is <tt>"VBoxAuth"</tt>,
         meaning that the webservice will use the same authentication
         library that is used by default for VRDE (again, see

trunk/src/VBox/Main/include/ConsoleVRDPServer.h

@@ -24 +24 @@
 #include <hgcm/HGCM.h>
 
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 
 #include <VBox/HostServices/VBoxClipboardExt.h>

trunk/src/VBox/Main/include/VRDEServerImpl.h

@@ -23 +23 @@
 #include "VirtualBoxBase.h"
 
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 #include <VBox/settings.h>
 

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -25 +25 @@
 #include <VBox/com/errorprint.h>
 #include <VBox/com/EventQueue.h>
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 #include <VBox/version.h>
 

trunk/src/VBox/Main/webservice/websrv-cpp.xsl

@@ -67 +67 @@
 #include <VBox/com/errorprint.h>
 #include <VBox/com/EventQueue.h>
-#include <VBox/VRDPAuth.h>
+#include <VBox/VBoxAuth.h>
 #include <VBox/version.h>