Index: /trunk/src/VBox/Installer/linux/vboxweb-service.sh.in
===================================================================
--- /trunk/src/VBox/Installer/linux/vboxweb-service.sh.in	(revision 41364)
+++ /trunk/src/VBox/Installer/linux/vboxweb-service.sh.in	(revision 41365)
@@ -35,6 +35,8 @@
 if [ -n "$INSTALL_DIR" ]; then
     binary="$INSTALL_DIR/vboxwebsrv"
+    vboxmanage="$INSTALL_DIR/VBoxManage"
 else
     binary="/usr/lib/%PACKAGE%/vboxwebsrv"
+    vboxmanage="/usr/lib/%PACKAGE%/VBoxManage"
 fi
 
@@ -308,4 +310,17 @@
         [ -n "$VBOXWEB_LOGSIZE" ]        && PARAMS="$PARAMS -S $VBOXWEB_LOGSIZE"
         [ -n "$VBOXWEB_LOGINTERVAL" ]    && PARAMS="$PARAMS -I $VBOXWEB_LOGINTERVAL"
+        # set authentication method + password hash
+        if [ -n "$VBOXWEB_AUTH_LIBRARY" ]; then
+            vboxmanage setproperty websrvauthlibrary $VBOXWEB_AUTH_LIBRARY
+            if [ $? -ne 0 ]; then
+                fail_msg "Error setting webservice authentication library to $VBOXWEB_AUTH_LIBRARY"
+            fi
+        fi
+        if [ -n "$VBOXWEB_AUTH_PWHASH" ]; then
+            vboxmanage setextradata global VBoxAuthSimple/users/$VBOXWEB_USER $VBOXWEB_AUTH_PWHASH
+            if [ $? -ne 0 ]; then
+                fail_msg "Error setting webservice password hash"
+            fi
+        fi
         # prevent inheriting this setting to VBoxSVC
         unset VBOX_RELEASE_LOG_DEST
Index: /trunk/src/VBox/Installer/solaris/smf-vboxwebsrv.sh
===================================================================
--- /trunk/src/VBox/Installer/solaris/smf-vboxwebsrv.sh	(revision 41364)
+++ /trunk/src/VBox/Installer/solaris/smf-vboxwebsrv.sh	(revision 41365)
@@ -54,4 +54,8 @@
         VW_SSL_RANDFILE=`/usr/bin/svcprop -p config/ssl_randfile $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_SSL_RANDFILE=
+        VW_AUTH_LIBRARY=`/usr/bin/svcprop -p config/auth_library 2>/dev/null`
+        [ $? != 0 ] && VW_AUTH_LIBRARY=
+        VW_AUTH_PWHASH=`/usr/bin/svcprop -p config/auth_pwhash 2>/dev/null`
+        [ $? != 0 ] && VW_AUTH_PWHASH=
         VW_TIMEOUT=`/usr/bin/svcprop -p config/timeout $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_TIMEOUT=
@@ -96,4 +100,18 @@
         [ -n "$VW_LOGFILE" ] && VW_LOGFILE="--logfile $VW_LOGFILE"
 
+        # Set authentication method + password hash
+        if [ -n "$VW_AUTH_LIBRARY" ]; then
+            exec /opt/VirtualBox/VBoxManage setproperty websrvauthlibrary $VW_AUTH_LIBRARY
+            if [ $? != 0 ]; then
+                echo "Error $? setting webservice authentication library to $VW_AUTH_LIBRARY"
+            fi
+        fi
+        if [ -n "$VW_AUTH_PWHASH" ]; then
+            exec /opt/VirtualBox/VBoxManage setextradata global VBoxAuthSimple/users/$VW_USER $VW_AUTH_PWHASH
+            if [ $? != 0 ]; then
+                echo "Error $? setting webservice password hash"
+            fi
+        fi
+
         exec su - "$VW_USER" -c "/opt/VirtualBox/vboxwebsrv --background --host \"$VW_HOST\" --port \"$VW_PORT\" $VW_SSL $VW_SSL_KEYFILE $VW_SSL_PASSWORDFILE $VW_SSL_CACERT $VW_SSL_CAPATH $VW_SSL_DHFILE $VW_SSL_RANDFILE --timeout \"$VW_TIMEOUT\" --check-interval \"$VW_CHECK_INTERVAL\" --threads \"$VW_THREADS\" --keepalive \"$VW_KEEPALIVE\" --authentication \"$VW_AUTHENTICATION\" $VW_LOGFILE --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""