diff --git a/dns_srv.c b/dns_srv.c index 6d31e35..ccf2cd0 100644 --- a/dns_srv.c +++ b/dns_srv.c @@ -159,7 +159,7 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b char* querystring = (char*)alloca(strlen(query) + 12); strcpy(querystring, "_vlmcs._tcp"); strcat(querystring, query); - bytes_received = res_query(querystring, C_IN, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE); + bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE); # endif } else diff --git a/floppy144.vfd b/floppy144.vfd index 0e6bc42..1154443 100644 Binary files a/floppy144.vfd and b/floppy144.vfd differ diff --git a/helpers.c b/helpers.c index 7765d34..8372acb 100644 --- a/helpers.c +++ b/helpers.c @@ -345,7 +345,7 @@ __pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument) { if ( !strncasecmp(argument, "true", 4) || - !strncasecmp(argument, "on", 4) || + !strncasecmp(argument, "on", 2) || !strncasecmp(argument, "yes", 3) || !strncasecmp(argument, "1", 1) ) diff --git a/make_dragonfly b/make_dragonfly old mode 100644 new mode 100755 diff --git a/make_freebsd b/make_freebsd old mode 100644 new mode 100755 diff --git a/make_linux b/make_linux old mode 100644 new mode 100755 index 6fa2fa4..4fad250 --- a/make_linux +++ b/make_linux @@ -21,6 +21,7 @@ mkdir -p binaries/Linux/intel/static mkdir -p binaries/Linux/intel/musl mkdir -p binaries/Linux/sparc32/glibc +mkdir -p binaries/Linux/s390/glibc mkdir -p binaries/Android/arm/bionic mkdir -p binaries/Android/arm/static diff --git a/make_mainframe_linux b/make_mainframe_linux new file mode 100755 index 0000000..6185263 --- /dev/null +++ b/make_mainframe_linux @@ -0,0 +1,50 @@ +#!/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 diff --git a/make_minix b/make_minix old mode 100644 new mode 100755 diff --git a/make_netbsd b/make_netbsd old mode 100644 new mode 100755 diff --git a/make_openbsd b/make_openbsd old mode 100644 new mode 100755 diff --git a/make_osx b/make_osx old mode 100644 new mode 100755 index 1fb1615..b42bc35 --- a/make_osx +++ b/make_osx @@ -20,19 +20,19 @@ make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x64 PROGRAM_NAME=vlmcsd-MacOSX-x64 CC=c rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ make $REUSEOBJFLAGS vlmcsdmulti-MacOSX-x64 MULTI_NAME=vlmcsdmulti-MacOSX-x64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.0" && \ make $MAKEFLAGS vlmcsd-MacOSX-x64-threads THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x64-threads CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.0" && \ -make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x86-openssl-EXPERIMENTAL PROGRAM_NAME=vlmcsd-MacOSX-x86-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes_soft CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.4" && \ -make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x64-openssl-EXPERIMENTAL PROGRAM_NAME=vlmcsd-MacOSX-x64-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes_soft CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.4" && \ +#make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x86-openssl-EXPERIMENTAL PROGRAM_NAME=vlmcsd-MacOSX-x86-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes_soft CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.4" && \ +#make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x64-openssl-EXPERIMENTAL PROGRAM_NAME=vlmcsd-MacOSX-x64-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes_soft CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.4" && \ #make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-7.1-armv7 PROGRAM_NAME=vlmcsd-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" && \ 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-8.4-armv7 PROGRAM_NAME=vlmcsd-iOS-8.4-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot ~/toolchains/iPhoneOS8.4.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" && \ rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ -make $REUSEOBJFLAGS vlmcsdmulti-iOS-8.4-armv7 MULTI_NAME=vlmcsdmulti-iOS-8.4-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot ~/toolchains/iPhoneOS8.4.sdk" && \ -make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-8.4-armv8-aarch64 PROGRAM_NAME=vlmcsd-iOS-8.4-armv8-aarch64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -arch arm64 -miphoneos-version-min=7.0 -isysroot ~/toolchains/iPhoneOS8.4.sdk" && \ +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 $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" && \ rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ -make $REUSEOBJFLAGS vlmcsdmulti-iOS-8.4-armv8-aarch64 MULTI_NAME=vlmcsdmulti-iOS-8.4-armv8-aarch64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -arch arm64 -miphoneos-version-min=7.0 -isysroot ~/toolchains/iPhoneOS8.4.sdk" && \ +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 $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.* && \ @@ -47,28 +47,28 @@ PATH=~/toolchains/iOS5.1-MacOS-Lion/usr/bin:$PATH make $MAKEFLAGS CLIENT_NAME=vl rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ PATH=~/toolchains/iOS5.1-MacOS-Lion/usr/bin:$PATH make $REUSEOBJFLAGS vlmcsdmulti-iOS-5.1-armv6-clang3.1 MULTI_NAME=vlmcsdmulti-iOS-5.1-armv6-clang3.1 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS5.1.sdk -isysroot ~/toolchains/iPhoneOS5.1.sdk" && \ -PATH=~/toolchains/gcc4.2/usr/bin/bin:$PATH make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-4.1-armv6-llvm-gcc4.2 PROGRAM_NAME=vlmcsd-iOS-4.1-armv6-llvm-gcc4.2 CC=llvm-g++-4.2 CFLAGS="$CFGCC42" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS4.1.sdk -isysroot ~/toolchains/iPhoneOS4.1.sdk" && \ -rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ -PATH=~/toolchains/gcc4.2/usr/bin/bin:$PATH make $REUSEOBJFLAGS vlmcsdmulti-iOS-4.1-armv6-llvm-gcc4.2 MULTI_NAME=vlmcsdmulti-iOS-4.1-armv6-llvm-gcc4.2 CC=llvm-g++-4.2 CFLAGS="$CFGCC42" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS4.1.sdk -isysroot ~/toolchains/iPhoneOS4.1.sdk" && \ +#PATH=~/toolchains/gcc4.2/usr/bin/bin:$PATH make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-4.1-armv6-llvm-gcc4.2 PROGRAM_NAME=vlmcsd-iOS-4.1-armv6-llvm-gcc4.2 CC=llvm-g++-4.2 CFLAGS="$CFGCC42" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS4.1.sdk -isysroot ~/toolchains/iPhoneOS4.1.sdk" && \ +#rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ +#PATH=~/toolchains/gcc4.2/usr/bin/bin:$PATH make $REUSEOBJFLAGS vlmcsdmulti-iOS-4.1-armv6-llvm-gcc4.2 MULTI_NAME=vlmcsdmulti-iOS-4.1-armv6-llvm-gcc4.2 CC=llvm-g++-4.2 CFLAGS="$CFGCC42" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS4.1.sdk -isysroot ~/toolchains/iPhoneOS4.1.sdk" && \ #PATH=~/toolchains/gcc4.2/usr/bin:$PATH make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-4.1-armv7-clang PROGRAM_NAME=vlmcsd-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" && \ #rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o && \ #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 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" -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.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" && \ rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ -make $REUSEOBJFLAGS vlmcsdmulti-MacOSX-x86-gcc MULTI_NAME=vlmcsdmulti-MacOSX-x86-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.0" && \ -make $MAKEFLAGS vlmcsd-MacOSX-x86-threads-gcc THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x86-threads-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.0" && \ -make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x64-gcc PROGRAM_NAME=vlmcsd-MacOSX-x64-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.0" && \ +make $REUSEOBJFLAGS vlmcsdmulti-MacOSX-x86-gcc MULTI_NAME=vlmcsdmulti-MacOSX-x86-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.11" && \ +make $MAKEFLAGS vlmcsd-MacOSX-x86-threads-gcc THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x86-threads-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.11" && \ +make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x64-gcc PROGRAM_NAME=vlmcsd-MacOSX-x64-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.11" && \ rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \ -make $REUSEOBJFLAGS vlmcsdmulti-MacOSX-x64-gcc MULTI_NAME=vlmcsdmulti-MacOSX-x64-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.0" && \ -make $MAKEFLAGS vlmcsd-MacOSX-x64-threads-gcc THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x64-threads-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.0" && \ +make $REUSEOBJFLAGS vlmcsdmulti-MacOSX-x64-gcc MULTI_NAME=vlmcsdmulti-MacOSX-x64-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.11" && \ +make $MAKEFLAGS vlmcsd-MacOSX-x64-threads-gcc THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x64-threads-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.11" && \ # Sign the iOS binaries #ldid -S *iOS* diff --git a/make_solaris b/make_solaris old mode 100644 new mode 100755 diff --git a/make_windows b/make_windows old mode 100644 new mode 100755 diff --git a/make_windows_native b/make_windows_native old mode 100644 new mode 100755 diff --git a/msrpc-server.c b/msrpc-server.c index 610eb58..7b15019 100644 --- a/msrpc-server.c +++ b/msrpc-server.c @@ -178,7 +178,11 @@ int ProcessActivationRequest(handle_t IDL_handle, int requestSize, unsigned char # endif // NO_LOG // Discard any packet smaller than a v4 request - if (requestSize < (int)sizeof(REQUEST_V4)) return RPC_S_CANNOT_SUPPORT; + if (requestSize < (int)sizeof(REQUEST_V4)) + { + if (!result) RpcStringFreeA(&clientIpAddress); + return RPC_S_CANNOT_SUPPORT; + } *response = (uint8_t *)midl_user_allocate(MAX_RESPONSE_SIZE); diff --git a/vlmcs.1.html b/vlmcs.1.html index aa9b083..e17bc8a 100644 --- a/vlmcs.1.html +++ b/vlmcs.1.html @@ -1,5 +1,5 @@ - + diff --git a/vlmcs.1.pdf b/vlmcs.1.pdf index bbb2286..75d637a 100644 Binary files a/vlmcs.1.pdf and b/vlmcs.1.pdf differ diff --git a/vlmcs_all.c b/vlmcs_all.c index 31b4147..9bae523 100644 --- a/vlmcs_all.c +++ b/vlmcs_all.c @@ -3610,7 +3610,7 @@ __pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument) { if ( !strncasecmp(argument, "true", 4) || - !strncasecmp(argument, "on", 4) || + !strncasecmp(argument, "on", 2) || !strncasecmp(argument, "yes", 3) || !strncasecmp(argument, "1", 1) ) @@ -5793,7 +5793,7 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b char* querystring = (char*)alloca(strlen(query) + 12); strcpy(querystring, "_vlmcs._tcp"); strcat(querystring, query); - bytes_received = res_query(querystring, C_IN, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE); + bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE); # endif } else diff --git a/vlmcsd.7.html b/vlmcsd.7.html index 5025e77..6af88a0 100644 --- a/vlmcsd.7.html +++ b/vlmcsd.7.html @@ -1,5 +1,5 @@ - + diff --git a/vlmcsd.7.pdf b/vlmcsd.7.pdf index 1a32b66..dc2d776 100644 Binary files a/vlmcsd.7.pdf and b/vlmcsd.7.pdf differ diff --git a/vlmcsd.8 b/vlmcsd.8 index c3874f1..26b44e3 100644 --- a/vlmcsd.8 +++ b/vlmcsd.8 @@ -1,5 +1,5 @@ .mso www.tmac -.TH VLMCSD 8 "July 2015" "Hotbird64" "KMS Activation Manual" +.TH VLMCSD 8 "September 2015" "Hotbird64" "KMS Activation Manual" .LO 8 .SH NAME @@ -108,7 +108,7 @@ Use \fIePID\fR as Windows ePID. If specified, \fB-r\fR is disregarded for Window Use \fIePID\fR as Office 2010 ePID (including Project and Visio). If specified, \fB-r\fR is disregarded for Office 2010. .IP "\fB-3\fR \fIePID\fR" -Use \fIePID\fR as Office 2013 ePID (including Project and Visio). If specified, \fB-r\fR is disregarded for Office 2013. +Use \fIePID\fR as Office 2013/2016 ePID (including Project and Visio). If specified, \fB-r\fR is disregarded for Office 2013/2016. .IP "\fB-H\fR \fIHwId\fR" Use \fIHwId\fR for all products. All HWIDs in the ini file (see \fB-i\fR) will not be used. In an ini file you can specify a seperate HWID for each \fIapplication-guid\fR. This is not possible when entering a HWID from the command line. @@ -189,7 +189,7 @@ Make sure that the user you specify has at least execute permission for your exe For your convenience you can use the special username "/l" as a shortcut for "NT AUTHORITY\eLocalService" and "/n" for "NT AUTHORITY\eNetworkService". "vlmcsd\ \-s\ \-U\ /n" installs the service to run as "NT AUTHORITY\eNetworkService". -.IP "\fB-W\fR \fIpassword\fI" +.IP "\fB-W\fR \fIpassword\fR" Can only be used together with \fB-s\fR. Specifies a \fIpassword\fR for the corresponding username you use with -U. SYSTEM, "NT AUTHORITY\eNetworkService", "NT AUTHORITY\eLocalService" do not require a password. If you specify a user with even lower privileges than "NT AUTHORITY\eNetworkService", you must specify its password. You also have to grant the "Log on as a service" right to that user. @@ -217,10 +217,10 @@ If you used the 'user' and/or 'group' directive in an ini file these are ignored Signaling is not available in the native Windows version and in the Cygwin version when it runs as Windows service. .SH SUPPORTED OPERATING SYSTEMS -\fBvlmcsd\fR compiles and runs on Linux, Windows (no Cygwin required but explicitly supported), Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, Solaris, OpenIndiana, Android and iOS. Other POSIX or unixoid OSses may work with unmodified sources or may require minor porting efforts. +\fBvlmcsd\fR compiles and runs on Linux, Windows (no Cygwin required but explicitly supported), Mac OS X, FreeBSD, NetBSD, OpenBSD, Dragonfly BSD, Minix, Solaris, OpenIndiana, Android and iOS. Other POSIX or unixoid OSses may work with unmodified sources or may require minor porting efforts. .SH SUPPORTED PRODUCTS -\fBvlmcsd\fR can answer activation requests for the following products: Windows Vista, Windows 7, Windows 8, Windows 8.1, Windows 10, Windows Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2, Office 2010, Project 2010, Visio 2010, Office 2013, Project 2013, Visio 2013. +\fBvlmcsd\fR can answer activation requests for the following products: Windows Vista, Windows 7, Windows 8, Windows 8.1, Windows 10, Windows Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2, Office 2010, Project 2010, Visio 2010, Office 2013, Project 2013, Visio 2013, Office 2016, Project 2016, Visio 2016. .PP Office, Project and Visio must be volume license versions. diff --git a/vlmcsd.8.dos.txt b/vlmcsd.8.dos.txt index ae32264..674f03b 100644 --- a/vlmcsd.8.dos.txt +++ b/vlmcsd.8.dos.txt @@ -239,8 +239,8 @@ OPTIONS -3 ePID - Use ePID as Office 2013 ePID (including Project and Visio). If - specified, -r is disregarded for Office 2013. + Use ePID as Office 2013/2016 ePID (including Project and Visio). + If specified, -r is disregarded for Office 2013/2016. -H HwId @@ -454,17 +454,18 @@ SIGNALS SUPPORTED OPERATING SYSTEMS vlmcsd compiles and runs on Linux, Windows (no Cygwin required but - explicitly supported), Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, - Solaris, OpenIndiana, Android and iOS. Other POSIX or unixoid OSses may - work with unmodified sources or may require minor porting efforts. + explicitly supported), Mac OS X, FreeBSD, NetBSD, OpenBSD, Dragonfly + BSD, Minix, Solaris, OpenIndiana, Android and iOS. Other POSIX or + unixoid OSses may work with unmodified sources or may require minor + porting efforts. SUPPORTED PRODUCTS - vlmcsd can answer activation requests for the following products: Win‐ - dows Vista, Windows 7, Windows 8, Windows 8.1, Windows 10, Windows - Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows - Server 2012 R2, Office 2010, Project 2010, Visio 2010, Office 2013, - Project 2013, Visio 2013. + vlmcsd can answer activation requests for the following products: Win‐ + dows Vista, Windows 7, Windows 8, Windows 8.1, Windows 10, Windows + Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows + Server 2012 R2, Office 2010, Project 2010, Visio 2010, Office 2013, + Project 2013, Visio 2013, Office 2016, Project 2016, Visio 2016. Office, Project and Visio must be volume license versions. @@ -475,24 +476,24 @@ FILES EXAMPLES vlmcsd -f - Starts vlmcsd in foreground. Useful if you use it for the first - time and want to see what's happening when a client requests + Starts vlmcsd in foreground. Useful if you use it for the first + time and want to see what's happening when a client requests activation. vlmcsd -l /var/log/vlmcsd.log - Starts vlmcsd as a daemon and logs everything to /var/log/vlm‐ + Starts vlmcsd as a daemon and logs everything to /var/log/vlm‐ csd.log. vlmcsd -L 192.168.1.17 Starts vlmcsd as a daemon and listens on IP address 192.168.1.17 - only. This is useful for routers that have a public and a pri‐ + only. This is useful for routers that have a public and a pri‐ vate IP address to prevent your KMS server from becoming public. vlmcsd -s -U /n -l C:\logs\vlmcsd.log - Installs vlmcsd as a Windows service with low privileges and + Installs vlmcsd as a Windows service with low privileges and logs everything to C:\logs\vlmcsd.log when the service is started with "net start vlmcsd". @@ -500,18 +501,18 @@ EXAMPLES BUGS An ePID specified in an ini file must not contain spaces. - The maximum number of -L options in the command line or listen state‐ + The maximum number of -L options in the command line or listen state‐ ments in the inifile is the platform default for FD_SETSIZE. This is 64 on Windows and 1024 on most Unixes. AUTHOR - Written by crony12, Hotbird64 and vityan666. With contributions from + Written by crony12, Hotbird64 and vityan666. With contributions from DougQaid. CREDITS - Thanks to CODYQX4, deagles, eIcn, mikmik38, nosferati87, qad, Rati‐ + Thanks to CODYQX4, deagles, eIcn, mikmik38, nosferati87, qad, Rati‐ borus, ... @@ -520,4 +521,4 @@ SEE ALSO -Hotbird64 July 2015 VLMCSD(8) +Hotbird64 September 2015 VLMCSD(8) diff --git a/vlmcsd.8.html b/vlmcsd.8.html index 3e2697e..2f98b9a 100644 --- a/vlmcsd.8.html +++ b/vlmcsd.8.html @@ -1,5 +1,5 @@ - + @@ -410,9 +410,9 @@ is disregarded for Office 2010.

-3 ePID

-

Use ePID as Office 2013 -ePID (including Project and Visio). If specified, -r -is disregarded for Office 2013.

+

Use ePID as Office +2013/2016 ePID (including Project and Visio). If specified, +-r is disregarded for Office 2013/2016.

-H HwId

@@ -748,9 +748,9 @@ Cygwin version when it runs as Windows service.

vlmcsd compiles and runs on Linux, Windows (no Cygwin required but explicitly supported), Mac OS X, FreeBSD, NetBSD, OpenBSD, -Minix, Solaris, OpenIndiana, Android and iOS. Other POSIX or -unixoid OSses may work with unmodified sources or may -require minor porting efforts.

+Dragonfly BSD, Minix, Solaris, OpenIndiana, Android and iOS. +Other POSIX or unixoid OSses may work with unmodified +sources or may require minor porting efforts.

SUPPORTED PRODUCTS @@ -762,7 +762,8 @@ can answer activation requests for the following products: Windows Vista, Windows 7, Windows 8, Windows 8.1, Windows 10, Windows Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2, Office 2010, Project -2010, Visio 2010, Office 2013, Project 2013, Visio 2013.

+2010, Visio 2010, Office 2013, Project 2013, Visio 2013, +Office 2016, Project 2016, Visio 2016.

Office, Project and Visio must be volume license versions.

diff --git a/vlmcsd.8.pdf b/vlmcsd.8.pdf index 7fde8c8..6741219 100644 Binary files a/vlmcsd.8.pdf and b/vlmcsd.8.pdf differ diff --git a/vlmcsd.8.unix.txt b/vlmcsd.8.unix.txt index 9f6492a..d8ea808 100644 --- a/vlmcsd.8.unix.txt +++ b/vlmcsd.8.unix.txt @@ -239,8 +239,8 @@ OPTIONS -3 ePID - Use ePID as Office 2013 ePID (including Project and Visio). If - specified, -r is disregarded for Office 2013. + Use ePID as Office 2013/2016 ePID (including Project and Visio). + If specified, -r is disregarded for Office 2013/2016. -H HwId @@ -454,17 +454,18 @@ SIGNALS SUPPORTED OPERATING SYSTEMS vlmcsd compiles and runs on Linux, Windows (no Cygwin required but - explicitly supported), Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, - Solaris, OpenIndiana, Android and iOS. Other POSIX or unixoid OSses may - work with unmodified sources or may require minor porting efforts. + explicitly supported), Mac OS X, FreeBSD, NetBSD, OpenBSD, Dragonfly + BSD, Minix, Solaris, OpenIndiana, Android and iOS. Other POSIX or + unixoid OSses may work with unmodified sources or may require minor + porting efforts. SUPPORTED PRODUCTS - vlmcsd can answer activation requests for the following products: Win‐ - dows Vista, Windows 7, Windows 8, Windows 8.1, Windows 10, Windows - Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows - Server 2012 R2, Office 2010, Project 2010, Visio 2010, Office 2013, - Project 2013, Visio 2013. + vlmcsd can answer activation requests for the following products: Win‐ + dows Vista, Windows 7, Windows 8, Windows 8.1, Windows 10, Windows + Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows + Server 2012 R2, Office 2010, Project 2010, Visio 2010, Office 2013, + Project 2013, Visio 2013, Office 2016, Project 2016, Visio 2016. Office, Project and Visio must be volume license versions. @@ -475,24 +476,24 @@ FILES EXAMPLES vlmcsd -f - Starts vlmcsd in foreground. Useful if you use it for the first - time and want to see what's happening when a client requests + Starts vlmcsd in foreground. Useful if you use it for the first + time and want to see what's happening when a client requests activation. vlmcsd -l /var/log/vlmcsd.log - Starts vlmcsd as a daemon and logs everything to /var/log/vlm‐ + Starts vlmcsd as a daemon and logs everything to /var/log/vlm‐ csd.log. vlmcsd -L 192.168.1.17 Starts vlmcsd as a daemon and listens on IP address 192.168.1.17 - only. This is useful for routers that have a public and a pri‐ + only. This is useful for routers that have a public and a pri‐ vate IP address to prevent your KMS server from becoming public. vlmcsd -s -U /n -l C:\logs\vlmcsd.log - Installs vlmcsd as a Windows service with low privileges and + Installs vlmcsd as a Windows service with low privileges and logs everything to C:\logs\vlmcsd.log when the service is started with "net start vlmcsd". @@ -500,18 +501,18 @@ EXAMPLES BUGS An ePID specified in an ini file must not contain spaces. - The maximum number of -L options in the command line or listen state‐ + The maximum number of -L options in the command line or listen state‐ ments in the inifile is the platform default for FD_SETSIZE. This is 64 on Windows and 1024 on most Unixes. AUTHOR - Written by crony12, Hotbird64 and vityan666. With contributions from + Written by crony12, Hotbird64 and vityan666. With contributions from DougQaid. CREDITS - Thanks to CODYQX4, deagles, eIcn, mikmik38, nosferati87, qad, Rati‐ + Thanks to CODYQX4, deagles, eIcn, mikmik38, nosferati87, qad, Rati‐ borus, ... @@ -520,4 +521,4 @@ SEE ALSO -Hotbird64 July 2015 VLMCSD(8) +Hotbird64 September 2015 VLMCSD(8) diff --git a/vlmcsd.ini.5 b/vlmcsd.ini.5 index 8b35098..0b4edcc 100644 --- a/vlmcsd.ini.5 +++ b/vlmcsd.ini.5 @@ -1,4 +1,4 @@ -.TH VLMCSD.INI 5 "February 2015" "Hotbird64" "KMS Activation Manual" +.TH VLMCSD.INI 5 "September 2015" "Hotbird64" "KMS Activation Manual" .LO 8 .SH NAME @@ -101,7 +101,7 @@ Any valid GUID is being treated as a special \fBkeyword\fR in the ini file. It i .br 0ff1ce15\-a989\-479d\-af46\-f275c6370663\ (Office 2013) -To use specific ePIDs for Windows, Office 2010 and Office 2013 you could add the following lines to vlmcsd.ini: +To use specific ePIDs for Windows, Office 2010 and Office 2013/2016 you could add the following lines to vlmcsd.ini: .SM "55c92734\-d682\-4d71\-983e\-d6ec3f16059f\ =\ 55041\-00206\-184\-207146\-03\-1062\-6002.0000\-3322013" .br diff --git a/vlmcsd.ini.5.dos.txt b/vlmcsd.ini.5.dos.txt index e763742..e31dc3d 100644 --- a/vlmcsd.ini.5.dos.txt +++ b/vlmcsd.ini.5.dos.txt @@ -217,7 +217,7 @@ SPECIAL KEYWORDS 59a52881-a989-479d-af46-f275c6370663 (Office 2010) 0ff1ce15-a989-479d-af46-f275c6370663 (Office 2013) - To use specific ePIDs for Windows, Office 2010 and Office 2013 you + To use specific ePIDs for Windows, Office 2010 and Office 2013/2016 you could add the following lines to vlmcsd.ini: 55c92734-d682-4d71-983e-d6ec3f16059f = 55041-00206-184-207146-03-1062-6002.0000-3322013 @@ -265,4 +265,4 @@ SEE ALSO -Hotbird64 February 2015 VLMCSD.INI(5) +Hotbird64 September 2015 VLMCSD.INI(5) diff --git a/vlmcsd.ini.5.html b/vlmcsd.ini.5.html index 827351a..84f1860 100644 --- a/vlmcsd.ini.5.html +++ b/vlmcsd.ini.5.html @@ -1,5 +1,5 @@ - + @@ -380,8 +380,8 @@ application GUIDs:

2013)

To use specific -ePIDs for Windows, Office 2010 and Office 2013 you could add -the following lines to vlmcsd.ini:

+ePIDs for Windows, Office 2010 and Office 2013/2016 you +could add the following lines to vlmcsd.ini:

55c92734−d682−4d71−983e−d6ec3f16059f = 55041−00206−184−207146−03−1062−6002.0000−3322013 diff --git a/vlmcsd.ini.5.pdf b/vlmcsd.ini.5.pdf index dc78cfb..af28f97 100644 Binary files a/vlmcsd.ini.5.pdf and b/vlmcsd.ini.5.pdf differ diff --git a/vlmcsd.ini.5.unix.txt b/vlmcsd.ini.5.unix.txt index 25fe161..a0492a4 100644 --- a/vlmcsd.ini.5.unix.txt +++ b/vlmcsd.ini.5.unix.txt @@ -217,7 +217,7 @@ SPECIAL KEYWORDS 59a52881-a989-479d-af46-f275c6370663 (Office 2010) 0ff1ce15-a989-479d-af46-f275c6370663 (Office 2013) - To use specific ePIDs for Windows, Office 2010 and Office 2013 you + To use specific ePIDs for Windows, Office 2010 and Office 2013/2016 you could add the following lines to vlmcsd.ini: 55c92734-d682-4d71-983e-d6ec3f16059f = 55041-00206-184-207146-03-1062-6002.0000-3322013 @@ -265,4 +265,4 @@ SEE ALSO -Hotbird64 February 2015 VLMCSD.INI(5) +Hotbird64 September 2015 VLMCSD.INI(5) diff --git a/vlmcsd_all.c b/vlmcsd_all.c index 8440b6a..6c71a5e 100644 --- a/vlmcsd_all.c +++ b/vlmcsd_all.c @@ -3985,7 +3985,7 @@ __pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument) { if ( !strncasecmp(argument, "true", 4) || - !strncasecmp(argument, "on", 4) || + !strncasecmp(argument, "on", 2) || !strncasecmp(argument, "yes", 3) || !strncasecmp(argument, "1", 1) ) diff --git a/vlmcsdmulti.1.html b/vlmcsdmulti.1.html index 169045a..d1d0cc8 100644 --- a/vlmcsdmulti.1.html +++ b/vlmcsdmulti.1.html @@ -1,5 +1,5 @@ - + diff --git a/vlmcsdmulti.1.pdf b/vlmcsdmulti.1.pdf index 8f4bd1e..ccb297e 100644 Binary files a/vlmcsdmulti.1.pdf and b/vlmcsdmulti.1.pdf differ diff --git a/vlmcsdmulti_all.c b/vlmcsdmulti_all.c index 1646e09..40fe62b 100644 --- a/vlmcsdmulti_all.c +++ b/vlmcsdmulti_all.c @@ -5359,7 +5359,7 @@ __pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument) { if ( !strncasecmp(argument, "true", 4) || - !strncasecmp(argument, "on", 4) || + !strncasecmp(argument, "on", 2) || !strncasecmp(argument, "yes", 3) || !strncasecmp(argument, "1", 1) ) @@ -7542,7 +7542,7 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b char* querystring = (char*)alloca(strlen(query) + 12); strcpy(querystring, "_vlmcs._tcp"); strcat(querystring, query); - bytes_received = res_query(querystring, C_IN, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE); + bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE); # endif } else