Changeset 18005 in vbox

Timestamp:

Mar 17, 2009 10:03:01 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/Installer: setuid for non-hardened build for VBoxUSBHelper, VBoxNetDHCP, VBoxNetAdpCtl.

File:

• trunk/src/VBox/Installer/solaris/makepackage.sh (modified) (3 diffs)

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -160 +160 @@
             ||  $3 == "opt/VirtualBox/amd64/VBoxSDL=amd64/VBoxSDL" \
             ||  $3 == "opt/VirtualBox/amd64/VBoxBFE=amd64/VBoxBFE" \
-            ||  $3 == "opt/VirtualBox/amd64/VBoxNetDHCP=amd64/VBoxNetDHCP" \
             ||  $3 == "opt/VirtualBox/i386/VirtualBox=i386/VirtualBox" \
             ||  $3 == "opt/VirtualBox/i386/VirtualBox3=i386/VirtualBox3" \
@@ -166 +165 @@
             ||  $3 == "opt/VirtualBox/i386/VBoxSDL=i386/VBoxSDL" \
             ||  $3 == "opt/VirtualBox/i386/VBoxBFE=i386/VBoxBFE" \
-            ||  $3 == "opt/VirtualBox/i386/VBoxNetDHCP=i386/VBoxNetDHCP" \
             ) \
        { $4 = "4755" } { print }' prototype > prototype2
@@ -172 +170 @@
 fi
 
-# VBoxUSBHelper needs to be marked setuid root.
-if test -f $VBOX_INSTALLED_DIR/amd64/VBoxUSBHelper || test -f $VBOX_INSTALLED_DIR/i386/VBoxUSBHelper; then
-    $VBOX_AWK 'NF == 6 \
-        && (    $3 == "opt/VirtualBox/amd64/VBoxUSBHelper=amd64/VBoxUSBHelper" \
-            ||  $3 == "opt/VirtualBox/i386/VBoxUSBHelper=i386/VBoxUSBHelper" \
-            ) \
-       { $4 = "4755" } { print }' prototype > prototype2
-    mv -f prototype2 prototype
-fi
-
-# VBoxNetAdpCtl needs to be marked setuid root.
-if test -f $VBOX_INSTALLED_DIR/amd64/VBoxNetAdpCtl || test -f $VBOX_INSTALLED_DIR/i386/VBoxNetAdpCtl; then
-    $VBOX_AWK 'NF == 6 \
-        && (    $3 == "opt/VirtualBox/amd64/VBoxNetAdpCtl=amd64/VBoxNetAdpCtl" \
-            ||  $3 == "opt/VirtualBox/i386/VBoxNetAdpCtl=i386/VBoxNetAdpCtl" \
-            ) \
-       { $4 = "4755" } { print }' prototype > prototype2
-    mv -f prototype2 prototype
-fi
+# Other executables that need setuid root (hardened or otherwise)
+$VBOX_AWK 'NF == 6 \
+    && (    $3 == "opt/VirtualBox/amd64/VBoxUSBHelper=amd64/VBoxUSBHelper" \
+        ||  $3 == "opt/VirtualBox/i386/VBoxUSBHelper=i386/VBoxUSBHelper" \
+        ||  $3 == "opt/VirtualBox/amd64/VBoxNetAdpCtl=amd64/VBoxNetAdpCtl" \
+        ||  $3 == "opt/VirtualBox/i386/VBoxNetAdpCtl=i386/VBoxNetAdpCtl" \
+        ||  $3 == "opt/VirtualBox/amd64/VBoxNetDHCP=amd64/VBoxNetDHCP" \
+        ||  $3 == "opt/VirtualBox/i386/VBoxNetDHCP=i386/VBoxNetDHCP" \
+        ) \
+   { $4 = "4755" } { print }' prototype > prototype2
+mv -f prototype2 prototype