vlmcsd-svn906-2016-06-05-Hotbird64

GNUmakefile

@@ -5,7 +5,10 @@
 PROGRAM_NAME ?= vlmcsd
 CLIENT_NAME ?= vlmcs
 MULTI_NAME ?= vlmcsdmulti
+OBJ_NAME ?= libkms-static.o
+A_NAME ?= libkms.a
 CONFIG ?= config.h
+COMPILER_LANGUAGE ?= c
 
 # crypto library to use for standard algos, could save ~1-2kb ;)
 # can be either 'openssl', 'polarssl' or anything other for internal impl
@@ -34,49 +37,72 @@ endif
 ifneq (,$(findstring androideabi,$(TARGETPLATFORM)))
   ANDROID := 1
   UNIX := 1
+  ELF := 1
 endif
 
 ifneq (,$(findstring minix,$(TARGETPLATFORM)))
   MINIX := 1
   UNIX := 1
+  ELF := 1
 endif
 
 ifneq (,$(findstring mingw,$(TARGETPLATFORM)))
   MINGW := 1
   WIN := 1
+  PE := 1 
 endif
 
 ifneq (,$(findstring cygwin,$(TARGETPLATFORM)))
   CYGWIN := 1
   WIN := 1
+  PE := 1
+endif
+
+ifneq (,$(findstring cygnus,$(TARGETPLATFORM)))
+  CYGWIN := 1
+  WIN := 1
+  PE := 1
 endif
 
 ifneq (,$(findstring freebsd,$(TARGETPLATFORM)))
   FREEBSD := 1
   UNIX := 1
   BSD := 1
+  ELF := 1
 endif
 
 ifneq (,$(findstring netbsd,$(TARGETPLATFORM)))
   NETBSD := 1
   UNIX := 1
   BSD := 1
+  ELF := 1
 endif
 
 ifneq (,$(findstring openbsd,$(TARGETPLATFORM)))
   OPENBSD := 1
   UNIX := 1
   BSD := 1
+  ELF := 1
 endif
 
 ifneq (,$(findstring solaris,$(TARGETPLATFORM)))
   SOLARIS := 1
   UNIX := 1
+  ELF := 1
 endif
 
 ifneq (,$(findstring linux,$(TARGETPLATFORM)))
   LINUX := 1
   UNIX := 1
+  ELF := 1
+endif
+
+ifneq (,$(findstring gnu,$(TARGETPLATFORM)))
+ifeq (,$(findstring linux,$(TARGETPLATFORM)))
+  UNIX := 1
+  HURD := 1
+  ELF := 1
+endif
 endif
 
 ifeq ($(CYGWIN),1)
@@ -89,12 +115,25 @@ else
   DLL_NAME ?= libkms.so
 endif
 
-BASECFLAGS = -DCONFIG=\"$(CONFIG)\" -DBUILD_TIME=$(shell date '+%s') -g -Os -fno-strict-aliasing -fomit-frame-pointer -ffunction-sections -fdata-sections
+BASECFLAGS = -DVLMCSD_COMPILER=\"$(notdir $(CC))\" -DVLMCSD_PLATFORM=\"$(TARGETPLATFORM)\" -DCONFIG=\"$(CONFIG)\" -DBUILD_TIME=$(shell date '+%s') -g -Os -fno-strict-aliasing -fomit-frame-pointer -ffunction-sections -fdata-sections
 BASELDFLAGS = 
 STRIPFLAGS =
 CLIENTLDFLAGS =
 SERVERLDFLAGS =
 
+ifndef SAFE_MODE
+  BASECFLAGS += -fvisibility=hidden -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants
+  
+  ifeq ($(ELF),1)
+    BASELDFLAGS += -Wl,-z,norelro
+  endif
+
+  ifneq (,$(findstring gcc,$(notdir $(CC))))
+    BASECFLAGS += -flto
+  endif
+
+endif
+
 ifeq ($(NOLIBS),1)
   NOLRESOLV=1
   NOLPTHREAD=1
@@ -105,20 +144,24 @@ ifneq ($(NO_DNS),1)
   ifneq ($(NOLRESOLV),1)
 
     ifeq ($(MINGW),1)
-      BASELDFLAGS += -ldnsapi
+      CLIENTLDFLAGS += -ldnsapi
     endif
 
     ifeq ($(LINUX),1)
-      BASELDFLAGS += -lresolv
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(HURD),1)
+      CLIENTLDFLAGS += -lresolv
     endif
 
     ifeq ($(DARWIN),1)
-      BASELDFLAGS += -lresolv
+      CLIENTLDFLAGS += -lresolv
     endif
 
     ifeq ($(CYGWIN),1)
       DNS_PARSER := internal
-      BASELDFLAGS += -lresolv
+      CLIENTLDFLAGS += -lresolv
     endif
 
     ifeq ($(OPENBSD),1)
@@ -126,7 +169,7 @@ ifneq ($(NO_DNS),1)
     endif
 
     ifeq ($(SOLARIS),1)
-      BASELDFLAGS += -lresolv
+      CLIENTLDFLAGS += -lresolv
     endif
 
   endif
@@ -155,16 +198,18 @@ else
   STRIPFLAGS += -s
 endif
 
+LIBRARY_CFLAGS = -DSIMPLE_SOCKETS -DNO_TIMEOUT -DNO_SIGHUP -DNO_CL_PIDS -DNO_EXTENDED_PRODUCT_LIST -DNO_BASIC_PRODUCT_LIST -DNO_LOG -DNO_RANDOM_EPID -DNO_INI_FILE -DNO_INI_FILE -DNO_HELP -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_VERBOSE_LOG -DNO_LIMIT -DNO_VERSION_INFORMATION
+
 ifeq ($(FEATURES), embedded)
-  BASECFLAGS += -DNO_HELP -DNO_USER_SWITCH -DNO_BASIC_PRODUCT_LIST -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_VERBOSE_LOG
+  BASECFLAGS += -DNO_HELP -DNO_USER_SWITCH -DNO_BASIC_PRODUCT_LIST -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_VERBOSE_LOG -DNO_VERSION_INFORMATION
 else ifeq ($(FEATURES), autostart)
-  BASECFLAGS += -DNO_HELP 
+  BASECFLAGS += -DNO_HELP -DNO_VERSION_INFORMATION
 else ifeq ($(FEATURES), minimum)
-  BASECFLAGS += -DNO_TIMEOUT -DNO_SIGHUP -DNO_CL_PIDS -DNO_EXTENDED_PRODUCT_LIST -DNO_BASIC_PRODUCT_LIST -DNO_LOG -DNO_RANDOM_EPID -DNO_INI_FILE -DNO_INI_FILE -DNO_HELP -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_VERBOSE_LOG -DNO_LIMIT
+  BASECFLAGS += $(LIBRARY_CFLAGS)
 else ifeq ($(FEATURES), most)
   BASECFLAGS += -DNO_SIGHUP -DNO_PID_FILE -DNO_LIMIT
 else ifeq ($(FEATURES), inetd)
-  BASECFLAGS += -DNO_SIGHUP -DNO_SOCKETS -DNO_PID_FILE -DNO_LIMIT
+  BASECFLAGS += -DNO_SIGHUP -DNO_SOCKETS -DNO_PID_FILE -DNO_LIMIT -DNO_VERSION_INFORMATION
 else ifeq ($(FEATURES), fixedepids)
   BASECFLAGS += -DNO_SIGHUP -DNO_CL_PIDS -DNO_RANDOM_EPID -DNO_INI_FILE
 endif
@@ -202,7 +247,7 @@ ifdef HWID
 endif
 
 ifdef TERMINAL_WIDTH
-  BASECFLAGS += -DTERMINAL_FIXED_WIDTH=$(TERMINAL_WIDTH)
+  BASECFLAGS += -DTERMINAL_FIXED_WIDTH=$(TERMINAL_WIDTH) -DDISPLAY_WIDTH=\"$(TERMINAL_WIDTH)\"
 endif
 
 ifeq ($(NOPROCFS), 1)
@@ -216,13 +261,15 @@ endif
 ifneq ($(ANDROID), 1)
 ifneq ($(MINIX), 1)
 ifneq ($(NOLPTHREAD), 1)
-  ifeq ($(findstring NO_LIMIT,$(CFLAGS) $(BASECFLAGS)),)
+
-    BASELDFLAGS += -lpthread
+  ifeq ($(THREADS), 1)
+    SERVERLDFLAGS += -lpthread
   endif
   
-  ifneq ($(findstring USE_THREADS,$(BASECFLAGS)),)
+  ifeq (,$(findstring NO_LIMIT,$(CFLAGS) $(BASECFLAGS)))  
-    BASELDFLAGS += -lpthread
+    SERVERLDFLAGS += -lpthread
   endif
+
 endif
 endif
 endif
@@ -283,6 +330,7 @@ ifeq ($(MSRPC),1)
   VLMCSD_SRCS += msrpc-server.c
   VLMCS_SRCS += msrpc-client.c
   MULTI_SRCS += msrpc-server.c msrpc-client.c
+  DLL_SRCS += msrpc-server.c
   BASECFLAGS += -DUSE_MSRPC -Wno-unknown-pragmas
   BASELDFLAGS += -lrpcrt4
 else
@@ -312,7 +360,6 @@ else ifeq ($(CRYPTO), polarssl)
 else ifeq ($(CRYPTO), windows)
 	BASECFLAGS += -D_CRYPTO_WINDOWS
 	SRCS += crypto_windows.c
-	#BASELDFLAGS += -lpolarssl
 else
 	BASECFLAGS += -D_CRYPTO_INTERNAL
 	SRCS += crypto_internal.c
@@ -332,9 +379,12 @@ endif
 
 ifeq ($(VERBOSE),3)
     COMPILER := $(shell printf "%-40s" $(notdir $(CC)))
+    ARCHIVER := $(shell printf "%-40s" $(notdir $(AR)))
 endif
 
-ifeq ($(CAT),2)
+ARCMD := AR
+
+ifdef CAT
     LDCMD := CC/LD
 else
     LDCMD := LD    
@@ -344,99 +394,96 @@ endif
 
 %.o: %.c 
   ifeq ($(VERBOSE),1)
-	$(CC) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
   ifeq ($(DEPENDENCIES),1)
-	$(CC) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
   endif
   else
 	@echo "$(COMPILER)	CC	$@ <- $<"
-	@$(CC) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
   ifeq ($(DEPENDENCIES),1)
 	@echo "$(COMPILER)	DEP     $*.d <- $<"
-	@$(CC) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
   endif
   endif
 
-vlmcsd_all.c: $(VLMCSD_SRCS)
-  ifeq ($(VERBOSE),1)
-	cat $^ > $@
-  else
-	@echo "$(COMPILER)	CAT	$@ <- $^"
-	@cat $^ > $@
-  endif
-
-vlmcs_all.c: $(VLMCS_SRCS)
-  ifeq ($(VERBOSE),1)
-	cat $^ > $@
-  else
-	@echo "$(COMPILER)	CAT	$@ <- $^"
-	@cat $^ > $@
-  endif
-
-vlmcsdmulti_all.c: $(MULTI_SRCS)
-  ifeq ($(VERBOSE),1)
-	cat $^ > $@
-  else
-	@echo "$(COMPILER)	CAT	$@ <- $^"
-	@cat $^ > $@
-  endif
-
 ifdef CAT
-ifeq ($(CAT),2)
+  BUILDCOMMAND = cat $^ | $(CC) -x$(COMPILER_LANGUAGE) -o $@ -
-$(PROGRAM_NAME): vlmcsd_all.c
+  VLMCSD_PREREQUISITES = $(VLMCSD_SRCS)
+  VLMCS_PREREQUISITES = $(VLMCS_SRCS)
+  MULTI_PREREQUISITES = $(MULTI_SRCS)
+  DLL_PREREQUISITES = $(DLL_SRCS)
+  OBJ_PREREQUISITES = $(DLL_SRCS)
 else
-$(PROGRAM_NAME): vlmcsd_all.o
+  BUILDCOMMAND = $(CC) -o $@ $^
-endif
+  VLMCSD_PREREQUISITES = $(VLMCSD_OBJS)
-else
+  VLMCS_PREREQUISITES = $(VLMCS_OBJS)
-$(PROGRAM_NAME): $(VLMCSD_OBJS)
+  MULTI_PREREQUISITES = $(MULTI_OBJS)
+  DLL_PREREQUISITES = $(DLL_OBJS)
+  OBJ_PREREQUISITES = $(DLL_OBJS)
 endif
+
 ifeq ($(VERBOSE),1)
-	+$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS)
+  BUILDCOMMANDPREFIX = +
 else
-	+@echo "$(COMPILER)	$(LDCMD)	$@ <- $^"
+  BUILDCOMMANDPREFIX = +@
-	+@$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS)
+endif
+
+INFOCOMMAND = +@echo "$(COMPILER)	$(LDCMD)	$@ <- $^"
+ARINFOCOMMAND = +@echo "$(ARCHIVER)	$(ARCMD)	$@ <. $^"
+
+VLMCSD_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS)
+VLMCS_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(CLIENTLDFLAGS)
+MULTI_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(CLIENTLDFLAGS) $(SERVERLDFLAGS)
+DLL_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -shared -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+OBJ_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -c -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+  
+$(PROGRAM_NAME): $(VLMCSD_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(VLMCSD_COMMAND)
+
+$(CLIENT_NAME): $(VLMCS_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(VLMCS_COMMAND)
+
+$(MULTI_NAME): $(MULTI_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(MULTI_COMMAND)
+
+$(DLL_NAME): $(DLL_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(DLL_COMMAND)
+
+ifndef CAT
+$(OBJ_NAME):
+	+@echo Cannot make $@ without CAT defined. Please create $(A_NAME)
+else
+$(OBJ_NAME): $(OBJ_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(OBJ_COMMAND)
 endif
 
 ifdef CAT
-ifeq ($(CAT),2)
+$(A_NAME): $(OBJ_NAME)
-$(CLIENT_NAME): vlmcs_all.c
 else
-$(CLIENT_NAME): vlmcs_all.o
+$(A_NAME): BASECFLAGS += -fvisibility=hidden -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+$(A_NAME): $(DLL_OBJS)
 endif
-else
+  ifneq ($(VERBOSE),1)
-$(CLIENT_NAME): $(VLMCS_OBJS)
+	$(ARINFOCOMMAND)
   endif
-  ifeq ($(VERBOSE),1)
+	+@rm -f $@
-	+$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS)
+	$(BUILDCOMMANDPREFIX)$(AR) rcs $@ $^
-  else
-	+@echo "$(COMPILER)	$(LDCMD)	$@ <- $^"
-	+@$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS)
-  endif
-
-ifdef CAT
-ifeq ($(CAT),2)
-$(MULTI_NAME): vlmcsdmulti_all.c
-else
-$(MULTI_NAME): vlmcsdmulti_all.o
-endif
-else
-$(MULTI_NAME): $(MULTI_OBJS)
-endif
-  ifeq ($(VERBOSE),1)
-	+$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS)
-  else
-	+@echo "$(COMPILER)	$(LDCMD)	$@ <- $^"
-	+@$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS)
-  endif
-
-$(DLL_NAME): $(DLL_SRCS)
-  ifeq ($(VERBOSE),1)
-	+$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) -shared -DIS_LIBRARY=1 -UNO_SOCKETS -UUSE_MSRPC
-  else
-	+@echo "$(COMPILER)	$(LDCMD)	$@ <- $^"
-	+@$(CC) -o $@ $^ $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) -shared -DIS_LIBRARY=1 -UNO_SOCKETS -UUSE_MSRPC
-  endif
-
 
 %.pdf : %
   ifeq ($(shell uname), Darwin)
@@ -467,10 +514,10 @@ htmldocs : $(HTMLDOCS)
 alldocs : $(UNIXDOCS) $(HTMLDOCS) $(PDFDOCS) $(DOSDOCS)
 
 clean:
-	rm -f *.o *.d *_all.c $(PROGRAM_NAME) $(MULTI_NAME) $(DLL_NAME) $(CLIENT_NAME) $(PDFDOCS) $(DOSDOCS) $(UNIXDOCS) $(HTMLDOCS)
+	rm -f *.o *.d *_all.c libkms_all_*.c $(PROGRAM_NAME) $(MULTI_NAME) $(DLL_NAME) $(CLIENT_NAME) $(PDFDOCS) $(DOSDOCS) $(UNIXDOCS) $(HTMLDOCS) $(OBJ_NAME) $(A_NAME) *.a
 
 help:
-	@echo "Type:"
+	@echo "Type"
 	@echo "    ${MAKE}          - to build $(PROGRAM_NAME) and $(CLIENT_NAME)"
 	@echo "    ${MAKE} clean    - to remove $(PROGRAM_NAME) and $(CLIENT_NAME)"
 	@echo "    ${MAKE} help     - to see this help"
@@ -485,8 +532,9 @@ help:
 	@echo "    ${MAKE} $(CLIENT_NAME) - to build the client only."
 	@echo "    ${MAKE} $(MULTI_NAME) - to build $(PROGRAM_NAME) and $(CLIENT_NAME) in a single multi-call binary"
 	@echo "    ${MAKE} $(DLL_NAME) - to build the shared library $(DLL_NAME)"
+	@echo "    ${MAKE} $(A_NAME) - to build the static library $(A_NAME)"
 	@echo ""
-	@echo "Options:"
+	@echo "Options"
 	@echo "    CONFIG=<x>                   Compile <x> as instead of config.h."
 	@echo "    INI=<x>                      Compile $(PROGRAM_NAME) with default ini file <x>"
 	@echo "    PROGRAM_NAME=<x>             Use <x> as output file name for the KMS server. Defaults to vlmcsd."
@@ -498,7 +546,10 @@ help:
 	@echo "    CRYPTO=openssl_with_aes_soft EXPERIMENTAL: Use openssl for SHA256/HMAC and AES calculations (software)."
 	@echo "    CRYPTO=polarssl              Use polarssl instead of internal crypto code for SHA256/HMAC calculations."
 	@echo "    CRYPTO=windows               Use Windows CryptoAPI instead of internal crypto code for SHA256/HMAC calculations."
+	@echo "    MSRPC=1                      Use Microsoft RPC instead of vlmcsd's internal RPC. Only works with Windows and Cygwin targets."
 	@echo "    CC=<x>                       Use compiler <x>. Supported compilers are gcc, icc, tcc and clang. Others may or may not work."
+	@echo "    AR=<x>                       Use <x> instead of ar to build $(A_NAME). Set to gcc-ar if you want to use gcc's LTO feature."
+	@echo "    COMPILER_LANGUAGE=<x>        May be c or c++."
 	@echo "    TERMINAL_WIDTH=<x>           Assume a fixed terminal width of <x> columns. Use in case of problems only."  
 	@echo "    VLMCSD_VERSION=<x>           Sets <x> as your version identifier. Defaults to \"private build\"."
 	@echo "    CFLAGS=<x>                   Pass <x> as additional arguments to the compiler."
@@ -522,7 +573,7 @@ help:
 	@echo "    FEATURES=minimum             Compiles only basic features of $(PROGRAM_NAME)."
 	@echo "    FEATURES=fixedepids          $(PROGRAM_NAME) only uses bultin internal ePIDs."
 	@echo ""
-	@echo "Useful CFLAGS to save memory when running $(PROGRAM_NAME) on very small embedded devices (finer control than FEATURES=):"
+	@echo "Useful CFLAGS to save memory when running $(PROGRAM_NAME) on very small embedded devices (finer control than FEATURES=)"
 	@echo "    -DNO_EXTENDED_PRODUCT_LIST   Don't compile the detailed product list."
 	@echo "    -DNO_BASIC_PRODUCT_LIST      Don't compile the basic product list."
 	@echo "    -DNO_VERBOSE_LOG             Don't support verbose logging. Removes -v option."
@@ -533,26 +584,29 @@ help:
 	@echo "    -DNO_USER_SWITCH             Don't support changing uid/gid after program start. Removes -u and -g options."
 	@echo "    -DNO_HELP                    Don't support command line help."
 	@echo "    -DNO_CUSTOM_INTERVALS        Don't support custom intervals for retry and refresh activation. Removes -A and -R options."
+	@echo "    -DNO_FREEBIND                Don't support binding to foreign IP addresses. Removes -F0 and -F1 options. Only affects FreeBSD and Linux."
+	@echo "    -DSIMPLE_SOCKETS             Compile $(PROGRAM_NAME) with basic socket support only. Removes -L option."
 	@echo "    -DNO_SOCKETS                 Don't support standalone operation. Requires an internet superserver to start $(PROGRAM_NAME)."
 	@echo "    -DNO_CL_PIDS                 Don't support specifying ePIDs and HwId from the command line in $(PROGRAM_NAME)."
 	@echo "    -DNO_LIMIT                   Don't support limiting concurrent clients in $(PROGRAM_NAME)."
 	@echo "    -DNO_SIGHUP                  Don't support SIGHUP handling in $(PROGRAM_NAME)."
+	@echo "    -DNO_VERSION_INFORMATION     Don't support displaying version information in $(PROGRAM_NAME) and $(CLIENT_NAME). Removes -V option."
+	@echo "    -DENABLE_DEPRECATED_OPTIONS  Enable command line options that provide compatibility with previous versions of $(PROGRAM_NAME)."
 	@echo ""
 	@echo "Troubleshooting options"
-	@echo "    CAT=1                        Combine all sources in a single file."
+	@echo "    CAT=1                        Combine all sources in a single in-memory file and compile directly to target."
-	@echo "    CAT=2                        Combine all sources in a single file and don't create a *.o file."
 	@echo "    NOPROCFS=1                   Don't rely on a properly mounted proc filesystem in /proc."
 	@echo "    AUXV=1                       Use /proc/self/auxv (requires Linux with glibc >= 2.16 or musl.)"
 	@echo "    NOLPTHREAD=1                 Disable detection if -lpthread is required (for use with Android NDK)."
-	@echo "    NOLRESOLV=1                  Disable detection if -lresolv is requires  (for use with Android NDK)."
+	@echo "    NOLRESOLV=1                  Disable detection if -lresolv is required  (for use with Android NDK)."
 	@echo "    NOLIBS=1                     Do not attempt to autodetect any library dependencies."
 	@echo "    OPENSSL_HMAC=0               Compile for openssl versions that don't have HMAC support (required on some embedded devices)."
 	@echo "    NO_TIMEOUT=1                 Do not set timeouts for sockets (for systems that don't support it)."
 	@echo "    CHILD_HANDLER=1              Install a handler for SIGCHLD (for systems that don't support SA_NOCLDWAIT)."
-	@echo "    NO_DNS=1                     Compile vlmcs without support for detecting KMS servers via DNS."
+	@echo "    NO_DNS=1                     Compile $(CLIENT_NAME) without support for detecting KMS servers via DNS."
 	@echo "    DNS_PARSER=internal          Use $(CLIENT_NAME) internal DNS parsing routines. No effect on MingW (native Windows)."
 	@echo ""
-	@echo "Other useful CFLAGS:"
+	@echo "Other useful CFLAGS"
 	@echo "    -DSUPPORT_WINE               Add code that the Windows version of $(PROGRAM_NAME) runs on Wine if MSRPC=1"
 	@echo "    -D_PEDANTIC                  Report rare error/warning conditions instead of silently ignoring them."
 	@echo "    -DINCLUDE_BETAS              Include SKU / activation IDs for obsolete beta/preview products."

config.h

@@ -37,15 +37,15 @@
  */
 
 #ifndef EPID_WINDOWS
-#define EPID_WINDOWS "06401-00206-271-298329-03-1033-9600.0000-0452015"
+#define EPID_WINDOWS "06401-00206-271-398432-03-1033-9600.0000-1422016"
 #endif
 
 #ifndef EPID_OFFICE2010
-#define EPID_OFFICE2010 "06401-00096-199-198322-03-1033-9600.0000-0452015"
+#define EPID_OFFICE2010 "06401-00096-199-198384-03-1033-9600.0000-1422016"
 #endif
 
 #ifndef EPID_OFFICE2013
-#define EPID_OFFICE2013 "06401-00206-234-398213-03-1033-9600.0000-0452015"
+#define EPID_OFFICE2013 "06401-00206-234-384729-03-1033-9600.0000-1422016"
 #endif
 
 #ifndef HWID // HwId from the Ratiborus VM
@@ -82,6 +82,25 @@
 
 
 
+/*
+ * -------------------------------
+ * Backward compatibility
+ * -------------------------------
+ */
+
+
+#if !defined(ENABLE_DEPRECATED_OPTIONS)
+/*
+ * comment out the following line if you want vlmcsd no to support command line options
+ * that have been present in previous versions of vlmcsd and are now obsolete
+ */
+
+//#define ENABLE_DEPRECATED_OPTIONS
+
+#endif // ENABLE_DEPRECATED_OPTIONS
+
+
+
 
 /*
  * ----------------------------------------------------------------------------------------
@@ -366,6 +385,20 @@
  */
 
 
+#ifndef NO_FREEBIND
+/*
+ * Do not compile support for FREEBIND (Linux) and IP_BINDANY (FreeBSD). This disables the -F1 command
+ * line option and you can bind only to (listen on) IP addresses that are currently up and running on
+ * your system.
+ */
+
+//#define NO_FREEBIND
+
+#endif // NO_FREEBIND
+
+
+
+
 #ifndef NO_EXTENDED_PRODUCT_LIST
 /*
  * Do not compile the extended product list. Removes the list of Activation GUIDs (aka
@@ -399,6 +432,18 @@
 
 
 
+#ifndef NO_VERSION_INFORMATION
+/*
+ * Removes the -V option from vlmcsd and vlmcs that displays the version information
+ */
+
+//#define NO_VERSION_INFORMATION
+
+#endif // NO_VERSION_INFORMATION
+
+
+
+
 #ifndef NO_VERBOSE_LOG
 /*
  * Removes the ability to do verbose logging and disables -v and -q in vlmcsd. It does not remove the -v
@@ -577,6 +622,19 @@
 
 
 
+#ifndef SIMPLE_SOCKETS
+/*
+ * Disables the ability to choose IP addresses using the -L option in vlmcsd. vlmcsd will listen on all IP addresses.
+ * It still supports IPv4 and IPv6.
+ */
+
+//#define SIMPLE_SOCKETS
+
+#endif // SIMPLE_SOCKETS
+
+
+
+
 /* Don't change anything BELOW this line */
 
 

kms.c

@@ -51,6 +51,7 @@ const KmsIdList ProductList[] = {
 };
 #endif
 
+#ifndef IS_LIBRARY
 // Application ID is used by KMS server to count KeyManagementServiceCurrentCount
 // Do not change the order of this list. Append items as necessary
 const KmsIdList AppList[] = {
@@ -59,6 +60,7 @@ const KmsIdList AppList[] = {
 	/* 002 */ { { 0x0FF1CE15, 0xA989, 0x479D, { 0xaf, 0x46, 0xf2, 0x75, 0xc6, 0x37, 0x06, 0x63 } } /*"0FF1CE15-A989-479D-AF46-F275C6370663"*/, FRIENDLY_NAME_OFFICE2013, EPID_OFFICE2013,	0,	0},
 	/* 003 */ { { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }, NULL, NULL, 0, 0 }
 };
+#endif // IS_LIBRARY
 
 #ifndef NO_EXTENDED_PRODUCT_LIST
 const KmsIdList ExtendedProductList [] = {
@@ -258,7 +260,7 @@ static const struct KMSHostOS { uint16_t Type; uint16_t Build; } HostOS[] =
     { 55041, 7601 }, // Windows Server 2008 R2 SP1
     {  5426, 9200 }, // Windows Server 2012
     {  6401, 9600 }, // Windows Server 2012 R2
-	{  3612, 10240}, // Windows Server 2016
+	//{  3612, 10240}, // Windows Server 2016
 };
 
 // GroupID and PIDRange
@@ -377,9 +379,10 @@ static int getRandomServerType()
 #	ifndef USE_MSRPC
 	else
 	{
-		// return 9200/9600/10240 if NDR64 is in use, otherwise 6002/7601
+		// return 9200/9600 if NDR64 is in use, otherwise 6002/7601
-		if (UseRpcNDR64) return (rand() % 3) + 2;
+		return (rand() % 2) + (UseRpcNDR64 ? 2 : 0);
-		return (rand() % 2);
+		// if (UseRpcNDR64) return (rand() % 3) + 2;
+		// return (rand() % 2);
 	}
 #	endif // USE_MSRPC
 }
@@ -424,12 +427,12 @@ static void generateRandomPid(const int index, char *const szPid, int serverType
 	strcat(szPid, itoc(numberBuffer, HostOS[serverType].Build, 0));
 	strcat(szPid, ".0000-");
 
-#	define minTime ((time_t)1436958000) // Release Date Windows 10 RTM Escrow
+#	define minTime ((time_t)1382029200) // Release Date Win 2012R2
 
 	time_t maxTime, kmsTime;
 	time(&maxTime);
 
-	if (maxTime < minTime) // Just in case the system time is < 07/15/2015 1:00 pm
+	if (maxTime < (time_t)BUILD_TIME) // Just in case the system time is < 10/17/2013 1:00 pm
 		maxTime = (time_t)BUILD_TIME;
 
 	kmsTime = (rand32() % (maxTime - minTime)) + minTime;
@@ -519,6 +522,7 @@ static void logRequest(const REQUEST *const baseRequest)
 /*
  * Converts a utf-8 ePID string to UCS-2 and writes it to a RESPONSE struct
  */
+#ifndef IS_LIBRARY
 static void getEpidFromString(RESPONSE *const Response, const char *const pid)
 {
 	size_t length = utf8_to_ucs2(Response->KmsPID, pid, PID_BUFFER_SIZE, PID_BUFFER_SIZE * 3);
@@ -567,6 +571,7 @@ static void getEpid(RESPONSE *const baseResponse, const char** EpidSource, const
 	}
 	getEpidFromString(baseResponse, pid);
 }
+#endif // IS_LIBRARY
 
 
 #if !defined(NO_LOG) && defined(_PEDANTIC)
@@ -627,6 +632,7 @@ static void logResponse(const RESPONSE *const baseResponse, const BYTE *const hw
 /*
  * Creates the unencrypted base response
  */
+#ifndef IS_LIBRARY
 static BOOL __stdcall CreateResponseBaseCallback(const REQUEST *const baseRequest, RESPONSE *const baseResponse, BYTE *const hwId, const char* const ipstr)
 {
 	const char* EpidSource;
@@ -663,6 +669,13 @@ static BOOL __stdcall CreateResponseBaseCallback(const REQUEST *const baseReques
 
 RequestCallback_t CreateResponseBase = &CreateResponseBaseCallback;
 
+#else // IS_LIBRARY
+
+RequestCallback_t CreateResponseBase = NULL;
+
+#endif // IS_LIBRARY
+
+
 ////TODO: Move to helpers.c
 void get16RandomBytes(void* ptr)
 {
@@ -670,7 +683,6 @@ void get16RandomBytes(void* ptr)
 	for (i = 0; i < 4; i++)	((DWORD*)ptr)[i] = rand32();
 }
 
-
 /*
  * Creates v4 response
  */

libkms-test.c

@@ -29,7 +29,14 @@ __stdcall BOOL KmsCallBack(const REQUEST *const baseRequest, RESPONSE *const bas
 
 int main(int argc, char** argv)
 {
-	printf("libvlmcs-test.c: Program start\n");
+	int version = GetLibKmsVersion();
+
+	if (version < 0x30001)
+	{
+		fprintf(stderr, "KMS library version %u.%u or greater required\n", (unsigned int)(version >> 16), (unsigned int)(version & 0xffff));
+	}
+
+	printf("%s: Program start\n", GetEmulatorVersion());
 	StartKmsServer(1688, KmsCallBack);
 	return 0;
 }

libkms.c

@@ -7,9 +7,13 @@
 #endif // CONFIG
 #include CONFIG
 
+#ifdef EXTERNAL
+#undef EXTERNAL
+#endif
+
 #define EXTERNAL dllexport
 
-#define DLLVERSION 0x30000
+#define DLLVERSION 0x30001
 
 #include "libkms.h"
 #include "shared_globals.h"
@@ -24,6 +28,10 @@
 #include <netinet/in.h>
 #endif // WIN32
 
+#ifdef IS_LIBRARY
+char ErrorMessage[MESSAGE_BUFFER_SIZE];
+#endif // IS_LIBRARY
+
 static int_fast8_t IsServerStarted = FALSE;
 
 
@@ -42,6 +50,7 @@ EXTERNC __declspec(EXTERNAL) DWORD __cdecl SendActivationRequest
 
 EXTERNC __declspec(EXTERNAL) DWORD __cdecl StartKmsServer(const int port, RequestCallback_t requestCallback)
 {
+#ifndef SIMPLE_SOCKETS
 	char listenAddress[64];
 
 	if (IsServerStarted) return !0;
@@ -97,6 +106,39 @@ EXTERNC __declspec(EXTERNAL) DWORD __cdecl StartKmsServer(const int port, Reques
 
 	IsServerStarted = FALSE;
 	return 0;
+
+#	else // SIMPLE_SOCKETS
+
+	if (IsServerStarted) return !0;
+	int error;
+
+#	ifdef _WIN32
+#	ifndef USE_MSRPC
+	// Windows Sockets must be initialized
+	WSADATA wsadata;
+
+	if ((error = WSAStartup(0x0202, &wsadata)))
+	{
+		return error;
+	}
+#	endif // USE_MSRPC
+#	endif // _WIN32
+
+	defaultport = vlmcsd_malloc(16);
+	snprintf((char*)defaultport, (size_t)16, "%i", port);
+
+	CreateResponseBase = requestCallback;
+	error = listenOnAllAddresses();
+	if (error) return error;
+
+	IsServerStarted = TRUE;
+	runServer();
+	IsServerStarted = FALSE;
+
+	return 0;
+
+
+#	endif // SIMPLE_SOCKETS
 }
 
 
@@ -105,7 +147,11 @@ EXTERNC __declspec(EXTERNAL) DWORD __cdecl StopKmsServer()
 	if (!IsServerStarted) return !0;
 
 	closeAllListeningSockets();
+
+#	ifndef SIMPLE_SOCKETS
 	if (SocketList) free(SocketList);
+#	endif
+
 	return 0;
 }
 
@@ -115,3 +161,9 @@ EXTERNC __declspec(EXTERNAL) int __cdecl GetLibKmsVersion()
 	return DLLVERSION;
 }
 
+
+EXTERNC __declspec(EXTERNAL) const char* const __cdecl GetEmulatorVersion()
+{
+	return VERSION;
+}
+

libkms.h

@@ -9,24 +9,19 @@
 #include "kms.h"
 #include "rpc.h"
 
+#ifndef EXTERNC
 #ifdef __cplusplus
-#define EXTERNC extern "C"
+#define EXTERNC EXTERN "C"
 #else
 #define EXTERNC
 #endif
-
-#if !defined(_WIN32) && !__CYGWIN__
-#define __declspec(x) __attribute__((__visibility__("default")))
-#endif
-
-#if !defined(EXTERNAL)
-#define EXTERNAL dllimport
 #endif
 
 EXTERNC __declspec(EXTERNAL) DWORD __cdecl SendActivationRequest(const char* const hostname, const int port, RESPONSE* baseResponse, const REQUEST* const baseRequest, RESPONSE_RESULT* result, BYTE *hwid);
 EXTERNC __declspec(EXTERNAL) DWORD __cdecl StartKmsServer(const int port, RequestCallback_t requestCallback);
 EXTERNC __declspec(EXTERNAL) DWORD __cdecl StopKmsServer();
 EXTERNC __declspec(EXTERNAL) int __cdecl GetLibKmsVersion();
+EXTERNC __declspec(EXTERNAL) const char* const __cdecl GetEmulatorVersion();
 //EXTERN_C __declspec(EXTERNAL) unsigned int __cdecl GetRandom32();
 
 

make_dragonfly

@@ -14,6 +14,7 @@ CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno
 CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
 LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
 LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
+export CC=gcc5
 
 gmake $MAKEFLAGS PROGRAM_NAME=vlmcsd-DragonFly-x64 CLIENT_NAME=vlmcs-DragonFly-x64 CFLAGS="$CF" LDFLAGS="$LF"
 rm vlmcsd.o vlmcs.o

make_freebsd

@@ -14,33 +14,33 @@ CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tabl
 LF="-Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none"
 LFCLANG="-Wl,-z,norelro -Wl,--hash-style=gnu"
 
-gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x64-gcc CLIENT_NAME=vlmcs-FreeBSD-10.2-x64-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-gcc CC=gcc5 CFLAGS="$CF" LDFLAGS="$LF"
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x64-gcc CLIENT_NAME=vlmcs-FreeBSD-10.3-x64-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-gcc CC=gcc5 CFLAGS="$CF" LDFLAGS="$LF"
 
-gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.2-x64 PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.3-x64 PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64 CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="$LF"
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.*
-gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.2-x64 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x64 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.3-x64 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x64 CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="$LF"
 
-gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.2-x86 PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.3-x86 PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86 CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.*
-gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.2-x86 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x86 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.3-x86 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x86 CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
 
-gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x86-gcc CLIENT_NAME=vlmcs-FreeBSD-10.2-x86-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-gcc CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x86-gcc CLIENT_NAME=vlmcs-FreeBSD-10.3-x86-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-gcc CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-L/usr/lib32 -B/usr/lib32 $LF"
 
-gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.2-x64-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.3-x64-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF" LDFLAGS="-lpthread $LF"
-gmake $MAKEFLAGS vlmcsd-FreeBSD-10.2-x64-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-threads THREADS=1 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.3-x64-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-threads THREADS=1 CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="-lpthread $LF"
-gmake $MAKEFLAGS vlmcsd-FreeBSD-10.2-x86-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-threads THREADS=1 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.3-x86-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-threads THREADS=1 CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="-lpthread $LF"
-gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.2-x86-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-lpthread -L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.3-x86-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-lpthread -L/usr/lib32 -B/usr/lib32 $LF"
 
-gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.2-x64-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-openssl1.0.1-EXPERIMENTAL CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.3-x64-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-openssl1.0.1-EXPERIMENTAL CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="$LF"
-gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.2-x86-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-openssl1.0.1-EXPERIMENTAL CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.3-x86-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-openssl1.0.1-EXPERIMENTAL CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
 
 rm *.o
 
 strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
 sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
 
-sudo cp -af vlmcsd-FreeBSD-10.2-x86-gcc /usr/local/sbin/vlmcsd
+sudo cp -af vlmcsd-FreeBSD-10.3-x86-gcc /usr/local/sbin/vlmcsd
-sudo cp -af vlmcs-FreeBSD-10.2-x86-gcc /usr/local/bin/vlmcs
+sudo cp -af vlmcs-FreeBSD-10.3-x86-gcc /usr/local/bin/vlmcs
 
 # Copy everything to distribution server
 scp -p vlmcsdmulti-* vlmcsd-* vlmcs-* root@ubuntu64:x/binaries/FreeBSD/intel/

make_hurd

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j1"
+
+export CC=gcc
+CF="-flto=jobserver -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-fuse-ld=gold -lresolv -Wl,-z,norelro,--hash-style=gnu,--build-id=none"
+
+make $MAKEFLAGS PROGRAM_NAME=vlmcsd-hurd-x86-glibc CLIENT_NAME=vlmcs-hurd-x86-glibc CFLAGS="$CF" LDFLAGS="$LF" CAT=2
+make $MAKEFLAGS MULTI_NAME=vlmcsdmulti-hurd-x86-glibc vlmcsdmulti-hurd-x86-glibc CFLAGS="$CF" LDFLAGS="$LF" CAT=2 AUXV=1
+
+make clean
+
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-hurd-x86-glibc /usr/local/sbin/vlmcsd
+cp -af vlmcs-hurd-x86-glibc /usr/local/bin/vlmcs
+
+# Copy man pages
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -af vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -af vlmcsd.7 /usr/local/man/man7/
+cp -af vlmcsd.8 /usr/local/man/man8/
+cp -af vlmcsd.ini.5 /usr/local/man/man5/
+bzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-* vlmcs-* root@ubuntu64.internal:x/binaries/Hurd/intel/
+

make_kfreebsd

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j`nproc`"
+
+export CC=gcc
+CF="-flto=jobserver -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-lresolv -Wl,-z,norelro,--hash-style=gnu,--build-id=none"
+
+export PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64-glibc
+export CLIENT_NAME=vlmcs-FreeBSD-10.1-x64-glibc
+export MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x64-glibc
+
+make $MAKEFLAGS CFLAGS="$CF -m64" LDFLAGS="$LF" CAT=2
+make $MAKEFLAGS $MULTI_NAME CFLAGS="$CF -m64" LDFLAGS="$LF" CAT=2 AUXV=1
+
+export PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86-glibc
+export CLIENT_NAME=vlmcs-FreeBSD-10.1-x86-glibc
+export MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x86-glibc
+
+make $MAKEFLAGS CFLAGS="$CF -m32" LDFLAGS="$LF" CAT=2
+make $MAKEFLAGS $MULTI_NAME CFLAGS="$CF -m32" LDFLAGS="$LF" CAT=2 AUXV=1
+
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af $PROGRAM_NAME /usr/local/sbin/vlmcsd
+cp -af $CLIENT_NAME /usr/local/bin/vlmcs
+
+# Copy man pages
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -af vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -af vlmcsd.7 /usr/local/man/man7/
+cp -af vlmcsd.8 /usr/local/man/man8/
+cp -af vlmcsd.ini.5 /usr/local/man/man5/
+bzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-* vlmcs-* root@ubuntu64.internal:x/binaries/FreeBSD/intel/
+

make_linux

@@ -20,7 +20,7 @@ mkdir -p binaries/Linux/intel/uclibc
 mkdir -p binaries/Linux/intel/static
 mkdir -p binaries/Linux/intel/musl
 
-mkdir -p binaries/Linux/sparc32/glibc
+mkdir -p binaries/Linux/sparc/glibc
 mkdir -p binaries/Linux/s390/glibc
 
 mkdir -p binaries/Android/arm/bionic
@@ -62,10 +62,13 @@ mkdir -p binaries/DragonFly/intel
 mkdir -p binaries/Solaris/intel
 mkdir -p binaries/Windows/intel
 mkdir -p binaries/Minix/intel
+mkdir -p binaries/Hurd/intel
 
 rm -f *_all.c vlmcsd.o vlmcs.o vlmcsdmulti.o 2> /dev/null
 export STAGING_DIR=.
 
+
+
 # Windows 32-bit using MingW32-w64 toolchain on Ubuntu Linux
 export CLIENT_NAME=binaries/Windows/intel/vlmcs-Windows-x86.exe
 export PROGRAM_NAME=binaries/Windows/intel/vlmcsd-Windows-x86.exe
@@ -75,10 +78,10 @@ export THREADS=1
 export CFLAGS="$SMALLCC"
 export CC=i686-w64-mingw32-gcc
 export PLATFORMFLAGS="-march=i686 -mtune=generic -fwhole-program -pipe"
-export LDFLAGS="-lws2_32 -Wl,--gc-sections,--force-exe-suffix,--large-address-aware,--nxcompat,--dynamicbase,--tsaware"
+export LDFLAGS="-lws2_32 -Wl,--gc-sections,--force-exe-suffix,--large-address-aware,--nxcompat,--dynamicbase,--tsaware,--no-seh,--disable-long-section-names"
 export FEATURES=full
 
-make $MAKEFLAGS CAT=2 all $MULTI_NAME
+make $MAKEFLAGS CRYPTO=windows CAT=2 all $MULTI_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
@@ -88,7 +91,7 @@ fi
 export CFLAGS="$CFLAGS -flto=jobserver -fvisibility=hidden"
 export LDFLAGS="$LDFLAGS -static-libgcc"
 
-make $MAKEFLAGS FEATURES=minimum $DLL_NAME
+make $MAKEFLAGS CRYPTO=windows FEATURES=minimum $DLL_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $DLL_NAME
@@ -105,17 +108,28 @@ export THREADS=1
 export CFLAGS="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fmerge-all-constants -Wno-unused-variable -Wno-missing-braces"
 export CC=i686-w64-mingw32-gcc
 export PLATFORMFLAGS="-march=i686 -mtune=generic -pipe"
-export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--large-address-aware,--nxcompat,--dynamicbase,--tsaware -fwhole-program"
+export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--large-address-aware,--nxcompat,--dynamicbase,--tsaware,--disable-long-section-names -fwhole-program"
 export FEATURES=full
 
-make $MAKEFLAGS CAT=2 MSRPC=1 all
+make $MAKEFLAGS CAT=2 MSRPC=1 CRYPTO=windows $CLIENT_NAME
 
 if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME and/or $PROGRAM_NAME
+  echo Error creating $CLIENT_NAME
   exit $?
 fi
 
-make $MAKEFLAGS MSRPC=1 $MULTI_NAME
+export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--large-address-aware,--nxcompat,--dynamicbase,--tsaware,--disable-long-section-names,--no-seh -fwhole-program"
+
+make $MAKEFLAGS CAT=2 MSRPC=1 CRYPTO=windows $PROGRAM_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $PROGRAM_NAME
+  exit $?
+fi
+
+export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--large-address-aware,--nxcompat,--dynamicbase,--tsaware,--disable-long-section-names -fwhole-program"
+
+make $MAKEFLAGS MSRPC=1 CRYPTO=windows $MULTI_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $MULTI_NAME
@@ -133,9 +147,9 @@ export THREADS=1
 export CFLAGS="$SMALLCC"
 export CC=x86_64-w64-mingw32-gcc
 export PLATFORMFLAGS="-march=nocona -mtune=generic -fwhole-program -pipe"
-export LDFLAGS="-lws2_32 -Wl,--gc-sections,--force-exe-suffix,--nxcompat,--dynamicbase,--tsaware"
+export LDFLAGS="-lws2_32 -Wl,--gc-sections,--force-exe-suffix,--nxcompat,--dynamicbase,--tsaware,--no-seh,--high-entropy-va,--disable-long-section-names"
 
-make $MAKEFLAGS CAT=2 all $MULTI_NAME
+make $MAKEFLAGS CAT=2 CRYPTO=windows all $MULTI_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
@@ -145,7 +159,7 @@ fi
 export CFLAGS="$CFLAGS -flto=jobserver -fvisibility=hidden"
 export LDFLAGS="$LDFLAGS -static-libgcc"
 
-make $MAKEFLAGS FEATURES=minimum $DLL_NAME
+make $MAKEFLAGS CRYPTO=windows FEATURES=minimum $DLL_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $DLL_NAME
@@ -163,22 +177,85 @@ export THREADS=1
 export CFLAGS="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fmerge-all-constants -Wno-unused-variable -Wno-missing-braces"
 export CC=x86_64-w64-mingw32-gcc
 export PLATFORMFLAGS="-march=nocona -mtune=generic -pipe"
-export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--nxcompat,--dynamicbase,--tsaware -fwhole-program"
+export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--nxcompat,--dynamicbase,--tsaware,--high-entropy-va,--disable-long-section-names -fwhole-program"
 
-make $MAKEFLAGS CAT=2 MSRPC=1 all
+make $MAKEFLAGS CAT=2 CRYPTO=windows MSRPC=1 $CLIENT_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $CLIENT_NAME
+  exit $?
+fi
+
+export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--nxcompat,--dynamicbase,--tsaware,--no-seh,--high-entropy-va,--disable-long-section-names -fwhole-program"
+
+make $MAKEFLAGS CAT=2 CRYPTO=windows MSRPC=1 $PROGRAM_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $PROGRAM_NAME
+  exit $?
+fi
+
+export LDFLAGS="-Wl,--gc-sections,--force-exe-suffix,--nxcompat,--dynamicbase,--tsaware,--high-entropy-va,--disable-long-section-names -fwhole-program"
+export PLATFORMFLAGS="-march=nocona -mtune=generic -pipe -flto=jobserver"
+
+make $MAKEFLAGS MSRPC=1 CRYPTO=windows $MULTI_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $MULTI_NAME
+  exit $?
+fi
+
+
+
+
+# mips1el uclibc with old tomato toolchain gcc 3.2.3 with Broadcom extensions uClibc 0.9.19
+export CLIENT_NAME=binaries/Linux/mips/little-endian/uclibc/vlmcs-mips1el-tomato-uclibc
+export PROGRAM_NAME=binaries/Linux/mips/little-endian/uclibc/vlmcsd-mips1el-tomato-uclibc
+export MULTI_NAME=binaries/Linux/mips/little-endian/uclibc/vlmcsdmulti-mips1el-tomato-uclibc
+export CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+export CFLAGS="-DNO_BUILTIN -DNO_LIMIT -pipe -fno-common -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+export PLATFORMFLAGS=""
+export LDFLAGS="-fwhole-program -Wl,-z,norelro"
+export THREADS=0
+#export TERMINAL_WIDTH=80
+
+make $MAKEFLAGS NO_DNS=1 SAFE_MODE=1
 
 if [ $? != 0 ]; then
   echo Error creating $CLIENT_NAME and/or $PROGRAM_NAME
   exit $?
 fi
 
-make $MAKEFLAGS MSRPC=1 $MULTI_NAME
+rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o
+
+make NO_DNS=1 SAFE_MODE=1 $REUSEOBJFLAGS $MULTI_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $MULTI_NAME
   exit $?
 fi
 
+export CLIENT_NAME=binaries/Linux/mips/little-endian/static/vlmcs-mips1el-tomato-uclibc-static
+export PROGRAM_NAME=binaries/Linux/mips/little-endian/static/vlmcsd-mips1el-tomato-uclibc-static
+export MULTI_NAME=binaries/Linux/mips/little-endian/static/vlmcsdmulti-mips1el-tomato-uclibc-static
+export LDFLAGS="$LDFLAGS -static"
+
+make NO_DNS=1 SAFE_MODE=1 $REUSEOBJFLAGS $MULTI_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $MULTI_NAME
+  exit $?
+fi
+
+rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o
+
+make NO_DNS=1 SAFE_MODE=1 $REUSEOBJFLAGS
+
+if [ $? != 0 ]; then
+  echo Error creating $CLIENT_NAME and/or $PROGRAM_NAME
+  exit $?
+fi
+
 
 
 
@@ -539,40 +616,6 @@ fi
 
 
 
-
-# mips1el uclibc with old tomato toolchain gcc 3.2.3 with Broadcom extensions uClibc 0.9.19
-export CLIENT_NAME=binaries/Linux/mips/little-endian/uclibc/vlmcs-mips1el-tomato-uclibc
-export PROGRAM_NAME=binaries/Linux/mips/little-endian/uclibc/vlmcsd-mips1el-tomato-uclibc
-export MULTI_NAME=binaries/Linux/mips/little-endian/uclibc/vlmcsdmulti-mips1el-tomato-uclibc
-export CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-export CFLAGS="-DNO_BUILTIN -pipe -fno-common -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
-export PLATFORMFLAGS=""
-export LDFLAGS="-pipe -Wl,-z,norelro"
-export THREADS=0
-#export TERMINAL_WIDTH=80
-
-make NO_DNS=1 CAT=2 $MAKEFLAGS $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
-
-if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
-  exit $?
-fi
-
-export CLIENT_NAME=binaries/Linux/mips/little-endian/static/vlmcs-mips1el-tomato-uclibc-static
-export PROGRAM_NAME=binaries/Linux/mips/little-endian/static/vlmcsd-mips1el-tomato-uclibc-static
-export MULTI_NAME=binaries/Linux/mips/little-endian/static/vlmcsdmulti-mips1el-tomato-uclibc-static
-export LDFLAGS="$LDFLAGS -static"
-
-make NO_DNS=1 $REUSEOBJFLAGS $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME CAT=2
-
-if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
-  exit $?
-fi
-
-
-
-
 #Android gcc 4.8 with API Level 3 (Android 1.5 cupcake) armv7
 
 export CLIENT_NAME=binaries/Android/arm/bionic/vlmcs-android15-armv7
@@ -1616,7 +1659,7 @@ export PROGRAM_NAME=binaries/Linux/intel/glibc/vlmcsd-x32-glibc
 export CC=gcc
 export CFLAGS="$SMALLCC"
 export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mx32 -march=nocona -mtune=generic"
-export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu"
+export LDFLAGS="-fuse-ld=gold $SMALLLD -Wl,--hash-style=gnu"
 export THREADS=0
 export NOPROCFS=0
 export AUXV=1
@@ -1646,7 +1689,7 @@ export PROGRAM_NAME=binaries/Linux/intel/glibc/vlmcsd-x32-glibc-threads
 export CC=gcc
 export CFLAGS="$SMALLCC"
 export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mx32 -march=nocona -mtune=generic"
-export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu -lpthread"
+export LDFLAGS="-fuse-ld=gold $SMALLLD -Wl,--hash-style=gnu -lpthread"
 export THREADS=1
 export NOPROCFS=0
 export AUXV=1
@@ -2121,10 +2164,19 @@ export LDFLAGS="-Wl,-z,norelro -fwhole-program"
 export THREADS=0
 export NOPROCFS=1
 
-make $MAKEFLAGS $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME CAT=2
+make $MAKEFLAGS SAFE_MODE=1
 
 if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
+  echo Error creating $CLIENT_NAME and/or $PROGRAM_NAME
+  exit $?
+fi
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+
+make $REUSEOBJFLAGS SAFE_MODE=1 $MULTI_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $MULTI_NAME
   exit $?
 fi
 
@@ -2133,10 +2185,19 @@ export CLIENT_NAME=${INSTALLDIR}static/vlmcs${SUFFIX}-static
 export MULTI_NAME=${INSTALLDIR}static/vlmcsdmulti${SUFFIX}-static
 export LDFLAGS="-Wl,-z,norelro -fwhole-program -static"
 
-make $REUSEOBJFLAGS $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME CAT=2
+make $REUSEOBJFLAGS SAFE_MODE=1 $MULTI_NAME
 
 if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
+  echo Error creating $MULTI_NAME
+  exit $?
+fi
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+
+make $REUSEOBJFLAGS SAFE_MODE=1
+
+if [ $? != 0 ]; then
+  echo Error creating $CLIENT_NAME and/or $PROGRAM_NAME
   exit $?
 fi
 
@@ -2226,10 +2287,19 @@ export THREADS=0
 export CRYPTO=internal
 export NOPROCFS=1
 
-make $MAKEFLAGS CAT=2 $CLIENT_NAME $MULTI_NAME $PROGRAM_NAME
+make $MAKEFLAGS SAFE_MODE=1 
 
 if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
+  echo Error creating $CLIENT_NAME and/or $PROGRAM_NAME
+  exit $?
+fi
+
+rm vlmcsd.o vlmcs.o vlmcsdmulti.o
+
+make $REUSEOBJFLAGS SAFE_MODE=1 $MULTI_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $MULTI_NAME
   exit $?
 fi
 
@@ -2238,10 +2308,19 @@ export CLIENT_NAME=${INSTALLDIR}static/vlmcs${SUFFIX}-static
 export MULTI_NAME=${INSTALLDIR}static/vlmcsdmulti${SUFFIX}-static
 export LDFLAGS="-Wl,-z,norelro -fwhole-program -static"
 
-make $REUSEOBJFLAGS CAT=2 $CLIENT_NAME $MULTI_NAME $PROGRAM_NAME
+make $REUSEOBJFLAGS SAFE_MODE=1 $MULTI_NAME
 
 if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
+  echo Error creating $MULTI_NAME
+  exit $?
+fi
+
+rm vlmcsd.o vlmcs.o vlmcsdmulti.o
+
+make $REUSEOBJFLAGS SAFE_MODE=1
+
+if [ $? != 0 ]; then
+  echo Error creating $CLIENT_NAME and/or $PROGRAM_NAME
   exit $?
 fi
 
@@ -2315,32 +2394,6 @@ fi
 
 
 
-# Linux PowerPC glibc with SSL support and Dreambox 500 toolchain
-INSTALLDIR=binaries/Linux/ppc/big-endian/glibc/
-SUFFIX=-ppc-glibc-openssl0.9.8-soft-EXPERIMENTAL
-export PROGRAM_NAME=${INSTALLDIR}vlmcsd${SUFFIX}
-export CLIENT_NAME=${INSTALLDIR}vlmcs${SUFFIX}
-export MULTI_NAME=${INSTALLDIR}vlmcsdmulti${SUFFIX}
-export CC=/opt/simplebuild/toolchains/powerpc/bin/powerpc-linux-gcc
-export PLATFORMFLAGS="-pipe"
-export FEATURES=full
-export CFLAGS="-fno-common -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
-export LDFLAGS="-Wl,--no-gc-sections -Wl,-z,norelro"
-export THREADS=0
-export CRYPTO=internal
-
-make NO_DNS=1 $MAKEFLAGS CAT=2 $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
-
-if [ $? != 0 ]; then
-  echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
-  exit $?
-fi
-
-
-
-
-
-
 #Linux PowerPC uclibc OpenWRT toolchain
 INSTALLDIR=binaries/Linux/ppc/big-endian/
 SUFFIX=-ppc-uclibc
@@ -2531,6 +2584,30 @@ fi
 
 
 
+#Fritzbox 7370 (mips32r2 big-endian) device specific with simple sockets and some features disabled, May or may not run on other devices
+INSTALLDIR=binaries/Linux/mips/big-endian/uclibc/
+SUFFIX=-mips16-Fritzbox-33xx-73xx-74xx-63xx-64xx-uclibc-simple
+export PROGRAM_NAME=${INSTALLDIR}vlmcsd${SUFFIX}
+export CLIENT_NAME=${INSTALLDIR}vlmcs${SUFFIX}
+export MULTI_NAME=${INSTALLDIR}vlmcsdmulti${SUFFIX}
+export CC=/opt/simplebuild/toolchains/fritz73xxOS62/bin/mips-linux-cc
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -march=24kc -mtune=24kc -mips16 -mdsp"
+export FEATURES=full
+export CFLAGS="$SMALLCC -DNO_USER_SWITCH -DSIMPLE_SOCKETS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_USER_SWITCH"
+export LDFLAGS="$SMALLLD"
+export THREADS=0
+export CRYPTO=internal
+
+make NOLRESOLV=1 $MAKEFLAGS $PROGRAM_NAME
+
+if [ $? != 0 ]; then
+  echo Error creating $PROGRAM_NAME
+  exit $?
+fi
+
+
+
+
 #Fritzbox 7370 (mips32r2 big-endian) device specific inetd start only, May or may not run on other devices
 INSTALLDIR=binaries/Linux/mips/big-endian/uclibc/
 SUFFIX=-mips16-Fritzbox-33xx-73xx-74xx-63xx-64xx-uclibc-inetd
@@ -3132,7 +3209,7 @@ fi
 
 
 #Linux Sparc32v7 glibc
-INSTALLDIR=binaries/Linux/sparc32/glibc/
+INSTALLDIR=binaries/Linux/sparc/glibc/
 SUFFIX=-sparc32v7-glibc
 export PROGRAM_NAME=${INSTALLDIR}vlmcsd${SUFFIX}
 export CLIENT_NAME=${INSTALLDIR}vlmcs${SUFFIX}
@@ -3141,7 +3218,7 @@ export CC=/opt/toolchains/sparc32-glibc-gcc-4.7.4/bin/sparc-buildroot-linux-gnu-
 export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mcpu=v7"
 export FEATURES=full
 export CFLAGS="$SMALLCC"
-export LDFLAGS="$SMALLLD -lpthread"
+export LDFLAGS="$SMALLLD"
 export THREADS=0
 export CRYPTO=internal
 
@@ -3330,7 +3407,7 @@ export LDFLAGS="-fwhole-program"
 export THREADS=0
 export CRYPTO=internal
 
-make $MAKEFLAGS CAT=2 $PROGRAM_NAME $MULTI_NAME $CLIENT_NAME
+make $MAKEFLAGS CAT=2 SAFE_MODE=1 $PROGRAM_NAME $MULTI_NAME $CLIENT_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $PROGRAM_NAME, $MULTI_NAME and/or $CLIENT_NAME
@@ -3342,7 +3419,7 @@ export CLIENT_NAME=${INSTALLDIR}static/vlmcs${SUFFIX}-static
 export MULTI_NAME=${INSTALLDIR}static/vlmcsdmulti${SUFFIX}-static
 export LDFLAGS="-fwhole-program -static"
 
-make $REUSEOBJFLAGS CAT=2 $PROGRAM_NAME $MULTI_NAME $CLIENT_NAME
+make $REUSEOBJFLAGS CAT=2 SAFE_MODE=1 $PROGRAM_NAME $MULTI_NAME $CLIENT_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $PROGRAM_NAME, $MULTI_NAME and/or $CLIENT_NAME
@@ -3456,7 +3533,7 @@ export CFLAGS="$SMALLCC"
 export LDFLAGS="-Wl,-z,norelo"
 export THREADS=0
 
-make $MAKEFLAGS CAT=2 $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+make $MAKEFLAGS SAFE_MODE=1 CAT=2 $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
@@ -3468,7 +3545,7 @@ export CLIENT_NAME=${INSTALLDIR}static/vlmcs${SUFFIX}-static
 export MULTI_NAME=${INSTALLDIR}static/vlmcsdmulti${SUFFIX}-static
 export LDFLAGS="-Wl,-z,norelo -static"
 
-make $REUSEOBJFLAGS CAT=2 $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+make $REUSEOBJFLAGS SAFE_MODE=1 CAT=2 $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
 
 if [ $? != 0 ]; then
   echo Error creating $CLIENT_NAME, $MULTI_NAME and/or $PROGRAM_NAME
@@ -3478,9 +3555,9 @@ fi
 
 # Strip off unnecessary stuff from binaries
 
-find binaries -xdev -name 'vlmcs*' -exec /opt/toolchains/mips32el-mips16-glibc-2.18/usr/bin/mipsel-linux-strip -s --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag {} \; 2>/dev/null
+#find binaries -xdev -name 'vlmcs*' -exec /opt/toolchains/mips32el-mips16-glibc-2.18/usr/bin/mipsel-linux-strip -s --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag {} \; 2>/dev/null
-find binaries -xdev -name 'vlmcs*' -exec strip -s --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag {} \; 2>/dev/null
+#find binaries -xdev -name 'vlmcs*' -exec strip -s --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag {} \; 2>/dev/null
-find binaries -xdev -name 'vlmcs*' -exec sstrip -z {} \; 2>/dev/null
+find binaries -xdev -name 'vlmcs*' ! -name '*-NetBSD-*' ! -name '*-Windows-*' ! -name '*-cygwin-*' ! -name '*-MacOSX-*' ! -name '*-iOS-*' -exec sstrip -z {} \;
 
 make alldocs
 

make_mainframe_linux

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-SMALLCC="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
-SMALLLD="-pipe -Wl,--hash-style=sysv -Wl,-z,norelro -Wl,--build-id=none"
-SMALL="$SMALLCC $SMALLLD"
-
-export CFLAGS="$SMALLCC"
-export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m31 -mesa -mpacked-stack -msmall-exec"
-export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu"
-export THREADS=0
-export FEATURES=full
-
-export MULTI_NAME=vlmcsdmulti-s390-glibc
-export CLIENT_NAME=vlmcs-s390-glibc
-export PROGRAM_NAME=vlmcsd-s390-glibc
-
-make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
-
-rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
-make -j`nproc` $MULTI_NAME
-
-sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
-
-export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m64 -mzarch -mpacked-stack -msmall-exec"
-export MULTI_NAME=vlmcsdmulti-s390x-glibc
-export CLIENT_NAME=vlmcs-s390x-glibc
-export PROGRAM_NAME=vlmcsd-s390x-glibc
-
-make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
-
-rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
-export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m64 -mzarch -mpacked-stack -msmall-exec"
-make -j`nproc` $MULTI_NAME
-
-sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
-
-cp -af vlmcsd-s390-glibc /usr/local/sbin/vlmcsd
-cp -af vlmcs-s390-glibc /usr/local/bin/vlmcs
-
-mkdir -p /usr/local/man/man1 2>/dev/null
-mkdir -p /usr/local/man/man5 2>/dev/null
-mkdir -p /usr/local/man/man8 2>/dev/null
-mkdir -p /usr/local/man/man7 2>/dev/null
-cp -a vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
-cp -a vlmcsd.7 /usr/local/man/man7/
-cp -a vlmcsd.8 /usr/local/man/man8/
-cp -a vlmcsd.ini.5 /usr/local/man/man5/
-pbzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
-
-scp -p vlmcsdmulti-s390-glibc vlmcs-s390-glibc vlmcsd-s390-glibc vlmcsdmulti-s390x-glibc vlmcs-s390x-glibc vlmcsd-s390x-glibc ubuntu64.internal:x/binaries/Linux/s390/glibc

make_multilib_linux

@@ -0,0 +1,137 @@
+#!/bin/bash
+
+SMALLCC="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+SMALLLD="-pipe -Wl,--hash-style=sysv -Wl,-z,norelro -Wl,--build-id=none"
+SMALL="$SMALLCC $SMALLLD"
+
+rm -f vlmcsd vlmcs vlmcsdmulti vlmcsd-* vlmcs-* vlmcsdmulti-*
+
+## IBM S/390
+
+export CFLAGS="$SMALLCC"
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m31 -mesa -mpacked-stack -msmall-exec"
+export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu"
+export THREADS=0
+export FEATURES=full
+export CC=s390x-linux-gnu-gcc
+export VERBOSE=3
+
+export MULTI_NAME=vlmcsdmulti-s390-glibc
+export CLIENT_NAME=vlmcs-s390-glibc
+export PROGRAM_NAME=vlmcsd-s390-glibc
+
+make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+make -j`nproc` $MULTI_NAME
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m64 -mzarch -mpacked-stack -msmall-exec"
+export MULTI_NAME=vlmcsdmulti-s390x-glibc
+export CLIENT_NAME=vlmcs-s390x-glibc
+export PROGRAM_NAME=vlmcsd-s390x-glibc
+
+make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m64 -mzarch -mpacked-stack -msmall-exec"
+make -j`nproc` $MULTI_NAME
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+## SPARC64
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mcpu=v7"
+export LDFLAGS="$SMALLLD"
+export CC=sparc64-linux-gnu-gcc
+
+export MULTI_NAME=vlmcsdmulti-sparc64v9-glibc
+export CLIENT_NAME=vlmcs-sparc64v9-glibc
+export PROGRAM_NAME=vlmcsd-sparc64v9-glibc
+
+make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+make -j`nproc` $MULTI_NAME
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+## MIPS64 BIG-ENDIAN
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mno-mips16"
+export LDFLAGS="$SMALLLD"
+export CC=mips64-linux-gnuabi64-gcc
+
+export MULTI_NAME=vlmcsdmulti-mips64-glibc
+export CLIENT_NAME=vlmcs-mips64-glibc
+export PROGRAM_NAME=vlmcsd-mips64-glibc
+
+make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+make -j`nproc` $MULTI_NAME
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mmicromips"
+export MULTI_NAME=vlmcsdmulti-mips64mm-glibc
+export CLIENT_NAME=vlmcs-mips64mm-glibc
+export PROGRAM_NAME=vlmcsd-mips64mm-glibc
+
+make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+make -j`nproc` $MULTI_NAME
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+## MIPS64 LITTLE-ENDIAN
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mno-mips16"
+export LDFLAGS="$SMALLLD"
+export CC=mips64el-linux-gnuabi64-gcc
+
+export MULTI_NAME=vlmcsdmulti-mips64el-glibc
+export CLIENT_NAME=vlmcs-mips64el-glibc
+export PROGRAM_NAME=vlmcsd-mips64el-glibc
+
+make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+make -j`nproc` $MULTI_NAME
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mmicromips"
+export MULTI_NAME=vlmcsdmulti-mips64elmm-glibc
+export CLIENT_NAME=vlmcs-mips64elmm-glibc
+export PROGRAM_NAME=vlmcsd-mips64elmm-glibc
+
+make -B -j`nproc` $CLIENT_NAME $PROGRAM_NAME
+
+rm -f vlmcsd.o vlmcs.o vlmcsdmulti.o
+make -j`nproc` $MULTI_NAME
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+
+if [ "$1" == "nocopy" ]; then
+  exit 0
+fi
+
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -a vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -a vlmcsd.7 /usr/local/man/man7/
+cp -a vlmcsd.8 /usr/local/man/man8/
+cp -a vlmcsd.ini.5 /usr/local/man/man5/
+pbzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+scp -p vlmcsdmulti-s390-glibc vlmcs-s390-glibc vlmcsd-s390-glibc vlmcsdmulti-s390x-glibc vlmcs-s390x-glibc vlmcsd-s390x-glibc ubuntu64.internal:x/binaries/Linux/s390/glibc
+scp -p vlmcsdmulti-sparc64v9-glibc vlmcs-sparc64v9-glibc vlmcsd-sparc64v9-glibc ubuntu64.internal:x/binaries/Linux/sparc/glibc
+scp -p vlmcsdmulti-mips64-glibc vlmcs-mips64-glibc vlmcsd-mips64-glibc vlmcsdmulti-mips64mm-glibc vlmcs-mips64mm-glibc vlmcsd-mips64mm-glibc ubuntu64.internal:x/binaries/Linux/mips/big-endian/glibc
+scp -p vlmcsdmulti-mips64el-glibc vlmcs-mips64el-glibc vlmcsd-mips64el-glibc vlmcsdmulti-mips64elmm-glibc vlmcs-mips64elmm-glibc vlmcsd-mips64elmm-glibc ubuntu64.internal:x/binaries/Linux/mips/little-endian/glibc
+scp -p -P 2222 vlmcsdmulti-s390-glibc vlmcs-s390-glibc vlmcsd-s390-glibc vlmcsdmulti-s390x-glibc vlmcs-s390x-glibc vlmcsd-s390x-glibc s390:vlmcsd
+scp -p -P 2222 vlmcsdmulti-s390-glibc vlmcsdmulti-s390x-glibc s390:/usr/local/sbin

make_netbsd

@@ -4,7 +4,7 @@ export VERBOSE=3
 export DNS_PARSER=OS
 
 rm -f vlmcsd-* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
-rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+gmake clean
 
 MAKEFLAGS="-B -j12"
 REUSEOBJFLAGS="-j12"
@@ -15,17 +15,17 @@ CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tabl
 LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
 LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
 
-gmake $MAKEFLAGS CC=/usr/pkg/gcc49/bin/gcc PROGRAM_NAME=vlmcsd-NetBSD-x64 CLIENT_NAME=vlmcs-NetBSD-x64 CFLAGS="$CF" LDFLAGS="$LF"
+gmake $MAKEFLAGS CC=/usr/pkg/gcc5/bin/gcc PROGRAM_NAME=vlmcsd-NetBSD-x64 CLIENT_NAME=vlmcs-NetBSD-x64 CFLAGS="$CF" LDFLAGS="$LF"
 rm vlmcsd.o vlmcs.o
-gmake vlmcsdmulti-NetBSD-x64 $REUSEOBJFLAGS CC=/usr/pkg/gcc49/bin/gcc CFLAGS="$CF" LDFLAGS="$LF" MULTI_NAME=vlmcsdmulti-NetBSD-x64
+gmake vlmcsdmulti-NetBSD-x64 $REUSEOBJFLAGS CC=/usr/pkg/gcc5/bin/gcc CFLAGS="$CF" LDFLAGS="$LF" MULTI_NAME=vlmcsdmulti-NetBSD-x64
 
-gmake allmulti $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-NetBSD-x86 PROGRAM_NAME=vlmcsd-NetBSD-x86 CLIENT_NAME=vlmcs-NetBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
+gmake allmulti CC=gcc $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-NetBSD-x86 PROGRAM_NAME=vlmcsd-NetBSD-x86 CLIENT_NAME=vlmcs-NetBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
 
 #gmake $MAKEFLAGS CC=clang PROGRAM_NAME=vlmcsd-NetBSD-x64-clang CLIENT_NAME=vlmcs-NetBSD-x64-clang CFLAGS="$CFCLANG" LDFLAGS="$LFCLANG"
 
 rm *.o
 
-strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+strip -s --strip-unneeded -R .ident -R .got -R .note.netbsd.pax -R .gnu.version -R .eh_frame -R .note.gnu.gold-version -R .comment -R .note -R .note.gnu.build-id -R .note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
 #sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
 
 cp -af vlmcsd-NetBSD-x86 /usr/local/sbin/vlmcsd

make_osx

@@ -6,7 +6,7 @@ export DNS_PARSER=OS
 rm vlmcsd-* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
 rm vlmcsd vlmcs vlmcsdmulti 2>/dev/null
 
-MAKEFLAGS="-j -B"
+MAKEFLAGS="-Bj"
 REUSEOBJFLAGS="-j"
 CFGCC="-static-libgcc -mdynamic-no-pic -Os -flto=jobserver -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
 CFCLANG="-mdynamic-no-pic -Os -flto -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
@@ -27,12 +27,12 @@ make $MAKEFLAGS vlmcsd-MacOSX-x64-threads THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \
 #make $REUSEOBJFLAGS vlmcsdmulti-iOS-7.1-armv7 MULTI_NAME=vlmcsdmulti-iOS-7.1-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk" && \
 
-make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-9.1-armv7 PROGRAM_NAME=vlmcsd-iOS-9.1-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot ~/toolchains/iPhoneOS9.1.sdk" && \
+make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-armv7 PROGRAM_NAME=vlmcsd-iOS-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot ~/toolchains/iPhoneOS.sdk" && \
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \
-make $REUSEOBJFLAGS vlmcsdmulti-iOS-9.1-armv7 MULTI_NAME=vlmcsdmulti-iOS-9.1-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot ~/toolchains/iPhoneOS9.1.sdk" && \
+make $REUSEOBJFLAGS vlmcsdmulti-iOS-armv7 MULTI_NAME=vlmcsdmulti-iOS-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot ~/toolchains/iPhoneOS.sdk" && \
-make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-9.1-armv8-aarch64 PROGRAM_NAME=vlmcsd-iOS-9.1-armv8-aarch64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -arch arm64 -miphoneos-version-min=7.0 -isysroot ~/toolchains/iPhoneOS9.1.sdk" && \
+make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-armv8-aarch64 PROGRAM_NAME=vlmcsd-iOS-armv8-aarch64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -arch arm64 -miphoneos-version-min=7.0 -isysroot ~/toolchains/iPhoneOS.sdk" && \
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \
-make $REUSEOBJFLAGS vlmcsdmulti-iOS-9.1-armv8-aarch64 MULTI_NAME=vlmcsdmulti-iOS-9.1-armv8-aarch64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -arch arm64 -miphoneos-version-min=7.0 -isysroot ~/toolchains/iPhoneOS9.1.sdk" && \
+make $REUSEOBJFLAGS vlmcsdmulti-iOS-armv8-aarch64 MULTI_NAME=vlmcsdmulti-iOS-armv8-aarch64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -arch arm64 -miphoneos-version-min=7.0 -isysroot ~/toolchains/iPhoneOS.sdk" && \
 
 make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-6.1-armv7 PROGRAM_NAME=vlmcsd-iOS-6.1-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS6.1.sdk -isysroot ~/toolchains/iPhoneOS6.1.sdk" && \
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \
@@ -56,9 +56,9 @@ PATH=~/toolchains/iOS5.1-MacOS-Lion/usr/bin:$PATH make $REUSEOBJFLAGS vlmcsdmult
 #PATH=~/toolchains/gcc4.2/usr/bin:$PATH make $REUSEOBJFLAGS vlmcsdmulti-iOS-4.1-armv7-llvm-clang MULTI_NAME=vlmcsdmulti-iOS-4.1-armv7-llvm-clang CC=~/toolchains/gcc4.2/usr/bin/bin/clang CFLAGS="$CFGCC42" PLATFORMFLAGS="-mthumb -arch armv7 -miphoneos-version-min=4.1 --sysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.1.sdk -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.1.sdk" && \
 
 
-PATH=~/toolchains/gcc4.2/usr/bin:$PATH make -Bj PROGRAM_NAME=vlmcsd-MacOSX-ppc CLIENT_NAME=vlmcs-MacOSX-ppc CC=gcc CFLAGS="$CFGCC42 -isysroot ~/toolchains/MacOSX10.5.sdk -arch ppc -mmacosx-version-min=10.0" && \
+PATH=~/toolchains/gcc4.2/usr/bin:$PATH make -Bj SAFE_MODE=1 PROGRAM_NAME=vlmcsd-MacOSX-ppc CLIENT_NAME=vlmcs-MacOSX-ppc CC=gcc CFLAGS="$CFGCC42 -isysroot ~/toolchains/MacOSX10.5.sdk -arch ppc -mmacosx-version-min=10.0" && \
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \
-PATH=~/toolchains/gcc4.2/usr/bin:$PATH make -j vlmcsdmulti-MacOSX-ppc MULTI_NAME=vlmcsdmulti-MacOSX-ppc CC=gcc CFLAGS="$CFGCC42 -isysroot ~/toolchains/MacOSX10.5.sdk -arch ppc -mmacosx-version-min=10.0"
+PATH=~/toolchains/gcc4.2/usr/bin:$PATH make -j SAFE_MODE=1 vlmcsdmulti-MacOSX-ppc MULTI_NAME=vlmcsdmulti-MacOSX-ppc CC=gcc CFLAGS="$CFGCC42 -isysroot ~/toolchains/MacOSX10.5.sdk -arch ppc -mmacosx-version-min=10.0"
 
 
 make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x86-gcc PROGRAM_NAME=vlmcsd-MacOSX-x86-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.11" && \

make_windows

@@ -10,18 +10,18 @@ CF="-Wno-missing-braces -fno-common -fno-exceptions -fno-non-call-exceptions -fn
 CFMSRPC="-Wno-missing-braces -Wno-unused-variable $CF" # -fno-common -fno-stack-protector -fmerge-all-constants -pipe"
 PF32=""
 PF64="-mpreferred-stack-boundary=4 -march=nocona -mtune=generic"
-LFCYG32="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
+LFCYG32="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware,--disable-long-section-names"
-LFWIN32="-fwhole-program -lws2_32 -Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
+LFWIN32="-fwhole-program -lws2_32 -Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware,--disable-long-section-names"
-LFCYG64="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware"
+LFCYG64="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware,--disable-long-section-names,--high-entropy-va"
-LFWIN64="-fwhole-program -lws2_32 -Wl,--nxcompat,--dynamicbase,--tsaware"
+LFWIN64="-fwhole-program -lws2_32 -Wl,--nxcompat,--dynamicbase,--tsaware,--disable-long-section-names,--high-entropy-va"
 
 MAKEFLAGS="-j$NUMCPU -B"
 REUSEFLAGS="-j$NUMCPU"
 
-make $MAKEFLAGS cygkms32.dll FEATURES=minimum THREADS=1 DLL_NAME=cygkms32.dll DNS_PARSER=internal CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32"
+make $MAKEFLAGS cygkms32.dll FEATURES=minimum THREADS=1 DLL_NAME=cygkms32.dll DNS_PARSER=internal CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32 -Wl,--no-seh"
-make $MAKEFLAGS cygkms64.dll FEATURES=minimum THREADS=1 DLL_NAME=cygkms64.dll DNS_PARSER=internal CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+make $MAKEFLAGS cygkms64.dll FEATURES=minimum THREADS=1 DLL_NAME=cygkms64.dll DNS_PARSER=internal CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64 -Wl,--no-seh"
-make $MAKEFLAGS all vlmcsdmulti-cygwin-x86 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-x86 PROGRAM_NAME=vlmcsd-cygwin-x86 MULTI_NAME=vlmcsdmulti-cygwin-x86 CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32"
+make $MAKEFLAGS all vlmcsdmulti-cygwin-x86 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-x86 PROGRAM_NAME=vlmcsd-cygwin-x86 MULTI_NAME=vlmcsdmulti-cygwin-x86 CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32 -Wl,--no-seh"
-make $MAKEFLAGS all vlmcsdmulti-cygwin-x64 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-x64 PROGRAM_NAME=vlmcsd-cygwin-x64 MULTI_NAME=vlmcsdmulti-cygwin-x64 CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+make $MAKEFLAGS all vlmcsdmulti-cygwin-x64 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-x64 PROGRAM_NAME=vlmcsd-cygwin-x64 MULTI_NAME=vlmcsdmulti-cygwin-x64 CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64 -Wl,--no-seh"
 make $MAKEFLAGS MSRPC=1 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-msrpc-x86 PROGRAM_NAME=vlmcsd-cygwin-msrpc-x86 MULTI_NAME=vlmcsdmulti-cygwin-msrpc-x86 CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF -fasynchronous-unwind-tables" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32"
 make $MAKEFLAGS MSRPC=1 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-msrpc-x64 PROGRAM_NAME=vlmcsd-cygwin-msrpc-x64 MULTI_NAME=vlmcsdmulti-cygwin-msrpc-x64 CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
 unset CAT
@@ -34,19 +34,24 @@ make $MAKEFLAGS THREADS=1 MSRPC=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-m
 
 export CAT=2
 
-make $MAKEFLAGS libkms32.dll CRYPTO=windows FEATURES=minimum THREADS=1 DLL_NAME=libkms32.dll CC=i686-w64-MingW32-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF32" LDFLAGS="-static-libgcc $LFWIN32"
+#make $MAKEFLAGS libkms32.dll CRYPTO=windows FEATURES=minimum THREADS=1 DLL_NAME=libkms32.dll CC=i686-w64-MingW32-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF32" LDFLAGS="-static-libgcc $LFWIN32"
-make $MAKEFLAGS libkms64.dll CRYPTO=windows FEATURES=minimum THREADS=1 DLL_NAME=libkms64.dll CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF64" LDFLAGS="-static-libgcc $LFWIN64"
+#make $MAKEFLAGS libkms64.dll CRYPTO=windows FEATURES=minimum THREADS=1 DLL_NAME=libkms64.dll CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF64" LDFLAGS="-static-libgcc $LFWIN64"
-make $MAKEFLAGS all vlmcsdmulti-Windows-x86 THREADS=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-x86 PROGRAM_NAME=vlmcsd-Windows-x86 MULTI_NAME=vlmcsdmulti-Windows-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF32" LDFLAGS="$LFWIN32"
+#make $MAKEFLAGS all vlmcsdmulti-Windows-x86 THREADS=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-x86 PROGRAM_NAME=vlmcsd-Windows-x86 MULTI_NAME=vlmcsdmulti-Windows-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF32" LDFLAGS="$LFWIN32"
-make $MAKEFLAGS all vlmcsdmulti-Windows-x64 THREADS=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-x64 PROGRAM_NAME=vlmcsd-Windows-x64 MULTI_NAME=vlmcsdmulti-Windows-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF64" LDFLAGS="$LFWIN64"
+#make $MAKEFLAGS all vlmcsdmulti-Windows-x64 THREADS=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-x64 PROGRAM_NAME=vlmcsd-Windows-x64 MULTI_NAME=vlmcsdmulti-Windows-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF64" LDFLAGS="$LFWIN64"
-make -Bj MSRPC=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-msrpc-x86 PROGRAM_NAME=vlmcsd-Windows-msrpc-x86 MULTI_NAME=vlmcsdmulti-Windows-msrpc-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC"  PLATFORMFLAGS="$PF32" LDFLAGS="-Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
+#make -Bj MSRPC=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-msrpc-x86 PROGRAM_NAME=vlmcsd-Windows-msrpc-x86 MULTI_NAME=vlmcsdmulti-Windows-msrpc-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC"  PLATFORMFLAGS="$PF32" LDFLAGS="-Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
-make $MAKEFLAGS THREADS=1 MSRPC=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-msrpc-x64 PROGRAM_NAME=vlmcsd-Windows-msrpc-x64 MULTI_NAME=vlmcsdmulti-Windows-msrpc-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+#make $MAKEFLAGS THREADS=1 MSRPC=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-msrpc-x64 PROGRAM_NAME=vlmcsd-Windows-msrpc-x64 MULTI_NAME=vlmcsdmulti-Windows-msrpc-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
-unset CAT
+#unset CAT
-make $MAKEFLAGS vlmcsdmulti-Windows-msrpc-x86 THREADS=1 MSRPC=1 CRYPTO=windows MULTI_NAME=vlmcsdmulti-Windows-msrpc-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF32" LDFLAGS="-Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
+#make $MAKEFLAGS vlmcsdmulti-Windows-msrpc-x86 THREADS=1 MSRPC=1 CRYPTO=windows MULTI_NAME=vlmcsdmulti-Windows-msrpc-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF32" LDFLAGS="-Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
-make $MAKEFLAGS vlmcsdmulti-Windows-msrpc-x64 THREADS=1 MSRPC=1 CRYPTO=windows MULTI_NAME=vlmcsdmulti-Windows-msrpc-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+#make $MAKEFLAGS vlmcsdmulti-Windows-msrpc-x64 THREADS=1 MSRPC=1 CRYPTO=windows MULTI_NAME=vlmcsdmulti-Windows-msrpc-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
 export CAT=2
 
 rm -f *_all.* *.o 2> /dev/null &
 
+echo ""
+echo "Copying MingW binaries from distribution server"
+
+scp -p root@ubuntu64:x/binaries/Windows/intel/* .
+
 echo ""
 echo "Installing binaries"
 

network.c

@@ -207,8 +207,88 @@ SOCKET connectToAddress(const char *const addr, const int AddressFamily, int_fas
 	return s;
 }
 
+// fix for lame tomato toolchain
+#	if !defined(IPV6_V6ONLY) && defined(__linux__)
+#	define IPV6_V6ONLY (26)
+#	endif // !defined(IPV6_V6ONLY) && defined(__linux__)
+
 
 #ifndef NO_SOCKETS
+#ifdef SIMPLE_SOCKETS
+
+static int_fast8_t allowSocketReuse(SOCKET s)
+{
+#	if !defined(_WIN32) && !defined(__CYGWIN__)
+	BOOL socketOption = TRUE;
+#	else // _WIN32
+	BOOL socketOption = FALSE;
+#	endif // _WIN32
+
+	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (sockopt_t)&socketOption, sizeof(socketOption)))
+	{
+#		ifdef _PEDANTIC
+		printerrorf("Warning: %s does not support socket option SO_REUSEADDR: %s\n", ipstr, vlmcsd_strerror(socket_errno));
+#		endif // _PEDANTIC
+	}
+
+	return 0;
+}
+
+
+int listenOnAllAddresses()
+{
+	uint32_t port_listen;
+
+	if (!stringToInt(defaultport, 1, 65535, &port_listen))
+	{
+		printerrorf("Fatal: Port must be numeric between 1 and 65535.\n");
+		exit(!0);
+	}
+
+	struct sockaddr_in6 addr;
+	memset(&addr, 0, sizeof(addr));
+	addr.sin6_family = AF_INET6;
+	addr.sin6_port = BE16((uint16_t)port_listen);
+	addr.sin6_addr = in6addr_any;
+	BOOL v6only = FALSE;
+
+	s_server = socket(AF_INET6, SOCK_STREAM, 0);
+
+	if (s_server == INVALID_SOCKET
+			|| allowSocketReuse(s_server)
+			|| setsockopt(s_server, IPPROTO_IPV6, IPV6_V6ONLY, (sockopt_t)&v6only, sizeof(v6only))
+			|| bind(s_server, (struct sockaddr *)&addr, sizeof(addr))
+			|| listen(s_server, SOMAXCONN) )
+	{
+		socketclose(s_server);
+		struct sockaddr_in addr = {
+				.sin_family = AF_INET,
+				.sin_port   = BE16((uint16_t)port_listen),
+		};
+
+		addr.sin_addr.s_addr = BE32(INADDR_ANY);
+		s_server = socket(AF_INET, SOCK_STREAM, 0);
+
+		if ( s_server == INVALID_SOCKET
+				|| allowSocketReuse(s_server)
+				|| bind(s_server, (struct sockaddr *)&addr, sizeof(addr))
+				|| listen(s_server, SOMAXCONN) )
+		{
+			int error = socket_errno;
+			printerrorf("Fatal: Cannot bind to TCP port %u: %s\n", port_listen, vlmcsd_strerror(error));
+			return error;
+		}
+	}
+
+	#ifndef NO_LOG
+	logger("Listening on TCP port %u\n", port_listen);
+	#endif // NO_LOG
+
+	return 0;
+}
+
+#else // !SIMPLE_SOCKETS
+
 
 // Create a Listening socket for addrinfo sa and return socket s
 // szHost and szPort are for logging only
@@ -249,20 +329,67 @@ static int listenOnAddress(const struct addrinfo *const ai, SOCKET *s)
 
 	BOOL socketOption = TRUE;
 
-	// fix for lame tomato toolchain
-#	ifndef IPV6_V6ONLY
-#	ifdef __linux__
-#	define IPV6_V6ONLY (26)
-#	endif // __linux__
-#	endif // IPV6_V6ONLY
-
 #	ifdef IPV6_V6ONLY
-	if (ai->ai_family == AF_INET6) setsockopt(*s, IPPROTO_IPV6, IPV6_V6ONLY, (sockopt_t)&socketOption, sizeof(socketOption));
+	if (ai->ai_family == AF_INET6 && setsockopt(*s, IPPROTO_IPV6, IPV6_V6ONLY, (sockopt_t)&socketOption, sizeof(socketOption)))
+	{
+#		ifdef _PEDANTIC
+#		if defined(_WIN32) || defined(__CYGWIN__)
+//		if (IsWindowsVistaOrGreater()) //Doesn't work with older version of MingW32-w64 toolchain
+	    if ((GetVersion() & 0xff) > 5)
+#		endif // _WIN32
+		printerrorf("Warning: %s does not support socket option IPV6_V6ONLY: %s\n", ipstr, vlmcsd_strerror(socket_errno));
+#		endif // _PEDANTIC
+	}
 #	endif
 
 #	ifndef _WIN32
-	setsockopt(*s, SOL_SOCKET, SO_REUSEADDR, (sockopt_t)&socketOption, sizeof(socketOption));
+	if (setsockopt(*s, SOL_SOCKET, SO_REUSEADDR, (sockopt_t)&socketOption, sizeof(socketOption)))
+	{
+#		ifdef _PEDANTIC
+		printerrorf("Warning: %s does not support socket option SO_REUSEADDR: %s\n", ipstr, vlmcsd_strerror(socket_errno));
+#		endif // _PEDANTIC
+	}
+#	endif // _WIN32
+
+#	if HAVE_FREEBIND
+#	if (defined(IP_NONLOCALOK) || __FreeBSD_kernel__ || __FreeBSD__) && !defined(IPV6_BINDANY)
+#	define IPV6_BINDANY 64
+#	endif // (defined(IP_NONLOCALOK) || __FreeBSD_kernel__ || __FreeBSD__) && !defined(IPV6_BINDANY)
+
+	if (freebind)
+	{
+#		if defined(IP_FREEBIND) // Linux
+		if (setsockopt(*s, IPPROTO_IP, IP_FREEBIND, (sockopt_t)&socketOption, sizeof(socketOption)))
+		{
+			printerrorf("Warning: Cannot use FREEBIND on %s: %s\n", ipstr, vlmcsd_strerror(socket_errno));
+		}
+#		endif // defined(IP_FREEBIND)
+
+#		if defined(IP_BINDANY) // FreeBSD IPv4
+		if (ai->ai_family == AF_INET && setsockopt(*s, IPPROTO_IP, IP_BINDANY, (sockopt_t)&socketOption, sizeof(socketOption)))
+		{
+			printerrorf("Warning: Cannot use BINDANY on %s: %s\n", ipstr, vlmcsd_strerror(socket_errno));
+		}
+#		endif // defined(IP_BINDANY)
+
+#		if defined(IPV6_BINDANY) // FreeBSD IPv6
+		if (ai->ai_family == AF_INET6 && setsockopt(*s, IPPROTO_IP, IPV6_BINDANY, (sockopt_t)&socketOption, sizeof(socketOption)))
+		{
+#			ifdef _PEDANTIC // FreeBSD defines the symbol but doesn't have BINDANY in IPv6 (Kame stack doesn't have it)
+			printerrorf("Warning: Cannot use BINDANY on %s: %s\n", ipstr, vlmcsd_strerror(socket_errno));
 #			endif
+		}
+#		endif // defined(IPV6_BINDANY)
+
+#		if defined(IP_NONLOCALOK) && !defined(IP_BINDANY) // FreeBSD with GNU userspace IPv4
+		if (ai->ai_family == AF_INET && setsockopt(*s, IPPROTO_IP, IP_NONLOCALOK, (sockopt_t)&socketOption, sizeof(socketOption)))
+		{
+			printerrorf("Warning: Cannot use BINDANY on %s: %s\n", ipstr, vlmcsd_strerror(socket_errno));
+		}
+#		endif // defined(IP_NONLOCALOK) && !defined(IP_BINDANY)
+	}
+
+#	endif // HAVE_FREEBIND
 
 	if (bind(*s, ai->ai_addr, ai->ai_addrlen) || listen(*s, SOMAXCONN))
 	{
@@ -279,7 +406,6 @@ static int listenOnAddress(const struct addrinfo *const ai, SOCKET *s)
 	return 0;
 }
 
-
 // Adds a listening socket for an address string,
 // e.g. 127.0.0.1:1688 or [2001:db8:dead:beef::1]:1688
 BOOL addListeningSocket(const char *const addr)
@@ -366,10 +492,18 @@ static SOCKET network_accept_any()
     else
         return accept(sock, NULL, NULL);
 }
+#endif // !SIMPLE_SOCKETS
 
 
 void closeAllListeningSockets()
 {
+#	ifdef SIMPLE_SOCKETS
+
+	shutdown(s_server, VLMCSD_SHUT_RDWR);
+	socketclose(s_server);
+
+#	else // !SIMPLE_SOCKETS
+
 	int i;
 
 	for (i = 0; i < numsockets; i++)
@@ -377,6 +511,8 @@ void closeAllListeningSockets()
 		shutdown(SocketList[i], VLMCSD_SHUT_RDWR);
 		socketclose(SocketList[i]);
 	}
+
+	#endif // !SIMPLE_SOCKETS
 }
 #endif // NO_SOCKETS
 
@@ -641,13 +777,16 @@ int runServer()
 		return 0;
 	}
 
-	// Standalone mode
 	for (;;)
 	{
 		int error;
 		SOCKET s_client;
 
+		#ifdef SIMPLE_SOCKETS
+		if ( (s_client = accept(s_server, NULL, NULL)) == INVALID_SOCKET )
+		#else // Standalone mode fully featured sockets
 		if ( (s_client = network_accept_any()) == INVALID_SOCKET )
+		#endif // Standalone mode fully featured sockets
 		{
 			error = socket_errno;
 

network.h

@@ -22,6 +22,9 @@ int_fast8_t sendrecv(SOCKET sock, BYTE *data, int len, int_fast8_t do_send);
 #ifndef NO_SOCKETS
 
 void closeAllListeningSockets();
+#ifdef SIMPLE_SOCKETS
+int listenOnAllAddresses();
+#endif // SIMPLE_SOCKETS
 BOOL addListeningSocket(const char *const addr);
 __pure int_fast8_t checkProtocolStack(const int addressfamily);
 

output.c

@@ -94,10 +94,17 @@ int logger(const char *const fmt, ...)
 // Output to stderr if it is available or to log otherwise (e.g. if running as daemon/service)
 void printerrorf(const char *const fmt, ...)
 {
+	int error = errno;
 	va_list arglist;
 
 	va_start(arglist, fmt);
 
+#	ifdef IS_LIBRARY
+
+	snprintf(ErrorMessage, MESSAGE_BUFFER_SIZE, fmt, arglist);
+
+#	else // !IS_LIBRARY
+
 #	ifndef NO_LOG
 #	ifdef _NTSERVICE
 	if (InetdMode || IsNTService)
@@ -107,12 +114,15 @@ void printerrorf(const char *const fmt, ...)
 		vlogger(fmt, arglist);
 	else
 #	endif //NO_LOG
+
+#	endif // IS_LIBRARY
 	{
 		vfprintf(stderr, fmt, arglist);
 		fflush(stderr);
 	}
 
 	va_end(arglist);
+	errno = error;
 }
 
 
@@ -130,10 +140,12 @@ int errorout(const char* fmt, ...)
 }
 
 
+#ifndef NO_VERBOSE_LOG
 static const char *LicenseStatusText[] =
 {
 	"Unlicensed", "Licensed", "OOB grace", "OOT grace", "Non-Genuine", "Notification", "Extended grace"
 };
+#endif // NO_VERBOSE_LOG
 
 
 void uuid2StringLE(const GUID *const guid, char *const string)
@@ -152,7 +164,7 @@ void uuid2StringLE(const GUID *const guid, char *const string)
 				);
 }
 
-
+#ifndef NO_VERBOSE_LOG
 void logRequestVerbose(const REQUEST *const Request, const PRINTFUNC p)
 {
 	char guidBuffer[GUID_STRING_LENGTH + 1];
@@ -208,7 +220,6 @@ void logRequestVerbose(const REQUEST *const Request, const PRINTFUNC p)
 	p("N count policy (minimum clients): %u\n", (uint32_t)LE32(Request->N_Policy));
 }
 
-
 void logResponseVerbose(const char *const ePID, const BYTE *const hwid, const RESPONSE *const response, const PRINTFUNC p)
 {
 	char guidBuffer[GUID_STRING_LENGTH + 1];
@@ -237,4 +248,374 @@ void logResponseVerbose(const char *const ePID, const BYTE *const hwid, const RE
 	p("Renewal interval policy         : %u\n", (uint32_t)LE32(response->VLRenewalInterval));
 	p("Activation interval policy      : %u\n", (uint32_t)LE32(response->VLActivationInterval));
 }
+#endif // NO_VERBOSE_LOG
 
+
+#ifndef NO_VERSION_INFORMATION
+void printPlatform()
+{
+	int testNumber = 0x1234;
+
+#	ifdef VLMCSD_COMPILER
+	printf
+	(
+		"Compiler: %s\n", VLMCSD_COMPILER
+#		ifdef __VERSION__
+		" " __VERSION__
+#		endif // __VERSION__
+	);
+#	endif // VLMCSD_COMPILER
+
+	printf
+	(
+		"Intended platform:%s %s\n", ""
+
+#		if __i386__ || _M_IX86
+		" Intel x86"
+#		endif
+
+#		if __x86_64__ || __amd64__ || _M_X64 || _M_AMD64
+		" Intel x86_64"
+#		endif
+
+#		if _M_ARM || __arm__
+		" ARM"
+#		endif
+
+#		if __thumb__
+		" thumb"
+#		endif
+
+#		if __aarch64__
+		" ARM64"
+#		endif
+
+#		if __hppa__
+		" HP/PA RISC"
+#		endif
+
+#		if __ia64__
+		" Intel Itanium"
+#		endif
+
+#		if __mips__
+		" MIPS"
+#		endif
+
+#		if defined(_MIPS_ARCH)
+		" " _MIPS_ARCH
+#		endif
+
+#		if __mips16
+		" mips16"
+#		endif
+
+#		if __mips_micromips
+		" micromips"
+#		endif
+
+#		if __ppc__ || __powerpc__
+		" PowerPC"
+#		endif
+
+#		if __powerpc64__ || __ppc64__
+		" PowerPC64"
+#		endif
+
+#		if __sparc__
+		" SPARC"
+#		endif
+
+#		if defined(__s390__) && !defined(__zarch__) && !defined(__s390x__)
+ 		" IBM S/390"
+#		endif
+
+#		if __zarch__ || __s390x__
+		" IBM z/Arch (S/390x)"
+#		endif
+
+#		if __m68k__
+		" Motorola 68k"
+#		endif
+
+#		if __ANDROID__
+		" Android"
+#		endif
+
+#		if __ANDROID_API__
+		" (API level " ANDROID_API_LEVEL ")"
+#		endif
+
+#		if __FreeBSD__ || __FreeBSD_kernel__
+		" FreeBSD"
+#		endif
+
+#		if __NetBSD__
+		" NetBSD"
+#		endif
+
+#		if __OpenBSD__
+		" OpenBSD"
+#		endif
+
+#		if __DragonFly__
+		" DragonFly BSD"
+#		endif
+
+#		if defined(__CYGWIN__) && !defined(_WIN64)
+		" Cygwin32"
+#		endif
+
+#		if defined(__CYGWIN__) && defined(_WIN64)
+		" Cygwin64"
+#		endif
+
+#		if __GNU__
+		" GNU"
+#		endif
+
+#		if __gnu_hurd__
+		" Hurd"
+#		endif
+
+#		if __MACH__
+		" Mach"
+#		endif
+
+#		if __linux__
+		" Linux"
+#		endif
+
+#		if __APPLE__ && __MACH__
+		" Darwin"
+#		endif
+
+#		if  __minix__
+		" Minix"
+#		endif
+
+#		if __QNX__
+		" QNX"
+#		endif
+
+#		if __svr4__ || __SVR4
+		" SYSV R4"
+#		endif	
+
+#		if (defined(__sun__) || defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
+		" Solaris"
+#		endif
+
+#		if (defined(__sun__) || defined(sun) || defined(__sun)) && !defined(__SVR4) && !defined(__svr4__)
+		" SunOS"
+#		endif
+
+#		if defined(_WIN32) && !defined(_WIN64)
+		" Windows32"
+#		endif
+
+#		if defined(_WIN32) && defined(_WIN64)
+		" Windows64"
+#		endif
+
+#		if __MVS__ || __TOS_MVS__
+		" z/OS"
+#		endif
+
+#		if defined(__GLIBC__) && !defined(__UCLIBC__)
+		" glibc"
+#		endif
+
+#		if __UCLIBC__
+		" uclibc"
+#		endif
+
+#		if defined(__linux__) && !defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__ANDROID__) && !defined(__BIONIC__)
+		" musl"
+#		endif
+
+//#		if _MIPSEL || __MIPSEL__ || __ARMEL__ || __THUMBEL__
+//		" little-endian"
+//#		endif
+//
+//#		if _MIPSEB || __MIPSEB__ || __ARMEB__ || __THUMBEB__
+//		" big-endian"
+//#		endif
+
+#		if __PIE__ || __pie__
+		" PIE"
+#		endif
+		,
+		*((uint8_t*)&testNumber) == 0x34 ? "little-endian" : "big-endian"
+	);
+
+}
+
+
+void printCommonFlags()
+{
+	printf
+	(
+		"Common flags:%s\n",""
+
+#		ifdef NO_EXTENDED_PRODUCT_LIST
+		" NO_EXTENDED_PRODUCT_LIST"
+#		endif // NO_EXTENDED_PRODUCT_LIST
+
+#		ifdef NO_BASIC_PRODUCT_LIST
+		" NO_BASIC_PRODUCT_LIST"
+#		endif // NO_BASIC_PRODUCT_LIST
+
+#		ifdef USE_MSRPC
+		" USE_MSRPC"
+#		endif // USE_MSRPC
+
+#		ifdef _CRYPTO_OPENSSL
+		" _CRYPTO_OPENSSL"
+#		endif // _CRYPTO_OPENSSL
+
+#		ifdef _CRYPTO_POLARSSL
+		" _CRYPTO_POLARSSL"
+#		endif // _CRYPTO_POLARSSL
+
+#		ifdef _CRYPTO_WINDOWS
+		" _CRYPTO_WINDOWS"
+#		endif // _CRYPTO_WINDOWS
+
+#		if defined(_OPENSSL_SOFTWARE) && defined(_CRYPTO_OPENSSL)
+		" _OPENSSL_SOFTWARE"
+#		endif // _OPENSSL_SOFTWARE
+
+#		if defined(_USE_AES_FROM_OPENSSL) && defined(_CRYPTO_OPENSSL)
+		" _USE_AES_FROM_OPENSSL"
+#		endif // _USE_AES_FROM_OPENSSL
+
+#		if defined(_OPENSSL_NO_HMAC) && defined(_CRYPTO_OPENSSL)
+		" OPENSSL_HMAC=0"
+#		endif // _OPENSSL_NO_HMAC
+
+#		ifdef _PEDANTIC
+		" _PEDANTIC"
+#		endif // _PEDANTIC
+
+#		ifdef INCLUDE_BETAS
+		" INCLUDE_BETAS"
+#		endif // INCLUDE_BETAS
+
+#		if __minix__ || defined(NO_TIMEOUT)
+		" NO_TIMEOUT=1"
+#		endif // __minix__ || defined(NO_TIMEOUT)
+	);
+}
+
+
+void printClientFlags()
+{
+	printf
+	(
+		"vlmcs flags:%s\n",""
+
+#		ifdef NO_DNS
+		" NO_DNS=1"
+#		endif
+
+#		if !defined(NO_DNS)
+#		if defined(DNS_PARSER_INTERNAL) && !defined(_WIN32)
+		" DNS_PARSER=internal"
+#		else // !defined(DNS_PARSER_INTERNAL) || defined(_WIN32)
+		" DNS_PARSER=OS"
+#		endif // !defined(DNS_PARSER_INTERNAL) || defined(_WIN32)
+#		endif // !defined(NO_DNS)
+
+#		if defined(DISPLAY_WIDTH)
+		" TERMINAL_WIDTH=" DISPLAY_WIDTH
+#		endif
+	);
+}
+
+
+void printServerFlags()
+{
+	printf
+	(
+		"vlmcsd flags:%s\n",""
+
+#		ifdef NO_LOG
+		" NO_LOG"
+#		endif // NO_LOG
+
+#		ifdef NO_RANDOM_EPID
+		" NO_RANDOM_EPID"
+#		endif // NO_RANDOM_EPID
+
+#		ifdef NO_INI_FILE
+		" NO_INI_FILE"
+#		endif // NO_INI_FILE
+
+#		if !defined(NO_INI_FILE) && defined(INI_FILE)
+		" INI=" INI_FILE
+#		endif // !defined(NO_INI_FILE)
+
+#		ifdef NO_PID_FILE
+		" NO_PID_FILE"
+#		endif // NO_PID_FILE
+
+#		ifdef NO_USER_SWITCH
+		" NO_USER_SWITCH"
+#		endif // NO_USER_SWITCH
+
+#		ifdef NO_HELP
+		" NO_HELP"
+#		endif // NO_HELP
+
+#		ifdef NO_CUSTOM_INTERVALS
+		" NO_CUSTOM_INTERVALS"
+#		endif // NO_CUSTOM_INTERVALS
+
+#		ifdef NO_SOCKETS
+		" NO_SOCKETS"
+#		endif // NO_SOCKETS
+
+#		ifdef NO_CL_PIDS
+		" NO_CL_PIDS"
+#		endif // NO_CL_PIDS
+
+#		ifdef NO_LIMIT
+		" NO_LIMIT"
+#		endif // NO_LIMIT
+
+#		ifdef NO_SIGHUP
+		" NO_SIGHUP"
+#		endif // NO_SIGHUP
+
+#		ifdef NO_PROCFS
+		" NOPROCFS=1"
+#		endif // NO_PROCFS
+
+#		ifdef USE_THREADS
+		" THREADS=1"
+#		endif // USE_THREADS
+
+#		ifdef USE_AUXV
+		" AUXV=1"
+#		endif // USE_AUXV
+
+#		if defined(CHILD_HANDLER) || __minix__
+		" CHILD_HANDLER=1"
+#		endif // defined(CHILD_HANDLER) || __minix__
+
+#		if !defined(NO_SOCKETS) && defined(SIMPLE_SOCKETS)
+		" SIMPLE_SOCKETS"
+#		endif // !defined(NO_SOCKETS) && defined(SIMPLE_SOCKETS)
+
+#		if (_WIN32 || __CYGWIN__) && (!defined(USE_MSRPC) || defined(SUPPORT_WINE))
+		" SUPPORT_WINE"
+#		endif // (_WIN32 || __CYGWIN__) && (!defined(USE_MSRPC) || defined(SUPPORT_WINE))
+
+#		if !HAVE_FREEBIND
+		" NO_FREEBIND"
+#		endif //!HAVE_FREEBIND
+
+	);
+}
+#endif // NO_VERSION_INFORMATION

output.h

@@ -6,6 +6,7 @@
 #endif // CONFIG
 #include CONFIG
 
+#include <errno.h>
 #include "kms.h"
 
 typedef int (*PRINTFUNC)(const char *const fmt, ...);
@@ -15,6 +16,13 @@ int errorout(const char* fmt, ...);
 void logRequestVerbose(const REQUEST *const Request, const PRINTFUNC p);
 void logResponseVerbose(const char *const ePID, const BYTE *const hwid, const RESPONSE *const response, const PRINTFUNC p);
 
+#ifndef NO_VERSION_INFORMATION
+void printPlatform();
+void printCommonFlags();
+void printServerFlags();
+void printClientFlags();
+#endif // NO_VERSION_INFORMATION
+
 #ifndef NO_LOG
 int logger(const char *const fmt, ...);
 #endif //NO_LOG

shared_globals.c

@@ -51,10 +51,14 @@ int_fast8_t logverbose = 0;
 #endif // NO_LOG
 
 #ifndef NO_SOCKETS
+#ifndef _WIN32
 int_fast8_t nodaemon = 0;
+#endif // _WIN32
 int_fast8_t InetdMode = 0;
 #else
+#ifndef _WIN32
 int_fast8_t nodaemon = 1;
+#endif // _WIN32
 int_fast8_t InetdMode = 1;
 #endif
 
@@ -64,8 +68,12 @@ uint16_t Lcid = 0;
 #endif
 
 #ifndef NO_SOCKETS
+#ifdef SIMPLE_SOCKETS
+SOCKET s_server;
+#else
 SOCKET *SocketList;
 int numsockets = 0;
+#endif
 
 #if !defined(NO_LIMIT) && !__minix__
 #ifndef _WIN32 // Posix
@@ -92,6 +100,10 @@ CRITICAL_SECTION logmutex;
 #endif // USE_THREADS
 #endif // NO_LOG
 
+#if HAVE_FREEBIND
+int_fast8_t freebind = FALSE;
+#endif // HAVE_FREEBIND
+
 
 
 

shared_globals.h

@@ -74,10 +74,16 @@ extern const char *const Version;
 #define UINT_MAX 4294967295
 #endif
 
+#ifdef IS_LIBRARY
+#define MESSAGE_BUFFER_SIZE 256
+EXTERNC __declspec(EXTERNAL) extern char ErrorMessage[MESSAGE_BUFFER_SIZE];
+#endif // IS_LIBRARY
 
 extern int global_argc, multi_argc;
 extern CARGV global_argv, multi_argv;
+#ifndef _WIN32
 extern int_fast8_t nodaemon;
+#endif // _WIN32
 extern DWORD VLActivationInterval;
 extern DWORD VLRenewalInterval;
 extern int_fast8_t DisconnectImmediately;
@@ -122,8 +128,12 @@ extern uint16_t Lcid;
 #endif
 
 #if !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#if defined(SIMPLE_SOCKETS)
+extern SOCKET s_server;
+#else // !defined(SIMPLE_SOCKETS)
 extern SOCKET *SocketList;
 extern int numsockets;
+#endif // !defined(SIMPLE_SOCKETS)
 
 #if !defined(NO_LIMIT) && !__minix__
 
@@ -152,5 +162,9 @@ extern CRITICAL_SECTION logmutex;
 #endif // USE_THREADS
 #endif // NO_LOG
 
+#if HAVE_FREEBIND
+extern int_fast8_t freebind;
+#endif // HAVE_FREEBIND
+
 
 #endif // INCLUDED_SHARED_GLOBALS_H

strip_binaries

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+find binaries -xdev -name 'vlmcs*' ! -name '*-NetBSD-*' ! -name '*-Windows-*' ! -name '*-cygwin-*' ! -name '*-MacOSX-*' ! -name '*-iOS-*' -exec sstrip -z {} \;

types.h

@@ -6,13 +6,41 @@
 #endif // CONFIG
 #include CONFIG
 
+#define ANDROID_API_LEVEL ANDROID_HELPER1(__ANDROID_API__)
+#define ANDROID_HELPER1(s) ANDROID_HELPER2(s)
+#define ANDROID_HELPER2(s) #s
+
+#if !defined(_WIN32) && !__CYGWIN__
+#define __declspec(x) __attribute__((__visibility__("default")))
+#endif
+
+#if !defined(EXTERNAL)
+#define EXTERNAL dllimport
+#endif
+
+#ifdef __cplusplus
+#define EXTERNC extern "C"
+#else
+#define EXTERNC
+#endif
+
 #include <stdlib.h>
 #include <limits.h>
 #include <stdint.h>
 
-//#ifdef __sun__
+#ifdef __ANDROID__
-//#include <alloca.h>
+#include <android/api-level.h>
-//#endif
+#endif // __ANDROID__
+
+#ifndef _WIN32
+#include <netinet/in.h>
+#endif // _WIN32
+
+
+#if (IP_BINDANY || IP_FREEBIND || IPV6_BINDANY || IP_NONLOCALOK) && !defined(NO_FREEBIND) && !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
+#define HAVE_FREEBIND 1
+#endif
+
 #ifndef alloca
 #ifdef __GNUC__
 #define alloca(x) __builtin_alloca(x)
@@ -156,6 +184,7 @@ typedef uint8_t ProdListIndex_t;
 #endif // USE_MSRPC
 
 #include <windows.h>
+//#include <VersionHelpers.h>
 
 
 typedef char* sockopt_t;
@@ -184,6 +213,7 @@ typedef char* sockopt_t;
 #elif defined(__CYGWIN__)
 #include <windows.h>
 
+
 // Resolve conflicts between OpenSSL and MS Crypto API
 #ifdef _CRYPTO_OPENSSL
 #undef OCSP_RESPONSE

vlmcs.1

@@ -1,5 +1,5 @@
 .mso www.tmac
-.TH VLMCS 1 "February 2015" "Hotbird64" "KMS Activation Manual"
+.TH VLMCS 1 "May 2016" "Hotbird64" "KMS Activation Manual"
 .LO 1
 
 .SH NAME
@@ -11,7 +11,7 @@ vlmcs \- a client for testing and/or charging KMS servers
 \fItarget\fR can be one of the following:
 .RS
 .PP
-\fIhostname\fR|\fIipaddress\fR[:\fItcp-port\fR] or to query a specific KMS server (example: vlmcs kms.example.com:1688).
+\fIhostname\fR|\fIipaddress\fR[:\fItcp-port\fR] to query a specific KMS server (example: vlmcs kms.example.com:1688).
 .br
 \fR.\fIdomain\fR to automatically detect KMS servers via DNS for \fIdomain\fR (example: vlmcs .example.com). Please note the dot before \fIdomain\fR.
 .br
@@ -44,6 +44,9 @@ can also be used to "charge" a KMS server. A Microsoft KMS server sends correct
 .IP "\fB-h\fR or \fB-?"
 Show help.
 
+.IP "\fB-V\fR"
+Displays extended version information. This includes the compiler used to build vlmcs, the intended platform and flags (compile time options) to build vlmcs. If you have the source code of vlmcsd, you can type \fBmake help\fR (or \fBgmake help\fR on systems that do not use the GNU version of \fBmake\fR(1) by default) to see the meaning of those flags.
+
 .IP \fB-x
 Show valid
 .IR application s

vlmcs.1.dos.txt

@@ -11,7 +11,7 @@ SYNOPSIS
 
        target can be one of the following:
 
-              hostname|ipaddress[:tcp-port]  or to query a specific KMS server
+              hostname|ipaddress[:tcp-port]  to  query  a  specific KMS server
               (example: vlmcs kms.example.com:1688).
               .domain to automatically detect KMS servers via DNS  for  domain
               (example:  vlmcs  .example.com).  Please  note  the  dot  before
@@ -52,6 +52,14 @@ OPTIONS
               Show help.
 
 
+       -V     Displays extended version information. This  includes  the  com‐
+              piler used to build vlmcs, the intended platform and flags (com‐
+              pile time options) to build vlmcs. If you have the  source  code
+              of vlmcsd, you can type make help (or gmake help on systems that
+              do not use the GNU version of make(1) by  default)  to  see  the
+              meaning of those flags.
+
+
        -x     Show valid applications that can be used with -l.
 
 
@@ -302,4 +310,4 @@ SEE ALSO
 
 
 
-Hotbird64                        February 2015                        VLMCS(1)
+Hotbird64                          May 2016                           VLMCS(1)

vlmcs.1.html

@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Tue Mar  8 00:06:21 2016 -->
+<!-- CreationDate: Sun Jun  5 14:31:10 2016 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -55,7 +55,7 @@ can be one of the following:</p>
 
 
 <p style="margin-left:22%; margin-top: 1em"><i>hostname</i>|<i>ipaddress</i>[:<i>tcp-port</i>]
-or to query a specific KMS server (example: vlmcs
+to query a specific KMS server (example: vlmcs
 kms.example.com:1688). <br>
 .<i>domain</i> to automatically detect KMS servers via DNS
 for <i>domain</i> (example: vlmcs .example.com). Please note
@@ -121,6 +121,23 @@ server in a home environment.</p>
 <td width="3%">
 
 
+<p><b>-V</b></p></td>
+<td width="8%"></td>
+<td width="78%">
+
+
+<p>Displays extended version information. This includes the
+compiler used to build vlmcs, the intended platform and
+flags (compile time options) to build vlmcs. If you have the
+source code of vlmcsd, you can type <b>make help</b> (or
+<b>gmake help</b> on systems that do not use the GNU version
+of <b>make</b>(1) by default) to see the meaning of those
+flags.</p> </td></tr>
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="3%">
+
+
 <p><b>-x</b></p></td>
 <td width="8%"></td>
 <td width="78%">

vlmcs.1.unix.txt

@@ -11,7 +11,7 @@ SYNOPSIS
 
        target can be one of the following:
 
-              hostname|ipaddress[:tcp-port]  or to query a specific KMS server
+              hostname|ipaddress[:tcp-port]  to  query  a  specific KMS server
               (example: vlmcs kms.example.com:1688).
               .domain to automatically detect KMS servers via DNS  for  domain
               (example:  vlmcs  .example.com).  Please  note  the  dot  before
@@ -52,6 +52,14 @@ OPTIONS
               Show help.
 
 
+       -V     Displays extended version information. This  includes  the  com‐
+              piler used to build vlmcs, the intended platform and flags (com‐
+              pile time options) to build vlmcs. If you have the  source  code
+              of vlmcsd, you can type make help (or gmake help on systems that
+              do not use the GNU version of make(1) by  default)  to  see  the
+              meaning of those flags.
+
+
        -x     Show valid applications that can be used with -l.
 
 
@@ -302,4 +310,4 @@ SEE ALSO
 
 
 
-Hotbird64                        February 2015                        VLMCS(1)
+Hotbird64                          May 2016                           VLMCS(1)

vlmcs.c

@@ -46,7 +46,10 @@ static void CreateRequestBase(REQUEST *Request);
 
 
 // KMS Parameters
+#ifndef NO_VERBOSE_LOG
 static int_fast8_t verbose = FALSE;
+#endif
+
 static int_fast8_t VMInfo = FALSE;
 static int_fast8_t dnsnames = TRUE;
 static int FixedRequests = 0;
@@ -160,7 +163,9 @@ __noreturn static void clientUsage(const char* const programName)
 
 		"Options:\n\n"
 
+#		ifndef NO_VERBOSE_LOG
 		"  -v Be verbose\n"
+#		endif
 		"  -l <app>\n"
 		"  -4 Force V4 protocol\n"
 		"  -5 Force V5 protocol\n"
@@ -170,7 +175,8 @@ __noreturn static void clientUsage(const char* const programName)
 #		endif // USE_MSRPC
 		"  -e Show some valid examples\n"
 		"  -x Show valid Apps\n"
-		"  -d no DNS names, use Netbios names (no effect if -w is used)\n\n"
+		"  -d no DNS names, use Netbios names (no effect if -w is used)\n"
+		"  -V show version information and exit\n\n"
 
 		"Advanced options:\n\n"
 
@@ -420,7 +426,7 @@ static BOOL findLicensePackByName(const char* const name, LicensePack* const lp)
 	#endif // Both Lists are available
 }
 
-static const char* const client_optstring = "+N:B:i:l:a:s:k:c:w:r:n:t:g:G:o:pPTv456mexd";
+static const char* const client_optstring = "+N:B:i:l:a:s:k:c:w:r:n:t:g:G:o:pPTv456mexdV";
 
 
 //First pass. We handle only "-l". Since -a -k -s -4 -5 and -6 are exceptions to -l, we process -l first
@@ -584,11 +590,15 @@ static void parseCommandLinePass2(const char *const programName, const int argc,
 				dnsnames = FALSE;
 				break;
 
+#			ifndef NO_VERBOSE_LOG
+
 			case 'v': // Be verbose
 
 				verbose = TRUE;
 				break;
 
+#			endif // NO_VERBOSE_LOG
+
 			case 'm': // Pretend to be a virtual machine
 
 				VMInfo = TRUE;
@@ -623,6 +633,21 @@ static void parseCommandLinePass2(const char *const programName, const int argc,
 				incompatibleOptions |= VLMCS_OPTION_NO_GRAB_INI;
 				break;
 
+#			ifndef NO_VERSION_INFORMATION
+
+			case 'V':
+#				if defined(__s390__) && !defined(__zarch__) && !defined(__s390x__)
+				printf("vlmcs %s %i-bit\n", Version, sizeof(void*) == 4 ? 31 : (int)sizeof(void*) << 3);
+#				else
+				printf("vlmcs %s %i-bit\n", Version, (int)sizeof(void*) << 3);
+#				endif // defined(__s390__) && !defined(__zarch__) && !defined(__s390x__)
+				printPlatform();
+				printCommonFlags();
+				printClientFlags();
+				exit(0);
+
+#			endif // NO_VERSION_INFORMATION
+
 			default:
 				clientUsage(programName);
 	}
@@ -651,8 +676,10 @@ static void checkRpcLevel(const REQUEST* request, RESPONSE* response)
 	if (UseRpcBTFN && UseRpcNDR64 && RpcFlags.HasNDR64 && !RpcFlags.HasBTFN)
 		errorout("\nWARNING: Server's RPC protocol has NDR64 but no BTFN.\n");
 
+#	ifndef NO_BASIC_PRODUCT_LIST
 	if (!IsEqualGuidLEHE(&request->KMSID, &ProductList[15].guid) && UseRpcBTFN && !RpcFlags.HasBTFN)
 		errorout("\nWARNING: A server with pre-Vista RPC activated a product other than Office 2010.\n");
+#	endif // NO_BASIC_PRODUCT_LIST
 }
 #endif // USE_MSRPC
 
@@ -690,7 +717,9 @@ static void displayResponse(const RESPONSE_RESULT result, const REQUEST* request
 	}
 
 	// Read KMSPID from Response
+#	ifndef NO_VERBOSE_LOG
 	if (!verbose)
+#	endif // NO_VERBOSE_LOG
 	{
 		printf(" -> %s", ePID);
 
@@ -705,6 +734,7 @@ static void displayResponse(const RESPONSE_RESULT result, const REQUEST* request
 
 		printf("\n");
 	}
+#	ifndef NO_VERBOSE_LOG
 	else
 	{
 		printf(
@@ -715,6 +745,7 @@ static void displayResponse(const RESPONSE_RESULT result, const REQUEST* request
 		logResponseVerbose(ePID, hwid, response, &printf);
 		printf("\n");
 	}
+#	endif // NO_VERBOSE_LOG
 }
 
 
@@ -760,6 +791,7 @@ static void connectRpc(RpcCtx *s)
 
 		if (!NoSrvRecordPriority) sortSrvRecords(serverlist, numServers);
 
+#		ifndef NO_VERBOSE_LOG
 		if (verbose /*&& !ServerListAlreadyPrinted*/)
 		{
 			for (i = 0; i < numServers; i++)
@@ -775,6 +807,7 @@ static void connectRpc(RpcCtx *s)
 			printf("\n");
 			//ServerListAlreadyPrinted = TRUE;
 		}
+#		endif // NO_VERBOSE_LOG
 	}
 	else // Just use the server supplied on the command line
 	{
@@ -794,16 +827,21 @@ static void connectRpc(RpcCtx *s)
 
 		if (*s == INVALID_RPCCTX) continue;
 
-		if (verbose)
+#		ifndef NO_VERBOSE_LOG
-			printf("\nPerforming RPC bind ...\n");
+		if (verbose) printf("\nPerforming RPC bind ...\n");
 
 		if (rpcBindClient(*s, verbose))
+#		else
+		if (rpcBindClient(*s, FALSE))
+#		endif
 		{
 			errorout("Warning: Could not bind RPC\n");
 			continue;
 		}
 
+#		ifndef NO_VERBOSE_LOG
 		if (verbose) printf("... successful\n");
+#		endif
 
 		return;
 	}
@@ -1298,13 +1336,14 @@ static void CreateRequestBase(REQUEST *Request)
 		Request->WorkstationName[size] = 0;
 	}
 
-	//Show Details
+#	ifndef NO_VERBOSE_LOG
 	if (verbose)
 	{
 		printf("\nRequest Parameters\n==================\n\n");
 		logRequestVerbose(Request, &printf);
 		printf("\n");
 	}
+#	endif // NO_VERBOSE_LOG
 }
 
 

vlmcsd.7

@@ -1,4 +1,4 @@
-.TH VLMCSD 7 "June 2014" "Hotbird64" "KMS Activation Manual"
+.TH VLMCSD 7 "March 2016" "Hotbird64" "KMS Activation Manual"
 
 .SH NAME
 vlmcsd\ \-\ a guide to KMS activation using vlmcsd
@@ -41,6 +41,14 @@ Office 2013: http://technet.microsoft.com/en-us/library/dn385360.aspx
 .PP
 These lists only include products that Microsoft sells to corporations via volume license contracts. For Windows there are inofficial GVLKs that work with consumer-only versions of Windows. Here is a list:
 .PP
+TX9XD\-98N7V\-6WMQ6\-BX7FG\-H8Q99 - Windows 10 Home
+.br
+3KHY7\-WNT83\-DGQKR\-F7HPR\-844BM - Windows 10 Home N
+.br
+7HNRX\-D7KGG\-3K4RQ\-4WPJ4\-YTDFH - Windows 10 Home Single Language
+.br
+PVMJN\-6DFY6\-9CCP6\-7BKTT\-D3WVR - Windows 10 Home Country Specific
+.br
 789NJ\-TQK6T\-6XTH8\-J39CJ\-J8D3P - Windows 8.1 Professional with Media Center
 .br
 M9Q9P\-WNJJT\-6PXPY\-DWX8H\-6XWKK - Windows 8.1 Core

vlmcsd.7.dos.txt

@@ -76,6 +76,10 @@ DESCRIPTION
        via  volume  license  contracts. For Windows there are inofficial GVLKs
        that work with consumer-only versions of Windows. Here is a list:
 
+       TX9XD-98N7V-6WMQ6-BX7FG-H8Q99 - Windows 10 Home
+       3KHY7-WNT83-DGQKR-F7HPR-844BM - Windows 10 Home N
+       7HNRX-D7KGG-3K4RQ-4WPJ4-YTDFH - Windows 10 Home Single Language
+       PVMJN-6DFY6-9CCP6-7BKTT-D3WVR - Windows 10 Home Country Specific
        789NJ-TQK6T-6XTH8-J39CJ-J8D3P - Windows  8.1  Professional  with  Media
        Center
        M9Q9P-WNJJT-6PXPY-DWX8H-6XWKK - Windows 8.1 Core
@@ -219,4 +223,4 @@ SEE ALSO
 
 
 
-Hotbird64                          June 2014                         VLMCSD(7)
+Hotbird64                         March 2016                         VLMCSD(7)

vlmcsd.7.html

@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Tue Mar  8 00:06:21 2016 -->
+<!-- CreationDate: Sun Jun  5 14:31:10 2016 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -169,8 +169,16 @@ inofficial GVLKs that work with consumer-only versions of
 Windows. Here is a list:</p>
 
 
-<p style="margin-left:11%; margin-top: 1em">789NJ&minus;TQK6T&minus;6XTH8&minus;J39CJ&minus;J8D3P
+<p style="margin-left:11%; margin-top: 1em">TX9XD&minus;98N7V&minus;6WMQ6&minus;BX7FG&minus;H8Q99
-- Windows 8.1 Professional with Media Center <br>
+- Windows 10 Home <br>
+3KHY7&minus;WNT83&minus;DGQKR&minus;F7HPR&minus;844BM -
+Windows 10 Home N <br>
+7HNRX&minus;D7KGG&minus;3K4RQ&minus;4WPJ4&minus;YTDFH -
+Windows 10 Home Single Language <br>
+PVMJN&minus;6DFY6&minus;9CCP6&minus;7BKTT&minus;D3WVR -
+Windows 10 Home Country Specific <br>
+789NJ&minus;TQK6T&minus;6XTH8&minus;J39CJ&minus;J8D3P -
+Windows 8.1 Professional with Media Center <br>
 M9Q9P&minus;WNJJT&minus;6PXPY&minus;DWX8H&minus;6XWKK -
 Windows 8.1 Core <br>
 7B9N3&minus;D94CG&minus;YTVHR&minus;QBPX3&minus;RJP64 -

vlmcsd.7.unix.txt

@@ -76,6 +76,10 @@ DESCRIPTION
        via  volume  license  contracts. For Windows there are inofficial GVLKs
        that work with consumer-only versions of Windows. Here is a list:
 
+       TX9XD-98N7V-6WMQ6-BX7FG-H8Q99 - Windows 10 Home
+       3KHY7-WNT83-DGQKR-F7HPR-844BM - Windows 10 Home N
+       7HNRX-D7KGG-3K4RQ-4WPJ4-YTDFH - Windows 10 Home Single Language
+       PVMJN-6DFY6-9CCP6-7BKTT-D3WVR - Windows 10 Home Country Specific
        789NJ-TQK6T-6XTH8-J39CJ-J8D3P - Windows  8.1  Professional  with  Media
        Center
        M9Q9P-WNJJT-6PXPY-DWX8H-6XWKK - Windows 8.1 Core
@@ -219,4 +223,4 @@ SEE ALSO
 
 
 
-Hotbird64                          June 2014                         VLMCSD(7)
+Hotbird64                         March 2016                         VLMCSD(7)

vlmcsd.8

@@ -1,5 +1,5 @@
 .mso www.tmac
-.TH VLMCSD 8 "September 2015" "Hotbird64" "KMS Activation Manual"
+.TH VLMCSD 8 "June 2016" "Hotbird64" "KMS Activation Manual"
 .LO 8
 
 .SH NAME
@@ -27,6 +27,9 @@ All options that do no require an argument may be combined with a single dash, f
 .IP "\fB-h\fR or \fB-?\fR"
 Displays help.
 
+.IP "\fB-V\fR"
+Displays extended version information. This includes the compiler used to build vlmcsd, the intended platform and flags (compile time options) to build vlmcsd. If you have the source code of vlmcsd, you can type \fBmake help\fR (or \fBgmake help\fR on systems that do not use the GNU version of \fBmake\fR(1) by default) to see the meaning of those flags.
+
 .IP "\fB-L\fR \fIipaddress\fR[:\fIport\fR]"
 Instructs vlmcsd to listen on \fIipaddress\fR with optional \fIport\fR (default 1688). You can use this option more than once. If you do not specify \fB-L\fR at least once, IP addresses 0.0.0.0 (IPv4) and :: (IPv6) are used. If the IP address contains colons (IPv6) you must enclose the IP address in brackets if you specify the optional port, e.g. [2001:db8::dead:beef]:1688.
 .PP
@@ -39,11 +42,8 @@ If you specify a link local IPv6 address (fe80::/10, usually starting with fe80:
 .IP "\fB-P\fR \fIport"
 Use TCP \fIport\fR for all subsequent \fB-L\fR statements that do not include an optional port. If you use \fB-P\fR and \fB-L\fR, \fB-P\fR must be specified before \fB-L\fR.
 
-.IP "\fB-4\fR and \fB-6\fR"
+.IP "\fB-F0\fR and \fB-F1\fR
-Used to control the use of IPv4 and IPv4 if you did not use -L. If you specify both \fB-4\fR and \fB-6\fR or none, vlmcsd uses both protocols. If you specify only one, that protocol will be used only. \fBThese options are deprecated and will be removed.\fR
+Allow (\fB-F1\fR) or disallow (\fB-F0\fR) binding to IP addresses that are currently not configured on your system. The default is \fB-F0\fR. \fB-F1\fR allows you to bind to an IP address that may be configured after you started \fBvlmcsd\fR. \fBvlmcsd\fR will listen on that address as soon as it becomes available. This feature is only available under Linux (IPv4 and IPv6) and FreeBSD (IPv4 only). FreeBSD allows this feature only for the root user (more correctly: processes that have the PRIV_NETINET_BINDANY privilege). Linux does not require a capability for this.
-
-.IP "\fB-I\fR"
-This option is deprecated and does nothing. It is provided for compatibility with svn681 and earlier versions only. It will be removed in a future release.
 
 .IP "\fB-t\fR \fIseconds\fR"
 Timeout the TCP connection with the client after \fIseconds\fR seconds. After sending an activation request. RPC keeps the TCP connection for a while. The default is 30 seconds. You may specify a shorter period to free ressources on your device faster. This is useful for devices with limited main memory or if you used \fB-m\fR to limit the concurrent clients that may request activation. Microsoft RPC clients disconnect after 30 seconds by default. Setting \fIseconds\fR to a greater value does not make much sense.
@@ -79,9 +79,6 @@ The native Windows version never daemonizes and always behaves as if \fB-D\fR ha
 .IP "\fB-e\fR"
 If specified, vlmcsd ignores \fB-l\fR and writes all logging output to \fBstdout\fR(3). This is mainly useful for testing and debugging and often combined with \fB-D\fR.
 
-.IP "\fB-f\fR"
-This flag combines \fB-D\fR and \fB-e\fR. So typing "vlmcsd -f" is identical to "vlmcsd -De". The purpose of \fB-f\fR is to provide compatibility with previous versions of vlmcsd. \fBThis option is deprecated and will be removed.\fR
-
 .IP "\fB-v\fR"
 Use verbose logging. Logs every parameter of the base request and the base response. It also logs the HWID of the KMS server if KMS protocol version 6 is used. This option is mainly for debugging purposes. It only has an effect if some form of logging is used. Thus \fB-v\fR does not make sense if not used with \fB-l\fR, \fB-e\fR or \fB-f\fR.
 

vlmcsd.8.dos.txt

@@ -52,6 +52,14 @@ OPTIONS
               Displays help.
 
 
+       -V     Displays  extended  version  information. This includes the com‐
+              piler used to build vlmcsd,  the  intended  platform  and  flags
+              (compile  time  options) to build vlmcsd. If you have the source
+              code of vlmcsd, you can type make help (or gmake help on systems
+              that  do  not  use the GNU version of make(1) by default) to see
+              the meaning of those flags.
+
+
        -L ipaddress[:port]
               Instructs vlmcsd to  listen  on  ipaddress  with  optional  port
               (default  1688).  You can use this option more than once. If you
@@ -82,16 +90,16 @@ OPTIONS
               ified before -L.
 
 
-       -4 and -6
+       -F0 and -F1
-              Used  to control the use of IPv4 and IPv4 if you did not use -L.
+              Allow (-F1) or disallow (-F0) binding to IP addresses  that  are
-              If you specify both -4 and -6 or none, vlmcsd uses  both  proto‐
+              currently not configured on your system. The default is -F0. -F1
-              cols.  If you specify only one, that protocol will be used only.
+              allows you to bind to an IP address that may be configured after
-              These options are deprecated and will be removed.
+              you  started  vlmcsd. vlmcsd will listen on that address as soon
-
+              as it becomes available. This feature is  only  available  under
-
+              Linux  (IPv4  and  IPv6) and FreeBSD (IPv4 only). FreeBSD allows
-       -I     This option is deprecated and does nothing. It is  provided  for
+              this feature only for the root user (more  correctly:  processes
-              compatibility  with svn681 and earlier versions only. It will be
+              that  have  the  PRIV_NETINET_BINDANY privilege). Linux does not
-              removed in a future release.
+              require a capability for this.
 
 
        -t seconds
@@ -181,12 +189,6 @@ OPTIONS
               often combined with -D.
 
 
-       -f     This flag combines -D and -e. So typing "vlmcsd -f" is identical
-              to "vlmcsd -De". The purpose of -f is to  provide  compatibility
-              with  previous versions of vlmcsd. This option is deprecated and
-              will be removed.
-
-
        -v     Use  verbose  logging.  Logs every parameter of the base request
               and the base response. It also logs the HWID of the  KMS  server
               if  KMS  protocol  version  6 is used. This option is mainly for
@@ -521,4 +523,4 @@ SEE ALSO
 
 
 
-Hotbird64                       September 2015                       VLMCSD(8)
+Hotbird64                          June 2016                         VLMCSD(8)

vlmcsd.8.html

@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Tue Mar  8 00:06:22 2016 -->
+<!-- CreationDate: Sun Jun  5 14:31:10 2016 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -112,6 +112,27 @@ is optional. Thus &quot;vlmcsd -r 2&quot; and &quot;vlmcsd
 
 <p style="margin-left:22%;">Displays help.</p>
 
+<table width="100%" border="0" rules="none" frame="void"
+       cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="3%">
+
+
+<p><b>-V</b></p></td>
+<td width="8%"></td>
+<td width="78%">
+
+
+<p>Displays extended version information. This includes the
+compiler used to build vlmcsd, the intended platform and
+flags (compile time options) to build vlmcsd. If you have
+the source code of vlmcsd, you can type <b>make help</b> (or
+<b>gmake help</b> on systems that do not use the GNU version
+of <b>make</b>(1) by default) to see the meaning of those
+flags.</p> </td></tr>
+</table>
+
 <p style="margin-left:11%;"><b>-L</b>
 <i>ipaddress</i>[:<i>port</i>]</p>
 
@@ -149,30 +170,19 @@ subsequent <b>-L</b> statements that do not include an
 optional port. If you use <b>-P</b> and <b>-L</b>, <b>-P</b>
 must be specified before <b>-L</b>.</p>
 
-<p style="margin-left:11%;"><b>-4</b> and <b>-6</b></p>
+<p style="margin-left:11%;"><b>-F0</b> and <b>-F1</b></p>
 
-<p style="margin-left:22%;">Used to control the use of IPv4
+<p style="margin-left:22%;">Allow (<b>-F1</b>) or disallow
-and IPv4 if you did not use -L. If you specify both
+(<b>-F0</b>) binding to IP addresses that are currently not
-<b>-4</b> and <b>-6</b> or none, vlmcsd uses both protocols.
+configured on your system. The default is <b>-F0</b>.
-If you specify only one, that protocol will be used only.
+<b>-F1</b> allows you to bind to an IP address that may be
-<b>These options are deprecated and will be removed.</b></p>
+configured after you started <b>vlmcsd</b>. <b>vlmcsd</b>
-
+will listen on that address as soon as it becomes available.
-<table width="100%" border="0" rules="none" frame="void"
+This feature is only available under Linux (IPv4 and IPv6)
-       cellspacing="0" cellpadding="0">
+and FreeBSD (IPv4 only). FreeBSD allows this feature only
-<tr valign="top" align="left">
+for the root user (more correctly: processes that have the
-<td width="11%"></td>
+PRIV_NETINET_BINDANY privilege). Linux does not require a
-<td width="3%">
+capability for this.</p>
-
-
-<p><b>-I</b></p></td>
-<td width="8%"></td>
-<td width="78%">
-
-
-<p>This option is deprecated and does nothing. It is
-provided for compatibility with svn681 and earlier versions
-only. It will be removed in a future release.</p></td></tr>
-</table>
 
 <p style="margin-left:11%;"><b>-t</b> <i>seconds</i></p>
 
@@ -321,21 +331,6 @@ combined with <b>-D</b>.</p></td></tr>
 <td width="3%">
 
 
-<p><b>-f</b></p></td>
-<td width="8%"></td>
-<td width="78%">
-
-
-<p>This flag combines <b>-D</b> and <b>-e</b>. So typing
-&quot;vlmcsd -f&quot; is identical to &quot;vlmcsd
--De&quot;. The purpose of <b>-f</b> is to provide
-compatibility with previous versions of vlmcsd. <b>This
-option is deprecated and will be removed.</b></p></td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
 <p><b>-v</b></p></td>
 <td width="8%"></td>
 <td width="78%">

vlmcsd.8.unix.txt

@@ -52,6 +52,14 @@ OPTIONS
               Displays help.
 
 
+       -V     Displays  extended  version  information. This includes the com‐
+              piler used to build vlmcsd,  the  intended  platform  and  flags
+              (compile  time  options) to build vlmcsd. If you have the source
+              code of vlmcsd, you can type make help (or gmake help on systems
+              that  do  not  use the GNU version of make(1) by default) to see
+              the meaning of those flags.
+
+
        -L ipaddress[:port]
               Instructs vlmcsd to  listen  on  ipaddress  with  optional  port
               (default  1688).  You can use this option more than once. If you
@@ -82,16 +90,16 @@ OPTIONS
               ified before -L.
 
 
-       -4 and -6
+       -F0 and -F1
-              Used  to control the use of IPv4 and IPv4 if you did not use -L.
+              Allow (-F1) or disallow (-F0) binding to IP addresses  that  are
-              If you specify both -4 and -6 or none, vlmcsd uses  both  proto‐
+              currently not configured on your system. The default is -F0. -F1
-              cols.  If you specify only one, that protocol will be used only.
+              allows you to bind to an IP address that may be configured after
-              These options are deprecated and will be removed.
+              you  started  vlmcsd. vlmcsd will listen on that address as soon
-
+              as it becomes available. This feature is  only  available  under
-
+              Linux  (IPv4  and  IPv6) and FreeBSD (IPv4 only). FreeBSD allows
-       -I     This option is deprecated and does nothing. It is  provided  for
+              this feature only for the root user (more  correctly:  processes
-              compatibility  with svn681 and earlier versions only. It will be
+              that  have  the  PRIV_NETINET_BINDANY privilege). Linux does not
-              removed in a future release.
+              require a capability for this.
 
 
        -t seconds
@@ -181,12 +189,6 @@ OPTIONS
               often combined with -D.
 
 
-       -f     This flag combines -D and -e. So typing "vlmcsd -f" is identical
-              to "vlmcsd -De". The purpose of -f is to  provide  compatibility
-              with  previous versions of vlmcsd. This option is deprecated and
-              will be removed.
-
-
        -v     Use  verbose  logging.  Logs every parameter of the base request
               and the base response. It also logs the HWID of the  KMS  server
               if  KMS  protocol  version  6 is used. This option is mainly for
@@ -521,4 +523,4 @@ SEE ALSO
 
 
 
-Hotbird64                       September 2015                       VLMCSD(8)
+Hotbird64                          June 2016                         VLMCSD(8)

vlmcsd.c

@@ -7,6 +7,10 @@
 #error Microsoft RPC is only available on Windows and Cygwin
 #endif
 
+#if defined(USE_MSRPC) && defined(SIMPLE_SOCKETS)
+#error You can only define either USE_MSRPC or SIMPLE_SOCKETS but not both
+#endif
+
 #if defined(NO_SOCKETS) && defined(USE_MSRPC)
 #error Cannot use inetd mode with Microsoft RPC
 #endif
@@ -66,18 +70,20 @@
 #include "ntservice.h"
 #include "helpers.h"
 
+#ifdef ENABLE_DEPRECATED_OPTIONS
+static const char* const optstring = "N:B:m:t:w:0:3:H:A:R:u:g:L:p:i:P:l:r:U:W:C:F:SsfeDd46VvIqkZ";
+#else // !ENABLE_DEPRECATED_OPTIONS
+static const char* const optstring = "N:B:m:t:w:0:3:H:A:R:u:g:L:p:i:P:l:r:U:W:C:F:SseDdVvqkZ";
+#endif // !ENABLE_DEPRECATED_OPTIONS
 
-static const char* const optstring = "N:B:m:t:w:0:3:H:A:R:u:g:L:p:i:P:l:r:U:W:C:SsfeDd46VvIdqkZ";
+#if !defined(NO_SOCKETS) && !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
-
-#if !defined(NO_SOCKETS)
-#if !defined(USE_MSRPC)
 static uint_fast8_t maxsockets = 0;
-static int_fast8_t haveIPv6Stack = 0;
+
-static int_fast8_t haveIPv4Stack = 0;
+#ifdef ENABLE_DEPRECATED_OPTIONS
 static int_fast8_t v6required = 0;
 static int_fast8_t v4required = 0;
-#endif // !defined(USE_MSRPC)
+#endif // ENABLE_DEPRECATED_OPTIONS
-#endif // !defined(NO_SOCKETS)
+#endif // !defined(NO_SOCKETS) && !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
 
 #ifdef _NTSERVICE
 static int_fast8_t installService = 0;
@@ -107,11 +113,16 @@ static IniFileParameter_t IniFileParameterList[] =
 		{ "RandomizationLevel", INI_PARAM_RANDOMIZATION_LEVEL },
 		{ "LCID", INI_PARAM_LCID },
 #	endif // NO_RANDOM_EPID
-#	ifdef USE_MSRPC
+#	if !defined(NO_SOCKETS) && (defined(USE_MSRPC) || defined(SIMPLE_SOCKETS))
 		{ "Port", INI_PARAM_PORT },
-#	endif // USE_MSRPC
+#	endif // defined(USE_MSRPC) || defined(SIMPLE_SOCKETS)
 #	if !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#	ifndef SIMPLE_SOCKETS
 		{ "Listen", INI_PARAM_LISTEN },
+#	endif // SIMPLE_SOCKETS
+#	if HAVE_FREEBIND
+		{ "FreeBind", INI_PARAM_FREEBIND },
+#	endif // HAVE_FREEBIND
 #	if !defined(NO_LIMIT) && !__minix__
 		{ "MaxWorkers", INI_PARAM_MAX_WORKERS },
 #	endif // !defined(NO_LIMIT) && !__minix__
@@ -200,10 +211,10 @@ static char GetNumericId(gid_t *restrict id, const char *const c)
 	gid_t temp;
 
 	temp = (gid_t)strtoll(c, &endptr, 10);
-
 	if (!*endptr) *id = temp;
+	if (*endptr || temp == (gid_t)-1) errno = EINVAL;
 
-	return *endptr;
+	return *endptr || *id == (gid_t)-1;
 }
 
 
@@ -267,14 +278,15 @@ static __noreturn void usage()
 			"  -C <LCID>\t\tuse fixed <LCID> in random ePIDs\n"
 			#endif // NO_RANDOM_EPID
 			#ifndef NO_SOCKETS
-			#ifndef USE_MSRPC
+			#if !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
-			"  -4\t\t\tuse IPv4\n"
-			"  -6\t\t\tuse IPv6\n"
 			"  -L <address>[:<port>]\tlisten on IP address <address> with optional <port>\n"
 			"  -P <port>\t\tset TCP port <port> for subsequent -L statements (default 1688)\n"
-			#else // USE_MSRPC
+			#if HAVE_FREEBIND
+			"  -F0, -F1\t\tdisable/enable binding to foreign IP addresses\n"
+			#endif // HAVE_FREEBIND
+			#else // defined(USE_MSRPC) || defined(SIMPLE_SOCKETS)
 			"  -P <port>\t\tuse TCP port <port> (default 1688)\n"
-			#endif // USE_MSRPC
+			#endif // defined(USE_MSRPC) || defined(SIMPLE_SOCKETS)
 			#if !defined(NO_LIMIT) && !__minix__
 			"  -m <clients>\t\tHandle max. <clients> simultaneously (default no limit)\n"
 			#endif // !defined(NO_LIMIT) && !__minix__
@@ -293,11 +305,8 @@ static __noreturn void usage()
 			#endif // NO_LOG
 			#ifndef _WIN32 //
 			"  -D			run in foreground\n"
-			"  -f			run in foreground"
+			#else // _WIN32
-			#ifndef NO_LOG
+			"  -D			does nothing. Provided for compatibility with POSIX versions only\n"
-			" and log to stdout"
-			#endif // NO_LOG
-			"\n"
 			#endif // _WIN32
 			#endif // NO_SOCKETS
 			#ifndef USE_MSRPC
@@ -329,8 +338,10 @@ static __noreturn void usage()
 			"  -q\t\t\tdon't log verbose (default)\n"
 			#endif // NO_VERBOSE_LOG
 			#endif // NO_LOG
-			"  -V			display version information and exit"
+			#ifndef NO_VERSION_INFORMATION
-			"\n",
+			"  -V			display version information and exit\n"
+			#endif // NO_VERSION_INFORMATION
+			,
 			Version, global_argv[0]);
 
 	exit(!0);
@@ -507,20 +518,21 @@ static BOOL setIniFileParameter(uint_fast8_t id, const char *const iniarg)
 
 #	endif // NO_RANDOM_EPID
 
-#	ifdef USE_MSRPC
+#	if (defined(USE_MSRPC) || defined(SIMPLE_SOCKETS)) && !defined(NO_SOCKETS)
 
 		case INI_PARAM_PORT:
 			defaultport = allocateStringArgument(iniarg);
 			break;
 
-#	endif // USE_MSRPC
+#	endif // (defined(USE_MSRPC) || defined(SIMPLE_SOCKETS)) && !defined(NO_SOCKETS
 
-#	if !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#	if !defined(NO_SOCKETS) && !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
 
 		case INI_PARAM_LISTEN:
 			maxsockets++;
 			return TRUE;
 
+#	endif // !defined(NO_SOCKETS) && !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
 #	if !defined(NO_LIMIT) && !__minix__
 
 		case INI_PARAM_MAX_WORKERS:
@@ -532,7 +544,6 @@ static BOOL setIniFileParameter(uint_fast8_t id, const char *const iniarg)
 			break;
 
 #	endif // !defined(NO_LIMIT) && !__minix__
-#	endif // NO_SOCKETS
 
 #	ifndef NO_PID_FILE
 
@@ -593,6 +604,14 @@ static BOOL setIniFileParameter(uint_fast8_t id, const char *const iniarg)
 
 #	endif // USE_MSRPC
 
+#	if HAVE_FREEBIND
+
+		case INI_PARAM_FREEBIND:
+			success = getIniFileArgumentBool(&freebind, iniarg);
+			break;
+
+#	endif // HAVE_FREEBIND
+
 		default:
 			return FALSE;
 	}
@@ -729,7 +748,7 @@ static BOOL handleIniFileParameter(const char *s)
 }
 
 
-#if !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#if !defined(NO_SOCKETS) && !defined(SIMPLE_SOCKETS) && !defined(USE_MSRPC)
 static BOOL setupListeningSocketsFromIniFile(const char *s)
 {
 	if (!maxsockets) return TRUE;
@@ -740,7 +759,7 @@ static BOOL setupListeningSocketsFromIniFile(const char *s)
 	IniFileErrorMessage = IniFileErrorBuffer;
 	return addListeningSocket(s);
 }
-#endif // !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#endif // !defined(NO_SOCKETS) && !defined(SIMPLE_SOCKETS) && !defined(USE_MSRPC)
 
 
 static BOOL readIniFile(const uint_fast8_t pass)
@@ -775,7 +794,7 @@ static BOOL readIniFile(const uint_fast8_t pass)
 					!setEpidFromIniFileLine(&s, appIndex) ||
 					!setHwIdFromIniFileLine(&s, appIndex);
 		}
-#		if !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#		if !defined(NO_SOCKETS) && !defined(SIMPLE_SOCKETS) && !defined(USE_MSRPC)
 		else if (pass == INI_FILE_PASS_2)
 		{
 			lineParseError = !setupListeningSocketsFromIniFile(s);
@@ -784,7 +803,7 @@ static BOOL readIniFile(const uint_fast8_t pass)
 		{
 			return FALSE;
 		}
-#		endif // NO_SOCKETS
+#		endif // !defined(NO_SOCKETS) &&  && !defined(SIMPLE_SOCKETS) && !defined(USE_MSRPC)
 
 		if (lineParseError)
 		{
@@ -1065,10 +1084,21 @@ static void parseGeneralArguments() {
 		#ifndef NO_SOCKETS
 
 		#ifndef USE_MSRPC
+		#ifdef ENABLE_DEPRECATED_OPTIONS
+		#ifndef SIMPLE_SOCKETS
 		case '4':
 		case '6':
+			printerrorf("Warning: Option -%c is deprecated. Use -L instead.\n", o);
+			/* no break */
+		#endif // SIMPLE_SOCKETS
+		#endif // ENABLE_DEPRECATED_OPTIONS
 		case 'P':
+			if (o == 'P') defaultport = optarg;
+			#ifdef SIMPLE_SOCKETS
+			ignoreIniFileParameter(INI_PARAM_PORT);
+			#else // !SIMPLE_SOCKETS
 			ignoreIniFileParameter(INI_PARAM_LISTEN);
+			#endif // !SIMPLE_SOCKETS
 			break;
 		#else // USE_MSRPC
 		case 'P':
@@ -1129,19 +1159,44 @@ static void parseGeneralArguments() {
 		#endif // NO_LOG
 
 		#ifndef NO_SOCKETS
-		#ifndef USE_MSRPC
+		#if !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
 		case 'L':
 			maxsockets++;
 			ignoreIniFileParameter(INI_PARAM_LISTEN);
 			break;
-		#endif // USE_MSRPC
+		#if HAVE_FREEBIND
+		case 'F':
+			if (!getArgumentBool(&freebind, optarg)) usage();
+			ignoreIniFileParameter(INI_PARAM_FREEBIND);
+			break;
+		#endif // HAVE_FREEBIND
+		#endif // !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
 
+		#if defined(ENABLE_DEPRECATED_OPTIONS)
 		case 'f':
+			#if !defined(_WIN32) || !defined(NO_LOG)
+			printerrorf
+			(
+				"Warning: Option -f is deprecated. Use -"
+			#ifdef _WIN32
+				"e"
+			#else // !_WIN32
+				"de"
+			#endif // !_WIN32
+				" instead.\n"
+			);
+			#ifndef _WIN32
 			nodaemon = 1;
+			#endif // _WIN32
 			#ifndef NO_LOG
 			logstdout = 1;
 			#endif
+			#if defined(_PEDANTIC) && defined(_WIN32) && defined(NO_LOG)
+			printerrorf("Warning: Option -f has no effect in a Windows version of vlmcsd that has been compiled with logging disabled.\n");
+			#endif // defined(_PEDANTIC) && defined(_WIN32) && defined(NO_LOG)
+			#endif // !defined(_WIN32) || !defined(NO_LOG)
 			break;
+		#endif // ENABLE_DEPRECATED_OPTIONS
 
 		#ifdef _NTSERVICE
 		case 'U':
@@ -1165,7 +1220,13 @@ static void parseGeneralArguments() {
         #endif // _NTSERVICE
 
 		case 'D':
+			#ifndef _WIN32
 			nodaemon = 1;
+			#else // _WIN32
+			#ifdef _PEDANTIC
+			printerrorf("Warning: Option -D has no effect in the Windows version of vlmcsd.\n");
+			#endif // _PEDANTIC
+			#endif // _WIN32
 			break;
 
 		#ifndef NO_LOG
@@ -1175,10 +1236,10 @@ static void parseGeneralArguments() {
 		#endif // NO_LOG
 		#endif // NO_SOCKETS
 
-		#ifndef _WIN32
+		#if !defined(_WIN32) && defined(ENABLE_DEPRECATED_OPTIONS)
 		case 'I': // Backward compatibility with svn681 and earlier
 			break;
-		#endif // _WIN32
+		#endif // !defined(_WIN32) && defined(ENABLE_DEPRECATED_OPTIONS)
 
 		#ifndef NO_RANDOM_EPID
 		case 'r':
@@ -1210,8 +1271,8 @@ static void parseGeneralArguments() {
 			#endif // NO_SIGHUP
 			if (GetGid())
 			{
-				printerrorf("Fatal: setgid for %s failed.\n", optarg);
+				printerrorf("Fatal: %s for %s failed: %s\n", "setgid", gname, strerror(errno));
-				exit(!0);
+				exit(errno);
 			}
 			break;
 
@@ -1223,8 +1284,8 @@ static void parseGeneralArguments() {
 			#endif // NO_SIGHUP
 			if (GetUid())
 			{
-				printerrorf("Fatal: setuid for %s failed.\n", optarg);
+				printerrorf("Fatal: %s for %s failed: %s\n", "setuid", uname, strerror(errno));
-				exit(!0);
+				exit(errno);
 			}
 			break;
 		#endif // NO_USER_SWITCH && !_WIN32
@@ -1259,12 +1320,21 @@ static void parseGeneralArguments() {
 			break;
 		#endif // !USE_MSRPC
 
+		#ifndef NO_VERSION_INFORMATION
 		case 'V':
 			#ifdef _NTSERVICE
 			if (IsNTService) break;
 			#endif
-			printf("vlmcsd %s\n", Version);
+			#if defined(__s390__) && !defined(__zarch__) && !defined(__s390x__)
+			printf("vlmcsd %s %i-bit\n", Version, sizeof(void*) == 4 ? 31 : (int)sizeof(void*) << 3);
+			#else
+			printf("vlmcsd %s %i-bit\n", Version, (int)sizeof(void*) << 3);
+			#endif // defined(__s390__) && !defined(__zarch__) && !defined(__s390x__)
+			printPlatform();
+			printCommonFlags();
+			printServerFlags();
 			exit(0);
+		#endif // NO_VERSION_INFORMATION
 
 		default:
 			usage();
@@ -1429,7 +1499,7 @@ static void allocateSemaphore(void)
 #endif // !defined(NO_LIMIT) && !defined(NO_SOCKETS) && !__minix__
 
 
-#if !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#if !defined(NO_SOCKETS) && !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
 int setupListeningSockets()
 {
 	int o;
@@ -1437,14 +1507,16 @@ int setupListeningSockets()
 
 	SocketList = (SOCKET*)vlmcsd_malloc((size_t)allocsockets * sizeof(SOCKET));
 
-	haveIPv4Stack = checkProtocolStack(AF_INET);
+	int_fast8_t haveIPv4Stack = checkProtocolStack(AF_INET);
-	haveIPv6Stack = checkProtocolStack(AF_INET6);
+	int_fast8_t haveIPv6Stack = checkProtocolStack(AF_INET6);
 
 	// Reset getopt since we've alread used it
 	optReset();
 
 	for (opterr = 0; ( o = getopt(global_argc, (char* const*)global_argv, optstring) ) > 0; ) switch (o)
 	{
+#	ifdef ENABLE_DEPRECATED_OPTIONS
+
 	case '4':
 
 		if (!haveIPv4Stack)
@@ -1465,18 +1537,19 @@ int setupListeningSockets()
 		v6required = 1;
 		break;
 
-	case 'L':
+#	endif // ENABLE_DEPRECATED_OPTIONS
-
-		addListeningSocket(optarg);
-		break;
 
 	case 'P':
 
 		defaultport = optarg;
 		break;
 
-	default:
+	case 'L':
 
+		addListeningSocket(optarg);
+		break;
+
+	default:
 		break;
 	}
 
@@ -1498,8 +1571,13 @@ int setupListeningSockets()
 	// maxsocket results from first pass parsing the arguments
 	if (!maxsockets)
 	{
+#		ifdef ENABLE_DEPRECATED_OPTIONS
 		if (haveIPv6Stack && (v6required || !v4required)) addListeningSocket("::");
 		if (haveIPv4Stack && (v4required || !v6required)) addListeningSocket("0.0.0.0");
+#		else // !ENABLE_DEPRECATED_OPTIONS
+		if (haveIPv6Stack) addListeningSocket("::");
+		if (haveIPv4Stack) addListeningSocket("0.0.0.0");
+#		endif // !ENABLE_DEPRECATED_OPTIONS
 	}
 
 	if (!numsockets)
@@ -1510,7 +1588,7 @@ int setupListeningSockets()
 
 	return 0;
 }
-#endif // !defined(NO_SOCKETS) && !defined(USE_MSRPC)
+#endif // !defined(NO_SOCKETS) && !defined(USE_MSRPC) && !defined(SIMPLE_SOCKETS)
 
 
 int server_main(int argc, CARGV argv)
@@ -1566,7 +1644,7 @@ int newmain()
 	#endif // USE_MSRPC
 
 	// Windows can never daemonize
-	nodaemon = 1;
+	//nodaemon = 1;
 
 	#else // __CYGWIN__
 
@@ -1585,7 +1663,9 @@ int newmain()
 	{
 		InetdMode = 1;
 		nodaemon = 1;
+		#ifndef SIMPLE_SOCKETS
 		maxsockets = 0;
+		#endif // SIMPLE_SOCKETS
 		#ifndef NO_LOG
 		logstdout = 0;
 		#endif // NO_LOG
@@ -1614,9 +1694,13 @@ int newmain()
 	#if !defined(NO_SOCKETS) && !defined(USE_MSRPC)
 	if (!InetdMode)
 	{
+		#ifdef SIMPLE_SOCKETS
+		if ((error = listenOnAllAddresses())) return error;
+		#else // !SIMPLE_SOCKETS
 		if ((error = setupListeningSockets())) return error;
+		#endif // !SIMPLE_SOCKETS
 	}
-	#endif // NO_SOCKETS
+	#endif // !defined(NO_SOCKETS) && !defined(USE_MSRPC)
 
 	// After sockets have been set up, we may switch to a lower privileged user
 	#if !defined(_WIN32) && !defined(NO_USER_SWITCH)
@@ -1625,16 +1709,25 @@ int newmain()
 	if (!IsRestarted)
 	{
 	#endif // NO_SIGHUP
-		if (gid != INVALID_GID && setgid(gid))
+		if (gid != INVALID_GID)
 		{
-			printerrorf("Fatal: setgid for %s failed.\n", gname);
+			if (setgid(gid))
-			return !0;
+			{
+				printerrorf("Fatal: %s for %s failed: %s\n", "setgid", gname, strerror(errno));
+				return errno;
+			}
+
+			if (setgroups(1, &gid))
+			{
+				printerrorf("Fatal: %s for %s failed: %s\n", "setgroups", gname, strerror(errno));
+				return errno;
+			}
 		}
 
 		if (uid != INVALID_UID && setuid(uid))
 		{
-			printerrorf("Fatal: setuid for %s failed.\n", uname);
+			printerrorf("Fatal: %s for %s failed: %s\n", "setuid", uname, strerror(errno));
-			return !0;
+			return errno;
 		}
 	#ifndef NO_SIGHUP
 	}

vlmcsd.h

@@ -47,6 +47,7 @@ int server_main(int argc, CARGV argv);
 #define INI_PARAM_PORT 14
 #define INI_PARAM_RPC_NDR64 15
 #define INI_PARAM_RPC_BTFN 16
+#define INI_PARAM_FREEBIND 17
 
 #define INI_FILE_PASS_1 1
 #define INI_FILE_PASS_2 2

vlmcsd.ini

@@ -22,19 +22,23 @@
 
 # Use custom TCP port
 # Command line: -P 
-# ***The Port directive only works if vlmcsd was compiled to use MS RPC
+# ***The Port directive only works if vlmcsd was compiled to use MS RPC or simple sockets
 # ***Use Listen otherwise
-;Port = 1688
+;Port = 1234
 
 # Listen on all IPv4 addresses (default port 1688)
-# Command line: -L (and compatibility options -4, -6, -P)
+# Command line: -L
-# Does not work with MS RPC, use Port=
+# Does not work with MS RPC or simple sockets, use Port=
 ;Listen = 0.0.0.0:1688
 
 # Listen on all IPv6 addresses (default port 1688)
-# Command line: -L (and compatibility options -4, -6, -P)
+# Command line: -L
 ;Listen = [::]:1688
 
+# Allow binding to foreign IP addresses
+# Command line: -F0 and -F1
+;FreeBind = true
+
 # Randomize ePIDs at program start up (only those that are not explicitly specified)
 # Command line: -r
 ;RandomizationLevel = 1
@@ -84,9 +88,9 @@
 ;group = vlmcsdgroup 
 
 # Disable or enable the NDR64 transfer syntax in RPC (default enabled)
-# Command line: -n
+# Command line: -N0 and -B1
 ;UseNDR64 = true
 
 # Disable or enable bind time feature negotiation in RPC (default enabled)
-# Command line: -b
+# Command line: -B0 and -B1
 ;UseBTFN = true

vlmcsd.ini.5

@@ -1,4 +1,4 @@
-.TH VLMCSD.INI 5 "September 2015" "Hotbird64" "KMS Activation Manual"
+.TH VLMCSD.INI 5 "June 2016" "Hotbird64" "KMS Activation Manual"
 .LO 8
 
 .SH NAME
@@ -34,10 +34,10 @@ Lines, that start with '#' or ';' are treated as comments. Empty lines are ignor
 Some \fIargument\fRs are binary arguments that need to be either TRUE or FALSE. You can use "Yes", "On" or "1" as an alias for TRUE and "No", "Off" or "0" as an alias for FALSE. Binary arguments are case-insensitive.
 
 .SH KEYWORDS
-The following \fIkeyword\fRs are defined:
+The following \fIkeyword\fRs are defined (not all keywords may be available depending on the operating system and the options used when \fBvlmcsd\fR(8) was compiled):
 
 .IP "\fBListen\fR"
-This defines on what combinations of IP addresses and ports vlmcsd should listen. \fBListen\fR can be specified more than once. The \fIargument\fR has the form \fIipaddress\fR[:\fIport\fR]. If you omit the \fIport\fR, the default port of 1688 is used. If the \fIipaddress\fR contains colons and a \fIport\fR is used, you must enclose the \fIipaddress\fR in brackets. The default is to listen to 0.0.0.0:1688 and [::]:1688 which means listen to all IPv4 and all IPv6 addresses. See the \fB-L\fR option in \fBvlmcsd\fR(8) for more info about the syntax. If you use \fB-L\fR, \fB-P\fR, \fB-4\fR or \fB-6\fR on the command line, all \fBListen\fR keywords in the ini file will be ignored. The \fBListen\fR keyword cannot be used on Windows and Cygwin if vlmcsd has been compiled to use Microsoft RPC.  
+This defines on what combinations of IP addresses and ports vlmcsd should listen. \fBListen\fR can be specified more than once. The \fIargument\fR has the form \fIipaddress\fR[:\fIport\fR]. If you omit the \fIport\fR, the default port of 1688 is used. If the \fIipaddress\fR contains colons and a \fIport\fR is used, you must enclose the \fIipaddress\fR in brackets. The default is to listen to 0.0.0.0:1688 and [::]:1688 which means listen to all IPv4 and all IPv6 addresses. See the \fB-L\fR option in \fBvlmcsd\fR(8) for more info about the syntax. If you use \fB-L\fR or \fB-P\fR on the command line, all \fBListen\fR keywords in the ini file will be ignored. The \fBListen\fR keyword cannot be used if vlmcsd has been compiled to use Microsoft RPC (Windows and Cygwin only) or simple sockets.  
 
 Examples:
 
@@ -48,7 +48,10 @@ Listen = 0.0.0.0:1234
 Listen = [fe80::1721:12ff:fe81:d36b%eth0]:1688
 
 .IP "\fBPort\fR"
-Can only be used on Windows and Cygwin if vlmcsd has been compiled to use Microsoft RPC. Causes vlmcsd to listen on that port instead of 1688. On all non-Windows operating systems or if vlmcsd has been compiled to use its own RPC implementation, you must use \fBListen\fR instead.
+Can only be used if vlmcsd has been compiled to use simple sockets or on Windows and Cygwin if \fBvlmcsd\fR(8) has been compiled to use Microsoft RPC. Otherwise you must use \fBListen\fR instead. Causes vlmcsd to listen on that port instead of 1688.
+
+.IP "\fBFreeBind\fR"
+Can be TRUE or FALSE. If TRUE, you can use the \fBListen\fR keyword with IP addresses that are currently not defined on your system. \fBvlmcsd\fR(8) will start listening on these IP addresses as soon as they become available. This keyword is only available under Linux and FreeBSD because no other OS currently supports that feature. FreeBSD supports this only for IPv4 and requires the PRIV_NETINET_BINDANY privilege which is normally assigned to proccesses of the root user.
 
 .IP "\fBUseNDR64\fR"
 Can be TRUE or FALSE. Specifies whether you want to use the NDR64 transfer syntax. See options \fB-n0\fR and \fB-n1\fR in \fBvlmcsd\fR(8). The default is TRUE.

vlmcsd.ini.5.dos.txt

@@ -66,7 +66,9 @@ SYNTAX
 
 
 KEYWORDS
-       The following keywords are defined:
+       The following keywords are defined (not all keywords may  be  available
+       depending  on  the operating system and the options used when vlmcsd(8)
+       was compiled):
 
 
        Listen This defines on what combinations of IP addresses and ports vlm‐
@@ -77,10 +79,10 @@ KEYWORDS
               brackets. The default is to listen to 0.0.0.0:1688 and [::]:1688
               which means listen to all IPv4 and all IPv6 addresses.  See  the
               -L  option  in  vlmcsd(8) for more info about the syntax. If you
-              use -L, -P, -4 or -6 on the command line, all Listen keywords in
+              use -L or -P on the command line, all Listen keywords in the ini
-              the  ini file will be ignored. The Listen keyword cannot be used
+              file  will be ignored. The Listen keyword cannot be used if vlm‐
-              on Windows and Cygwin if vlmcsd has been compiled to use  Micro‐
+              csd has been compiled to use Microsoft RPC (Windows  and  Cygwin
-              soft RPC.
+              only) or simple sockets.
 
               Examples:
 
@@ -89,11 +91,21 @@ KEYWORDS
               Listen = [fe80::1721:12ff:fe81:d36b%eth0]:1688
 
 
-       Port   Can  only  be used on Windows and Cygwin if vlmcsd has been com‐
+       Port   Can only be used if vlmcsd has been compiled to use simple sock‐
-              piled to use Microsoft RPC. Causes vlmcsd to listen on that port
+              ets or on Windows and Cygwin if vlmcsd(8) has been  compiled  to
-              instead of 1688. On all non-Windows operating systems or if vlm‐
+              use Microsoft RPC. Otherwise you must use Listen instead. Causes
-              csd has been compiled to use its  own  RPC  implementation,  you
+              vlmcsd to listen on that port instead of 1688.
-              must use Listen instead.
+
+
+       FreeBind
+              Can be TRUE or FALSE. If TRUE, you can use  the  Listen  keyword
+              with IP addresses that are currently not defined on your system.
+              vlmcsd(8) will start listening on these IP addresses as soon  as
+              they  become  available.  This  keyword  is only available under
+              Linux and FreeBSD because no other OS  currently  supports  that
+              feature.  FreeBSD  supports  this only for IPv4 and requires the
+              PRIV_NETINET_BINDANY privilege which  is  normally  assigned  to
+              proccesses of the root user.
 
 
        UseNDR64
@@ -265,4 +277,4 @@ SEE ALSO
 
 
 
-Hotbird64                       September 2015                   VLMCSD.INI(5)
+Hotbird64                          June 2016                     VLMCSD.INI(5)

vlmcsd.ini.5.html

@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Tue Mar  8 00:06:22 2016 -->
+<!-- CreationDate: Sun Jun  5 14:31:11 2016 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -137,7 +137,9 @@ Binary arguments are case-insensitive.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">The following
-<i>keyword</i>s are defined:</p>
+<i>keyword</i>s are defined (not all keywords may be
+available depending on the operating system and the options
+used when <b>vlmcsd</b>(8) was compiled):</p>
 
 <table width="100%" border="0" rules="none" frame="void"
        cellspacing="0" cellpadding="0">
@@ -161,11 +163,11 @@ the <i>ipaddress</i> in brackets. The default is to listen
 to 0.0.0.0:1688 and [::]:1688 which means listen to all IPv4
 and all IPv6 addresses. See the <b>-L</b> option in
 <b>vlmcsd</b>(8) for more info about the syntax. If you use
-<b>-L</b>, <b>-P</b>, <b>-4</b> or <b>-6</b> on the command
+<b>-L</b> or <b>-P</b> on the command line, all
-line, all <b>Listen</b> keywords in the ini file will be
+<b>Listen</b> keywords in the ini file will be ignored. The
-ignored. The <b>Listen</b> keyword cannot be used on Windows
+<b>Listen</b> keyword cannot be used if vlmcsd has been
-and Cygwin if vlmcsd has been compiled to use Microsoft
+compiled to use Microsoft RPC (Windows and Cygwin only) or
-RPC.</p> </td></tr>
+simple sockets.</p></td></tr>
 </table>
 
 <p style="margin-left:22%; margin-top: 1em">Examples:</p>
@@ -187,14 +189,25 @@ Listen = [fe80::1721:12ff:fe81:d36b%eth0]:1688</p>
 <td width="78%">
 
 
-<p style="margin-top: 1em">Can only be used on Windows and
+<p style="margin-top: 1em">Can only be used if vlmcsd has
-Cygwin if vlmcsd has been compiled to use Microsoft RPC.
+been compiled to use simple sockets or on Windows and Cygwin
-Causes vlmcsd to listen on that port instead of 1688. On all
+if <b>vlmcsd</b>(8) has been compiled to use Microsoft RPC.
-non-Windows operating systems or if vlmcsd has been compiled
+Otherwise you must use <b>Listen</b> instead. Causes vlmcsd
-to use its own RPC implementation, you must use
+to listen on that port instead of 1688.</p></td></tr>
-<b>Listen</b> instead.</p></td></tr>
 </table>
 
+<p style="margin-left:11%;"><b>FreeBind</b></p>
+
+<p style="margin-left:22%;">Can be TRUE or FALSE. If TRUE,
+you can use the <b>Listen</b> keyword with IP addresses that
+are currently not defined on your system. <b>vlmcsd</b>(8)
+will start listening on these IP addresses as soon as they
+become available. This keyword is only available under Linux
+and FreeBSD because no other OS currently supports that
+feature. FreeBSD supports this only for IPv4 and requires
+the PRIV_NETINET_BINDANY privilege which is normally
+assigned to proccesses of the root user.</p>
+
 <p style="margin-left:11%;"><b>UseNDR64</b></p>
 
 <p style="margin-left:22%;">Can be TRUE or FALSE. Specifies

vlmcsd.ini.5.unix.txt

@@ -66,7 +66,9 @@ SYNTAX
 
 
 KEYWORDS
-       The following keywords are defined:
+       The following keywords are defined (not all keywords may  be  available
+       depending  on  the operating system and the options used when vlmcsd(8)
+       was compiled):
 
 
        Listen This defines on what combinations of IP addresses and ports vlm‐
@@ -77,10 +79,10 @@ KEYWORDS
               brackets. The default is to listen to 0.0.0.0:1688 and [::]:1688
               which means listen to all IPv4 and all IPv6 addresses.  See  the
               -L  option  in  vlmcsd(8) for more info about the syntax. If you
-              use -L, -P, -4 or -6 on the command line, all Listen keywords in
+              use -L or -P on the command line, all Listen keywords in the ini
-              the  ini file will be ignored. The Listen keyword cannot be used
+              file  will be ignored. The Listen keyword cannot be used if vlm‐
-              on Windows and Cygwin if vlmcsd has been compiled to use  Micro‐
+              csd has been compiled to use Microsoft RPC (Windows  and  Cygwin
-              soft RPC.
+              only) or simple sockets.
 
               Examples:
 
@@ -89,11 +91,21 @@ KEYWORDS
               Listen = [fe80::1721:12ff:fe81:d36b%eth0]:1688
 
 
-       Port   Can  only  be used on Windows and Cygwin if vlmcsd has been com‐
+       Port   Can only be used if vlmcsd has been compiled to use simple sock‐
-              piled to use Microsoft RPC. Causes vlmcsd to listen on that port
+              ets or on Windows and Cygwin if vlmcsd(8) has been  compiled  to
-              instead of 1688. On all non-Windows operating systems or if vlm‐
+              use Microsoft RPC. Otherwise you must use Listen instead. Causes
-              csd has been compiled to use its  own  RPC  implementation,  you
+              vlmcsd to listen on that port instead of 1688.
-              must use Listen instead.
+
+
+       FreeBind
+              Can be TRUE or FALSE. If TRUE, you can use  the  Listen  keyword
+              with IP addresses that are currently not defined on your system.
+              vlmcsd(8) will start listening on these IP addresses as soon  as
+              they  become  available.  This  keyword  is only available under
+              Linux and FreeBSD because no other OS  currently  supports  that
+              feature.  FreeBSD  supports  this only for IPv4 and requires the
+              PRIV_NETINET_BINDANY privilege which  is  normally  assigned  to
+              proccesses of the root user.
 
 
        UseNDR64
@@ -265,4 +277,4 @@ SEE ALSO
 
 
 
-Hotbird64                       September 2015                   VLMCSD.INI(5)
+Hotbird64                          June 2016                     VLMCSD.INI(5)

vlmcsdmulti.1.html

@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Tue Mar  8 00:06:22 2016 -->
+<!-- CreationDate: Sun Jun  5 14:31:10 2016 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>