Changeset 47863 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Aug 20, 2013 3:44:39 AM (11 years ago)

Author:

vboxsync

Message:

vbox-nat-netservice: hardened build fix.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxNetNATHardened.cpp (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -67 +67 @@
 ifdef VBOX_WITH_LWIP_NAT
 
+ifdef VBOX_WITH_HARDENING
+ PROGRAMS += VBoxNetLwipNATHardened
+ DLLS += VBoxNetLwipNAT
+else
+ PROGRAMS += VBoxNetLwipNAT
+endif
+
+ifdef VBOX_WITH_HARDENING
+ VBoxNetLwipNATHardened_SOURCES += VBoxNetNATHardened.cpp
+ VBoxNetLwipNATHardened_DEFS += SERVICE_NAME=VBoxNetLwipNAT
+ VBoxNetLwipNATHardened_TEMPLATE=VBOXR3EXE
+endif
+
 PROGRAMS += VBoxNetLwipNAT
 VBoxNetLwipNAT_TEMPLATE =
-VBoxNetLwipNAT_TEMPLATE := VBOXMAINCLIENTEXE
+VBoxNetLwipNAT_TEMPLATE := VBOXMAINCLIENT$(if-expr defined(VBOX_WITH_HARDENING),DLL,EXE)
 VBoxNetLwipNAT_INCS += ../../Devices/Network \
         ../../Devices/Network/lwip-new/vbox # testproxy.h

trunk/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp

@@ -18 +18 @@
 #include <VBox/sup.h>
 
+#ifndef SERVICE_NAME
+# error "Please define SERVICE_NAME"
+#endif
 
 int main(int argc, char **argv, char **envp)
 {
-    return SUPR3HardenedMain("VBoxNetNAT", 0 /* fFlags */, argc, argv, envp);
+    return SUPR3HardenedMain(RT_STR(SERVICE_NAME), 0 /* fFlags */, argc, argv, envp);
 }