samba36: move to trunk and add myself as a maintainer

SVN-Revision: 33689

22 files changed, 11211 insertions, 0 deletions

diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
new file mode 100644
index 0000000000..9330050e10
--- /dev/null
+++ b/package/network/services/samba36/Makefile
@@ -0,0 +1,142 @@
+#
+# Copyright (C) 2007-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=samba
+PKG_VERSION:=3.6.5
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
+	http://ftp.samba.org/pub/samba/old-versions
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=2f0c14547333c1b48fd4728b031e7040
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+MAKE_PATH:=source3
+CONFIGURE_PATH:=source3
+
+PKG_BUILD_BIN:=$(PKG_BUILD_DIR)/$(MAKE_PATH)/bin
+
+define Package/samba36-server
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Samba 3.6 SMB/CIFS server
+  URL:=http://www.samba.org/
+  DEPENDS:=+USE_EGLIBC:librt
+endef
+
+define Package/samba36-client
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Samba 3.6 SMB/CIFS client
+  URL:=http://www.samba.org/
+  DEPENDS:=+libreadline +libncurses
+endef
+
+define Package/samba36-server/config
+	config PACKAGE_SAMBA_MAX_DEBUG_LEVEL
+		int "Maximum level of compiled-in debug messages"
+		depends PACKAGE_samba36-server || PACKAGE_samba36-client
+		default -1
+
+endef
+
+define Package/samba36-server/description
+ The Samba software suite is a collection of programs that implements the
+ SMB protocol for UNIX systems, allowing you to serve files and printers to
+ Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred
+ to as the LanManager or Netbios protocol.
+endef
+
+TARGET_CFLAGS += -DMAX_DEBUG_LEVEL=$(CONFIG_PACKAGE_SAMBA_MAX_DEBUG_LEVEL) -D__location__=\\\"\\\" -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+CONFIGURE_VARS += \
+	ac_cv_file__proc_sys_kernel_core_pattern=yes \
+	libreplace_cv_HAVE_C99_VSNPRINTF=yes \
+	libreplace_cv_HAVE_GETADDRINFO=yes \
+	libreplace_cv_HAVE_IFACE_IFCONF=yes \
+	LINUX_LFS_SUPPORT=yes \
+	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
+	samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
+	samba_cv_HAVE_IFACE_IFCONF=yes \
+	samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
+	samba_cv_HAVE_SECURE_MKSTEMP=yes \
+	samba_cv_HAVE_WRFILE_KEYTAB=no \
+	samba_cv_USE_SETREUID=yes \
+	samba_cv_USE_SETRESUID=yes \
+	samba_cv_have_setreuid=yes \
+	samba_cv_have_setresuid=yes \
+	ac_cv_header_zlib_h=no \
+	samba_cv_zlib_1_2_3=no
+
+CONFIGURE_ARGS += \
+	--exec-prefix=/usr \
+	--prefix=/ \
+	--disable-avahi \
+	--disable-cups \
+	--disable-pie \
+	--disable-relro \
+	--disable-static \
+	--disable-swat \
+	--disable-shared-libs \
+	--with-codepagedir=/etc/samba \
+	--with-configdir=/etc/samba \
+	--with-included-iniparser \
+	--with-included-popt \
+	--with-lockdir=/var/lock \
+	--with-logfilebase=/var/log \
+	--with-nmbdsocketdir=/var/nmbd \
+	--with-piddir=/var/run \
+	--with-privatedir=/etc/samba \
+	--with-sendfile-support \
+	--without-cluster-support \
+	--without-ads \
+	--without-krb5 \
+	--without-ldap \
+	--without-pam \
+	--without-winbind \
+	--without-libtdb \
+	--without-libtalloc \
+	--without-libnetapi \
+	--without-libsmbclient \
+	--without-libsmbsharemodes \
+	--without-libaddns \
+	--with-shared-modules=pdb_tdbsam,pdb_wbc_sam,idmap_nss,nss_info_template,auth_winbind,auth_wbc,auth_domain
+
+MAKE_FLAGS += DYNEXP= PICFLAG= MODULES=
+
+define Package/samba36-server/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba
+	$(INSTALL_DIR) $(1)/etc/samba
+	$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/valid.dat $(1)/etc/samba
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/samba.init $(1)/etc/init.d/samba
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_BIN)/samba_multicall $(1)/usr/sbin
+	ln -sf samba_multicall $(1)/usr/sbin/smbd
+	ln -sf samba_multicall $(1)/usr/sbin/nmbd
+	ln -sf samba_multicall $(1)/usr/sbin/smbpasswd
+endef
+
+define Package/samba36-client/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_BIN)/smbclient $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_BIN)/nmblookup $(1)/usr/sbin
+endef
+
+$(eval $(call BuildPackage,samba36-client))
+$(eval $(call BuildPackage,samba36-server))
+
diff --git a/package/network/services/samba36/files/samba.config b/package/network/services/samba36/files/samba.config
new file mode 100644
index 0000000000..c79db0d322
--- /dev/null
+++ b/package/network/services/samba36/files/samba.config
@@ -0,0 +1,6 @@
+config samba
+	option 'name'			'OpenWrt'
+	option 'workgroup'		'WORKGROUP'
+	option 'description'		'OpenWrt'
+	option 'homes'			'1'
+
diff --git a/package/network/services/samba36/files/samba.init b/package/network/services/samba36/files/samba.init
new file mode 100755
index 0000000000..61398d8f4f
--- /dev/null
+++ b/package/network/services/samba36/files/samba.init
@@ -0,0 +1,97 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2012 OpenWrt.org
+
+START=60
+
+smb_header() {
+	local interface
+	config_get interface $1 interface "loopback lan"
+
+	# resolve interfaces
+	local interfaces=$(
+		. /lib/functions/network.sh
+
+		local net
+		for net in $interface; do
+			local device
+			network_get_device device "$net" && {
+				local subnet
+				network_get_subnet  subnet "$net" && echo -n "$subnet "
+				network_get_subnet6 subnet "$net" && echo -n "$subnet "
+			}
+
+			echo -n "${device:-$net} "
+		done
+	)
+
+	local name workgroup description charset
+	local hostname="$(uci_get system.@system[0].hostname)"
+
+	config_get name        $1 name        "${hostname:-OpenWrt}"
+	config_get workgroup   $1 workgroup   "${hostname:-OpenWrt}"
+	config_get description $1 description "Samba on ${hostname:-OpenWrt}"
+	config_get charset     $1 charset     "UTF-8"
+
+	mkdir -p /var/etc
+	sed -e "s#|NAME|#$name#g" \
+	    -e "s#|WORKGROUP|#$workgroup#g" \
+	    -e "s#|DESCRIPTION|#$description#g" \
+	    -e "s#|INTERFACES|#$interfaces#g" \
+	    -e "s#|CHARSET|#$charset#g" \
+	    /etc/samba/smb.conf.template > /var/etc/smb.conf
+
+	local homes
+	config_get_bool homes $1 homes 0
+	[ $homes -gt 0 ] && {
+		cat <<EOT >> /var/etc/smb.conf
+
+[homes]
+	comment     = Home Directories
+	browsable   = no
+	read only   = no
+	create mode = 0750
+EOT
+	}
+
+	[ -L /etc/samba/smb.conf ] || ln -nsf /var/etc/smb.conf /etc/samba/smb.conf
+}
+
+smb_add_share() {
+	local name
+	local path
+	local users
+	local read_only
+	local guest_ok
+	local create_mask
+	local dir_mask
+
+	config_get name $1 name
+	config_get path $1 path
+	config_get users $1 users
+	config_get read_only $1 read_only
+	config_get guest_ok $1 guest_ok
+	config_get create_mask $1 create_mask
+	config_get dir_mask $1 dir_mask
+
+	[ -z "$name" -o -z "$path" ] && return
+
+	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
+	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
+	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf
+	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/smb.conf
+	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/smb.conf
+	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/smb.conf
+}
+
+start() {
+	config_load samba
+	config_foreach smb_header samba
+	config_foreach smb_add_share sambashare
+	service_start /usr/sbin/smbd -D
+	service_start /usr/sbin/nmbd -D
+}
+
+stop() {
+	service_stop /usr/sbin/smbd
+	service_stop /usr/sbin/nmbd
+}
diff --git a/package/network/services/samba36/files/smb.conf.template b/package/network/services/samba36/files/smb.conf.template
new file mode 100644
index 0000000000..38a385574b
--- /dev/null
+++ b/package/network/services/samba36/files/smb.conf.template
@@ -0,0 +1,34 @@
+[global]
+	netbios name = |NAME| 
+	display charset = |CHARSET|
+	interfaces = |INTERFACES|
+	server string = |DESCRIPTION|
+	unix charset = |CHARSET|
+	workgroup = |WORKGROUP|
+	browseable = yes
+	deadtime = 30
+	domain master = yes
+	encrypt passwords = true
+	enable core files = no
+	guest account = nobody
+	guest ok = yes
+	invalid users = root
+	local master = yes
+	load printers = no
+	map to guest = Bad User
+	max protocol = SMB2
+	min receivefile size = 16384
+	null passwords = yes
+	obey pam restrictions = yes
+	os level = 20
+	passdb backend = smbpasswd
+	preferred master = yes
+	printable = no
+	security = user
+	smb encrypt = disabled
+	smb passwd file = /etc/samba/smbpasswd
+	socket options = TCP_NODELAY IPTOS_LOWDELAY
+	syslog = 2
+	use sendfile = yes
+	writeable = yes
+	
diff --git a/package/network/services/samba36/patches/100-configure_fixes.patch b/package/network/services/samba36/patches/100-configure_fixes.patch
new file mode 100644
index 0000000000..0f20bbb7da
--- /dev/null
+++ b/package/network/services/samba36/patches/100-configure_fixes.patch
@@ -0,0 +1,14 @@
+--- a/source3/configure
++++ b/source3/configure
+@@ -13285,10 +13285,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINF
+ 	# see bug 5910, use our replacements if we detect
+ 	# a broken system.
+ 	if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++		$as_echo "assuming valid getaddrinfo without bug 5910" >&2
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/package/network/services/samba36/patches/110-multicall.patch b/package/network/services/samba36/patches/110-multicall.patch
new file mode 100644
index 0000000000..e667f06a69
--- /dev/null
+++ b/package/network/services/samba36/patches/110-multicall.patch
@@ -0,0 +1,117 @@
+--- a/source3/Makefile.in
++++ b/source3/Makefile.in
+@@ -73,20 +73,20 @@ LDAP_LIBS=@LDAP_LIBS@
+ NSCD_LIBS=@NSCD_LIBS@
+ UUID_LIBS=@UUID_LIBS@
+ LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
+-LIBWBCLIENT_LIBS=@LIBWBCLIENT_LIBS@
++LIBWBCLIENT_LIBS=@LIBWBCLIENT_STATIC@
+ PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
+ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
+ DNSSD_LIBS=@DNSSD_LIBS@
+ AVAHI_LIBS=@AVAHI_LIBS@
+ POPT_LIBS=@POPTLIBS@
+ LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
+-LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
++LIBTALLOC_LIBS=@LIBTALLOC_STATIC@
+ LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
+ LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
+-LIBTDB_LIBS=@LIBTDB_LIBS@
++LIBTDB_LIBS=@LIBTDB_STATIC@
+ TDB_DEPS=@TDB_DEPS@
+ LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@
+-LIBNETAPI_LIBS=@LIBNETAPI_LIBS@
++LIBNETAPI_LIBS=@LIBNETAPI_STATIC@
+ LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
+ LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
+ 
+@@ -214,7 +214,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_P
+ 
+ # Note that all executable programs now provide for an optional executable suffix.
+ 
+-SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
++SBIN_PROGS = bin/samba_multicall@EXEEXT@ bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
+ 
+ BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
+ 	bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \
+@@ -1774,6 +1774,42 @@ bin/.dummy:
+ 	  dir=bin $(MAKEDIR); fi
+ 	@: >> $@ || : > $@ # what a fancy emoticon!
+ 
++smbd/server_multicall.o: smbd/server.c smbd/server.o
++	@echo Compiling $<.c
++	@$(COMPILE_CC_PATH) -Dmain=smbd_main && exit 0;\
++		echo "The following command failed:" 1>&2;\
++		echo "$(COMPILE_CC_PATH)" 1>&2;\
++		$(COMPILE_CC_PATH) >/dev/null 2>&1
++
++nmbd/nmbd_multicall.o: nmbd/nmbd.c nmbd/nmbd.o
++	@echo Compiling $<.c
++	@$(COMPILE_CC_PATH) -Dmain=nmbd_main && exit 0;\
++		echo "The following command failed:" 1>&2;\
++		echo "$(COMPILE_CC_PATH)" 1>&2;\
++		$(COMPILE_CC_PATH) >/dev/null 2>&1
++
++utils/smbpasswd_multicall.o: utils/smbpasswd.c utils/smbpasswd.o
++	@echo Compiling $<.c
++	@$(COMPILE_CC_PATH) -Dmain=smbpasswd_main && exit 0;\
++		echo "The following command failed:" 1>&2;\
++		echo "$(COMPILE_CC_PATH)" 1>&2;\
++		$(COMPILE_CC_PATH) >/dev/null 2>&1
++
++SMBD_MULTI_O = $(patsubst smbd/server.o,smbd/server_multicall.o,$(SMBD_OBJ))
++NMBD_MULTI_O = $(patsubst nmbd/nmbd.o,nmbd/nmbd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(NMBD_OBJ)))
++SMBPASSWD_MULTI_O = $(patsubst utils/smbpasswd.o,utils/smbpasswd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(SMBPASSWD_OBJ)))
++MULTI_O = multi.o
++
++MULTICALL_O = $(sort $(SMBD_MULTI_O) $(NMBD_MULTI_O) $(SMBPASSWD_MULTI_O) $(MULTI_O))
++
++bin/samba_multicall@EXEEXT@: $(BINARY_PREREQS) $(MULTICALL_O) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
++	@echo Linking $@
++	@$(CC) -o $@ $(MULTICALL_O) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
++		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
++		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
++		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
++		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
++
+ bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
+ 	@echo Linking $@
+ 	@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
+--- /dev/null
++++ b/source3/multi.c
+@@ -0,0 +1,35 @@
++#include <stdio.h>
++#include <string.h>
++
++extern int smbd_main(int argc, char **argv);
++extern int nmbd_main(int argc, char **argv);
++extern int smbpasswd_main(int argc, char **argv);
++
++static struct {
++	const char *name;
++	int (*func)(int argc, char **argv);
++} multicall[] = {
++	{ "smbd", smbd_main },
++	{ "nmbd", nmbd_main },
++	{ "smbpasswd", smbpasswd_main },
++};
++
++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
++
++int main(int argc, char **argv)
++{
++	int i;
++
++	for (i = 0; i < ARRAY_SIZE(multicall); i++) {
++		if (strstr(argv[0], multicall[i].name))
++			return multicall[i].func(argc, argv);
++	}
++
++	fprintf(stderr, "Invalid multicall command, available commands:");
++	for (i = 0; i < ARRAY_SIZE(multicall); i++)
++		fprintf(stderr, " %s", multicall[i].name);
++
++	fprintf(stderr, "\n");
++
++	return 1;
++}
diff --git a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
new file mode 100644
index 0000000000..d8089a34ec
--- /dev/null
+++ b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
@@ -0,0 +1,277 @@
+--- a/source3/Makefile.in
++++ b/source3/Makefile.in
+@@ -1016,7 +1016,7 @@ TEST_LP_LOAD_OBJ = param/test_lp_load.o 
+ 
+ PASSWD_UTIL_OBJ = utils/passwd_util.o
+ 
+-SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
++SMBPASSWD_OBJ = utils/owrt_smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
+ 		$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
+ 		$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
+ 		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
+@@ -1788,7 +1788,7 @@ nmbd/nmbd_multicall.o: nmbd/nmbd.c nmbd/
+ 		echo "$(COMPILE_CC_PATH)" 1>&2;\
+ 		$(COMPILE_CC_PATH) >/dev/null 2>&1
+ 
+-utils/smbpasswd_multicall.o: utils/smbpasswd.c utils/smbpasswd.o
++utils/smbpasswd_multicall.o: utils/owrt_smbpasswd.c utils/owrt_smbpasswd.o
+ 	@echo Compiling $<.c
+ 	@$(COMPILE_CC_PATH) -Dmain=smbpasswd_main && exit 0;\
+ 		echo "The following command failed:" 1>&2;\
+@@ -1797,7 +1797,7 @@ utils/smbpasswd_multicall.o: utils/smbpa
+ 
+ SMBD_MULTI_O = $(patsubst smbd/server.o,smbd/server_multicall.o,$(SMBD_OBJ))
+ NMBD_MULTI_O = $(patsubst nmbd/nmbd.o,nmbd/nmbd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(NMBD_OBJ)))
+-SMBPASSWD_MULTI_O = $(patsubst utils/smbpasswd.o,utils/smbpasswd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(SMBPASSWD_OBJ)))
++SMBPASSWD_MULTI_O = $(patsubst utils/owrt_smbpasswd.o,utils/smbpasswd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(SMBPASSWD_OBJ)))
+ MULTI_O = multi.o
+ 
+ MULTICALL_O = $(sort $(SMBD_MULTI_O) $(NMBD_MULTI_O) $(SMBPASSWD_MULTI_O) $(MULTI_O))
+--- /dev/null
++++ b/source3/utils/owrt_smbpasswd.c
+@@ -0,0 +1,245 @@
++/*
++ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++ * more details.
++ *
++ * You should have received a copy of the GNU General Public License along with
++ * this program; if not, write to the Free Software Foundation, Inc., 675
++ * Mass Ave, Cambridge, MA 02139, USA.  */
++
++#include "includes.h"
++#include <endian.h>
++#include <stdio.h>
++
++static char buf[256];
++
++static void md4hash(const char *passwd, uchar p16[16])
++{
++	int len;
++	smb_ucs2_t wpwd[129];
++	int i;
++
++	len = strlen(passwd);
++	for (i = 0; i < len; i++) {
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++		wpwd[i] = (unsigned char)passwd[i];
++#else
++		wpwd[i] = (unsigned char)passwd[i] << 8;
++#endif
++	}
++	wpwd[i] = 0;
++
++	len = len * sizeof(int16);
++	mdfour(p16, (unsigned char *)wpwd, len);
++	ZERO_STRUCT(wpwd);
++}
++
++
++static bool find_passwd_line(FILE *fp, const char *user, char **next)
++{
++	char *p1;
++
++	while (!feof(fp)) {
++		if(!fgets(buf, sizeof(buf) - 1, fp))
++			continue;
++
++		p1 = strchr(buf, ':');
++
++		if (p1 - buf != strlen(user))
++			continue;
++
++		if (strncmp(buf, user, p1 - buf) != 0)
++			continue;
++
++		if (next)
++			*next = p1;
++		return true;
++	}
++	return false;
++}
++
++/* returns -1 if user is not present in /etc/passwd*/
++static int find_uid_for_user(const char *user)
++{
++	FILE *fp;
++	char *p1, *p2, *p3;
++	int ret = -1;
++
++	fp = fopen("/etc/passwd", "r");
++	if (!fp) {
++		printf("failed to open /etc/passwd");
++		goto out;
++	}
++
++	if (!find_passwd_line(fp, user, &p1)) {
++		printf("User %s not found or invalid in /etc/passwd\n");
++		goto out;
++	}
++
++	p2 = strchr(p1 + 1, ':');
++	if (!p2)
++		goto out;
++
++	p2++;
++	p3 = strchr(p2, ':');
++	if (!p1)
++		goto out;
++
++	*p3 = '\0';
++	ret = atoi(p2);
++
++out:
++	if(fp)
++		fclose(fp);
++	return ret;
++}
++
++static void smbpasswd_write_user(FILE *fp, const char *user, int uid, const char *password)
++{
++	static uchar nt_p16[NT_HASH_LEN];
++	int len = 0;
++	int i;
++
++	md4hash(strdup(password), nt_p16);
++
++	len += snprintf(buf + len, sizeof(buf) - len, "%s:%u:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:", user, uid);
++	for(i = 0; i < NT_HASH_LEN; i++)
++		len += snprintf(buf + len, sizeof(buf) - len, "%02X", nt_p16[i]);
++
++	snprintf(buf + len, sizeof(buf) - len, ":[U          ]:LCT-00000001:\n");
++	fputs(buf, fp);
++}
++
++static void smbpasswd_delete_user(FILE *fp)
++{
++	fpos_t r_pos, w_pos;
++	int len = strlen(buf);
++
++	fgetpos(fp, &r_pos);
++	w_pos = r_pos;
++	w_pos.__pos -= len;
++
++	while (fgets(buf, sizeof(buf) - 1, fp)) {
++		int cur_len = strlen(buf);
++
++		fsetpos(fp, &w_pos);
++		fputs(buf, fp);
++		r_pos.__pos += cur_len;
++		w_pos.__pos += cur_len;
++		fsetpos(fp, &r_pos);
++	}
++
++	ftruncate(fileno(fp), w_pos.__pos);
++}
++
++static int usage(const char *progname)
++{
++	fprintf(stderr,
++		"Usage: %s [options] <username>\n"
++		"\n"
++		"Options:\n"
++		"  -s		read password from stdin\n"
++		"  -a		add user\n"
++		"  -x		delete user\n",
++		progname);
++	return 1;
++}
++
++int main(int argc, char **argv)
++{
++	const char *prog = argv[0];
++	const char *user;
++	char *pw1, *pw2;
++	FILE *fp;
++	bool add = false, delete = false, get_stdin = false, found;
++	int ch;
++	int uid;
++
++	TALLOC_CTX *frame = talloc_stackframe();
++
++	while ((ch = getopt(argc, argv, "asx")) != EOF) {
++		switch (ch) {
++		case 's':
++			get_stdin = true;
++			break;
++		case 'a':
++			add = true;
++			break;
++		case 'x':
++			delete = true;
++			break;
++		default:
++			return usage(prog);
++		}
++	}
++
++	if (add && delete)
++		return usage(prog);
++
++	argc -= optind;
++	argv += optind;
++
++	if (!argc)
++		return usage(prog);
++
++	user = argv[0];
++	if (!delete) {
++		uid = find_uid_for_user(user);
++		if (uid < 0) {
++			fprintf(stderr, "Could not find user '%s' in /etc/passwd\n", user);
++			return 2;
++		}
++	}
++
++	fp = fopen("/etc/samba/smbpasswd", "r+");
++	if(!fp) {
++		fprintf(stderr, "Failed to open /etc/samba/smbpasswd");
++		return 3;
++	}
++
++	found = find_passwd_line(fp, user, NULL);
++	if (!add && !found) {
++		fprintf(stderr, "Could not find user '%s' in /etc/samba/smbpasswd\n", user);
++		return 3;
++	}
++
++	if (delete) {
++		smbpasswd_delete_user(fp);
++		goto out;
++	}
++
++	pw1 = get_pass("New SMB password:", get_stdin);
++	if (!pw1)
++		pw1 = strdup("");
++
++	pw2 = get_pass("Retype SMB password:", get_stdin);
++	if (!pw2)
++		pw2 = strdup("");
++
++	if (strcmp(pw1, pw2) != 0) {
++		fprintf(stderr, "Mismatch - password unchanged.\n");
++		goto out_free;
++	}
++
++	if (found)
++		fseek(fp, -strlen(buf), SEEK_CUR);
++	smbpasswd_write_user(fp, user, uid, pw2);
++
++out_free:
++	free(pw1);
++	free(pw2);
++out:
++	fclose(fp);
++	TALLOC_FREE(frame);
++
++	return 0;
++}
diff --git a/package/network/services/samba36/patches/120-add_missing_ifdef.patch b/package/network/services/samba36/patches/120-add_missing_ifdef.patch
new file mode 100644
index 0000000000..dbd9adc1d7
--- /dev/null
+++ b/package/network/services/samba36/patches/120-add_missing_ifdef.patch
@@ -0,0 +1,26 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -119,9 +119,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
+ 		return false;
+ 	}
++#ifdef DEVELOPER
+ 	if (!smb_register_ndr_interface(&ndr_table_rpcecho)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_initshutdown)) {
+ 		return false;
+ 	}
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -628,7 +628,9 @@ static struct cmd_set *rpcclient_command
+ 	netlogon_commands,
+ 	srvsvc_commands,
+ 	dfs_commands,
++#ifdef DEVELOPER
+ 	echo_commands,
++#endif
+ 	epmapper_commands,
+ 	shutdown_commands,
+  	test_commands,
diff --git a/package/network/services/samba36/patches/200-remove_printer_support.patch b/package/network/services/samba36/patches/200-remove_printer_support.patch
new file mode 100644
index 0000000000..46254ba297
--- /dev/null
+++ b/package/network/services/samba36/patches/200-remove_printer_support.patch
@@ -0,0 +1,356 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -1110,6 +1110,10 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 					   "rpc_server",
+ 					   "spoolss",
+ 					   "embedded");
++#ifndef PRINTER_SUPPORT
++	if (1) {
++	} else
++#endif
+ 	if (StrCaseCmp(rpcsrv_type, "embedded") == 0) {
+ 		spoolss_cb.init         = spoolss_init_cb;
+ 		spoolss_cb.shutdown     = spoolss_shutdown_cb;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -624,7 +624,9 @@ static struct cmd_set *rpcclient_command
+ 	lsarpc_commands,
+ 	ds_commands,
+ 	samr_commands,
++#ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
++#endif
+ 	netlogon_commands,
+ 	srvsvc_commands,
+ 	dfs_commands,
+--- a/source3/printing/spoolssd.c
++++ b/source3/printing/spoolssd.c
+@@ -153,6 +153,10 @@ void start_spoolssd(struct tevent_contex
+ 	NTSTATUS status;
+ 	int ret;
+ 
++#ifndef PRINTER_SUPPORT
++	return;
++#endif
++
+ 	DEBUG(1, ("Forking SPOOLSS Daemon\n"));
+ 
+ 	pid = sys_fork();
+--- a/source3/utils/net_rpc.c
++++ b/source3/utils/net_rpc.c
+@@ -7791,6 +7791,10 @@ int net_rpc_printer(struct net_context *
+ 		{NULL, NULL, 0, NULL, NULL}
+ 	};
+ 
++#ifndef PRINTER_SUPPORT
++	return 0;
++#endif
++
+ 	if (argc == 0) {
+ 		if (c->display_usage) {
+ 			d_printf(_("Usage:\n"));
+--- a/source3/smbd/reply.c
++++ b/source3/smbd/reply.c
+@@ -5194,7 +5194,11 @@ void reply_printopen(struct smb_request 
+ 		return;
+ 	}
+ 
+-	if (!CAN_PRINT(conn)) {
++
++#ifdef PRINTER_SUPPORT
++	if (!CAN_PRINT(conn))
++#endif
++	{
+ 		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+ 		END_PROFILE(SMBsplopen);
+ 		return;
+@@ -5300,7 +5304,10 @@ void reply_printqueue(struct smb_request
+ 	   is really quite gross and only worked when there was only
+ 	   one printer - I think we should now only accept it if they
+ 	   get it right (tridge) */
+-	if (!CAN_PRINT(conn)) {
++#ifdef PRINTER_SUPPORT
++	if (!CAN_PRINT(conn))
++#endif
++	{
+ 		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+ 		END_PROFILE(SMBsplretq);
+ 		return;
+--- a/source3/smbd/lanman.c
++++ b/source3/smbd/lanman.c
+@@ -784,6 +784,10 @@ static bool api_DosPrintQGetInfo(struct 
+ 	union spoolss_JobInfo *job_info = NULL;
+ 	union spoolss_PrinterInfo printer_info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -999,6 +1003,10 @@ static bool api_DosPrintQEnum(struct smb
+ 	union spoolss_DriverInfo *driver_info;
+ 	union spoolss_JobInfo **job_info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!param_format || !output_format1 || !p) {
+ 		return False;
+ 	}
+@@ -3350,6 +3358,10 @@ static bool api_RDosPrintJobDel(struct s
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	enum spoolss_JobControl command;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -3483,6 +3495,10 @@ static bool api_WPrintQueueCtrl(struct s
+ 	struct sec_desc_buf secdesc_ctr;
+ 	enum spoolss_PrinterControl command;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !QueueName) {
+ 		return False;
+ 	}
+@@ -3649,6 +3665,10 @@ static bool api_PrintJobInfo(struct smbd
+ 	union spoolss_JobInfo info;
+ 	struct spoolss_SetJobInfo1 info1;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -4792,6 +4812,10 @@ static bool api_WPrintJobGetInfo(struct 
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	union spoolss_JobInfo info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -4930,6 +4954,10 @@ static bool api_WPrintJobEnumerate(struc
+ 	uint32_t count = 0;
+ 	union spoolss_JobInfo *info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5135,6 +5163,10 @@ static bool api_WPrintDestGetInfo(struct
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	union spoolss_PrinterInfo info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5271,6 +5303,10 @@ static bool api_WPrintDestEnum(struct sm
+ 	union spoolss_PrinterInfo *info;
+ 	uint32_t count;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5374,6 +5410,10 @@ static bool api_WPrintDriverEnum(struct 
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5438,6 +5478,10 @@ static bool api_WPrintQProcEnum(struct s
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5502,6 +5546,10 @@ static bool api_WPrintPortEnum(struct sm
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -142,7 +142,9 @@ static void exit_server_common(enum serv
+ 		rpc_eventlog_shutdown();
+ 		rpc_ntsvcs_shutdown();
+ 		rpc_svcctl_shutdown();
++#ifdef PRINTER_SUPPORT
+ 		rpc_spoolss_shutdown();
++#endif
+ 
+ 		rpc_srvsvc_shutdown();
+ 		rpc_winreg_shutdown();
+--- a/source3/smbd/open.c
++++ b/source3/smbd/open.c
+@@ -1556,6 +1556,9 @@ static NTSTATUS open_file_ntcreate(conne
+ 		 * Most of the passed parameters are ignored.
+ 		 */
+ 
++#ifndef PRINTER_SUPPORT
++		return NT_STATUS_ACCESS_DENIED;
++#endif
+ 		if (pinfo) {
+ 			*pinfo = FILE_WAS_CREATED;
+ 		}
+--- a/source3/smbd/close.c
++++ b/source3/smbd/close.c
+@@ -638,6 +638,9 @@ static NTSTATUS close_normal_file(struct
+ 	status = ntstatus_keeperror(status, tmp);
+ 
+ 	if (fsp->print_file) {
++#ifndef PRINTER_SUPPORT
++		return NT_STATUS_OK;
++#endif
+ 		/* FIXME: return spool errors */
+ 		print_spool_end(fsp, close_type);
+ 		file_free(req, fsp);
+--- a/source3/smbd/fileio.c
++++ b/source3/smbd/fileio.c
+@@ -298,6 +298,10 @@ ssize_t write_file(struct smb_request *r
+ 		uint32_t t;
+ 		int ret;
+ 
++#ifndef PRINTER_SUPPORT
++		return -1;
++#endif
++
+ 		ret = print_spool_write(fsp, data, n, pos, &t);
+ 		if (ret) {
+ 			errno = ret;
+--- a/source3/smbd/smb2_create.c
++++ b/source3/smbd/smb2_create.c
+@@ -485,7 +485,10 @@ static struct tevent_req *smbd_smb2_crea
+ 		info = FILE_WAS_OPENED;
+ 	} else if (CAN_PRINT(smb1req->conn)) {
+ 		status = file_new(smb1req, smb1req->conn, &result);
+-		if(!NT_STATUS_IS_OK(status)) {
++#ifdef PRINTER_SUPPORT
++		if(!NT_STATUS_IS_OK(status))
++#endif
++		{
+ 			tevent_req_nterror(req, status);
+ 			return tevent_req_post(req, ev);
+ 		}
+--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
++++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
+@@ -85,9 +85,11 @@ bool init_service_op_table( void )
+ 
+ 	/* add builtin services */
+ 
++#ifdef PRINTER_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "Spooler" );
+ 	svcctl_ops[i].ops  = &spoolss_svc_ops;
+ 	i++;
++#endif
+ 
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" );
+ 	svcctl_ops[i].ops  = &netlogon_svc_ops;
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -113,9 +113,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_winreg)) {
+ 		return false;
+ 	}
++#ifdef PRINTER_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_spoolss)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
+ 		return false;
+ 	}
+--- a/source3/smbd/process.c
++++ b/source3/smbd/process.c
+@@ -2475,8 +2475,10 @@ static bool housekeeping_fn(const struct
+ 
+ 	change_to_root_user();
+ 
++#ifdef PRINTER_SUPPORT
+ 	/* update printer queue caches if necessary */
+ 	update_monitored_printq_cache(sconn->msg_ctx);
++#endif
+ 
+ 	/* check if we need to reload services */
+ 	check_reload(sconn, time_mono(NULL));
+--- a/source3/smbd/server.c
++++ b/source3/smbd/server.c
+@@ -126,7 +126,9 @@ static void smb_pcap_updated(struct mess
+ {
+ 	struct tevent_context *ev_ctx =
+ 		talloc_get_type_abort(private_data, struct tevent_context);
+-
++#ifndef PRINTER_SUPPORT
++	return;
++#endif
+ 	DEBUG(10,("Got message saying pcap was updated. Reloading.\n"));
+ 	change_to_root_user();
+ 	reload_printers(ev_ctx, msg);
+@@ -1211,8 +1213,10 @@ extern void build_options(bool screen);
+ 	if (!W_ERROR_IS_OK(registry_init_full()))
+ 		exit(1);
+ 
++#ifdef PRINTER_SUPPORT
+ 	if (!print_backend_init(smbd_messaging_context()))
+ 		exit(1);
++#endif
+ 
+ 	/* Open the share_info.tdb here, so we don't have to open
+ 	   after the fork on every single connection.  This is a small
+@@ -1256,6 +1260,7 @@ extern void build_options(bool screen);
+ 		exit(1);
+ 	}
+ 
++#ifdef PRINTER_SUPPORT
+ 	/* Publish nt printers, this requires a working winreg pipe */
+ 	pcap_cache_reload(server_event_context(), smbd_messaging_context(),
+ 			  &reload_printers);
+@@ -1284,6 +1289,7 @@ extern void build_options(bool screen);
+ 				       smbd_messaging_context());
+ 		}
+ 	}
++#endif
+ 
+ 	if (!is_daemon) {
+ 		/* inetd mode */
diff --git a/package/network/services/samba36/patches/210-remove_ad_support.patch b/package/network/services/samba36/patches/210-remove_ad_support.patch
new file mode 100644
index 0000000000..d6b8a7e0b2
--- /dev/null
+++ b/package/network/services/samba36/patches/210-remove_ad_support.patch
@@ -0,0 +1,88 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -95,9 +95,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_lsarpc)) {
+ 		return false;
+ 	}
++#ifdef ACTIVE_DIRECTORY
+ 	if (!smb_register_ndr_interface(&ndr_table_dssetup)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_samr)) {
+ 		return false;
+ 	}
+@@ -141,9 +143,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_epmapper)) {
+ 		return false;
+ 	}
++#ifdef ACTIVE_DIRECTORY
+ 	if (!smb_register_ndr_interface(&ndr_table_drsuapi)) {
+ 		return false;
+ 	}
++#endif
+ 	return true;
+ }
+ 
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -918,6 +918,7 @@ static bool netdfs_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef ACTIVE_DIRECTORY
+ static bool dssetup_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -966,6 +967,7 @@ static bool dssetup_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool wkssvc_init_cb(void *ptr)
+ {
+@@ -1172,12 +1174,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 	}
+ #endif
+ 
++#ifdef ACTIVE_DIRECTORY
+ 	dssetup_cb.init         = dssetup_init_cb;
+ 	dssetup_cb.shutdown     = NULL;
+ 	dssetup_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_dssetup_init(&dssetup_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	wkssvc_cb.init         = wkssvc_init_cb;
+ 	wkssvc_cb.shutdown     = NULL;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -133,7 +133,9 @@ static void exit_server_common(enum serv
+ 
+ 	if (am_parent) {
+ 		rpc_wkssvc_shutdown();
++#ifdef ACTIVE_DIRECTORY
+ 		rpc_dssetup_shutdown();
++#endif
+ #ifdef DEVELOPER
+ 		rpc_rpcecho_shutdown();
+ #endif
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -2874,12 +2874,14 @@ NTSTATUS cli_rpc_pipe_open_noauth_transp
+ 	status = rpc_pipe_bind(result, auth);
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		int lvl = 0;
++#ifdef ACTIVE_DIRECTORY
+ 		if (ndr_syntax_id_equal(interface,
+ 					&ndr_table_dssetup.syntax_id)) {
+ 			/* non AD domains just don't have this pipe, avoid
+ 			 * level 0 statement in that case - gd */
+ 			lvl = 3;
+ 		}
++#endif
+ 		DEBUG(lvl, ("cli_rpc_pipe_open_noauth: rpc_pipe_bind for pipe "
+ 			    "%s failed with error %s\n",
+ 			    get_pipe_name_from_syntax(talloc_tos(), interface),
diff --git a/package/network/services/samba36/patches/220-remove_services.patch b/package/network/services/samba36/patches/220-remove_services.patch
new file mode 100644
index 0000000000..c09721af7c
--- /dev/null
+++ b/package/network/services/samba36/patches/220-remove_services.patch
@@ -0,0 +1,98 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -131,6 +131,7 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_initshutdown)) {
+ 		return false;
+ 	}
++#ifdef EXTRA_SERVICES
+ 	if (!smb_register_ndr_interface(&ndr_table_svcctl)) {
+ 		return false;
+ 	}
+@@ -140,6 +141,7 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_ntsvcs)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_epmapper)) {
+ 		return false;
+ 	}
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -697,6 +697,7 @@ static bool spoolss_shutdown_cb(void *pt
+ 	return true;
+ }
+ 
++#ifdef EXTRA_SERVICES
+ static bool svcctl_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -733,6 +734,7 @@ static bool svcctl_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool svcctl_shutdown_cb(void *ptr)
+ {
+@@ -741,6 +743,8 @@ static bool svcctl_shutdown_cb(void *ptr
+ 	return true;
+ }
+ 
++#ifdef EXTRA_SERVICES
++
+ static bool ntsvcs_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -802,6 +806,7 @@ static bool eventlog_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool initshutdown_init_cb(void *ptr)
+ {
+@@ -1130,6 +1135,7 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		}
+ 	}
+ 
++#ifdef EXTRA_SERVICES
+ 	svcctl_cb.init         = svcctl_init_cb;
+ 	svcctl_cb.shutdown     = svcctl_shutdown_cb;
+ 	svcctl_cb.private_data = ep_ctx;
+@@ -1150,6 +1156,7 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 	if (!NT_STATUS_IS_OK(rpc_eventlog_init(&eventlog_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	initshutdown_cb.init         = initshutdown_init_cb;
+ 	initshutdown_cb.shutdown     = NULL;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -141,9 +141,11 @@ static void exit_server_common(enum serv
+ #endif
+ 		rpc_netdfs_shutdown();
+ 		rpc_initshutdown_shutdown();
++#ifdef EXTRA_SERVICES
+ 		rpc_eventlog_shutdown();
+-		rpc_ntsvcs_shutdown();
+ 		rpc_svcctl_shutdown();
++		rpc_ntsvcs_shutdown();
++#endif
+ #ifdef PRINTER_SUPPORT
+ 		rpc_spoolss_shutdown();
+ #endif
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -637,9 +637,11 @@ static struct cmd_set *rpcclient_command
+ 	shutdown_commands,
+  	test_commands,
+ 	wkssvc_commands,
++#ifdef EXTRA_SERVICES
+ 	ntsvcs_commands,
+ 	drsuapi_commands,
+ 	eventlog_commands,
++#endif
+ 	winreg_commands,
+ 	NULL
+ };
diff --git a/package/network/services/samba36/patches/230-remove_winreg_support.patch b/package/network/services/samba36/patches/230-remove_winreg_support.patch
new file mode 100644
index 0000000000..5a4f656a72
--- /dev/null
+++ b/package/network/services/samba36/patches/230-remove_winreg_support.patch
@@ -0,0 +1,146 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -409,6 +409,7 @@ static bool epmapper_shutdown_cb(void *p
+ 	return true;
+ }
+ 
++#ifdef WINREG_SUPPORT
+ static bool winreg_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -456,6 +457,7 @@ static bool winreg_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool srvsvc_init_cb(void *ptr)
+ {
+@@ -710,10 +712,12 @@ static bool svcctl_init_cb(void *ptr)
+ 					   "epmapper",
+ 					   "none");
+ 
++#ifdef WINREG_SUPPORT
+ 	ok = svcctl_init_winreg(ep_ctx->msg_ctx);
+ 	if (!ok) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	/* initialize the control hooks */
+ 	init_service_op_table();
+@@ -785,10 +789,12 @@ static bool eventlog_init_cb(void *ptr)
+ 					   "epmapper",
+ 					   "none");
+ 
++#ifdef WINREG_SUPPORT
+ 	ok = eventlog_init_winreg(ep_ctx->msg_ctx);
+ 	if (!ok) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	if (StrCaseCmp(rpcsrv_type, "embedded") == 0 ||
+ 	    StrCaseCmp(rpcsrv_type, "daemon") == 0) {
+@@ -1077,12 +1083,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		}
+ 	}
+ 
++#ifdef WINREG_SUPPORT
+ 	winreg_cb.init         = winreg_init_cb;
+ 	winreg_cb.shutdown     = NULL;
+ 	winreg_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_winreg_init(&winreg_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	srvsvc_cb.init         = srvsvc_init_cb;
+ 	srvsvc_cb.shutdown     = NULL;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -151,7 +151,9 @@ static void exit_server_common(enum serv
+ #endif
+ 
+ 		rpc_srvsvc_shutdown();
++#ifdef WINREG_SUPPORT
+ 		rpc_winreg_shutdown();
++#endif
+ 
+ 		rpc_netlogon_shutdown();
+ 		rpc_samr_shutdown();
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -112,9 +112,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_wkssvc)) {
+ 		return false;
+ 	}
++#ifdef WINREG_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_winreg)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef PRINTER_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_spoolss)) {
+ 		return false;
+--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
++++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
+@@ -95,9 +95,11 @@ bool init_service_op_table( void )
+ 	svcctl_ops[i].ops  = &netlogon_svc_ops;
+ 	i++;
+ 
++#ifdef WINREG_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "RemoteRegistry" );
+ 	svcctl_ops[i].ops  = &winreg_svc_ops;
+ 	i++;
++#endif
+ 
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "WINS" );
+ 	svcctl_ops[i].ops  = &wins_svc_ops;
+--- a/source3/services/svc_winreg_glue.c
++++ b/source3/services/svc_winreg_glue.c
+@@ -88,6 +88,10 @@ struct security_descriptor *svcctl_get_s
+ 	NTSTATUS status;
+ 	WERROR result = WERR_OK;
+ 
++#ifndef WINREG_SUPPORT
++	return NULL;
++#endif
++
+ 	key = talloc_asprintf(mem_ctx,
+ 			      "%s\\%s\\Security",
+ 			      TOP_LEVEL_SERVICES_KEY, name);
+@@ -161,6 +165,10 @@ bool svcctl_set_secdesc(struct messaging
+ 	NTSTATUS status;
+ 	WERROR result = WERR_OK;
+ 
++#ifndef WINREG_SUPPORT
++	return false;
++#endif
++
+ 	tmp_ctx = talloc_stackframe();
+ 	if (tmp_ctx == NULL) {
+ 		return false;
+@@ -272,6 +280,10 @@ const char *svcctl_get_string_value(TALL
+ 	NTSTATUS status;
+ 	WERROR result = WERR_OK;
+ 
++#ifndef WINREG_SUPPORT
++	return NULL;
++#endif
++
+ 	tmp_ctx = talloc_stackframe();
+ 	if (tmp_ctx == NULL) {
+ 		return NULL;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -642,7 +642,9 @@ static struct cmd_set *rpcclient_command
+ 	drsuapi_commands,
+ 	eventlog_commands,
+ #endif
++#ifdef WINREG_SUPPORT
+ 	winreg_commands,
++#endif
+ 	NULL
+ };
+ 
diff --git a/package/network/services/samba36/patches/240-remove_dfs_api.patch b/package/network/services/samba36/patches/240-remove_dfs_api.patch
new file mode 100644
index 0000000000..30882c2633
--- /dev/null
+++ b/package/network/services/samba36/patches/240-remove_dfs_api.patch
@@ -0,0 +1,71 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -881,6 +881,7 @@ static bool rpcecho_init_cb(void *ptr) {
+ 
+ #endif
+ 
++#ifdef DFS_SUPPORT
+ static bool netdfs_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -928,6 +929,7 @@ static bool netdfs_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ #ifdef ACTIVE_DIRECTORY
+ static bool dssetup_init_cb(void *ptr)
+@@ -1173,12 +1175,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		return false;
+ 	}
+ 
++#ifdef DFS_SUPPORT
+ 	netdfs_cb.init         = netdfs_init_cb;
+ 	netdfs_cb.shutdown     = NULL;
+ 	netdfs_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_netdfs_init(&netdfs_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ #ifdef DEVELOPER
+ 	rpcecho_cb.init         = rpcecho_init_cb;
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -122,9 +122,11 @@ static bool initialize_interfaces(void)
+ 		return false;
+ 	}
+ #endif
++#ifdef DFS_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef DEVELOPER
+ 	if (!smb_register_ndr_interface(&ndr_table_rpcecho)) {
+ 		return false;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -139,7 +139,9 @@ static void exit_server_common(enum serv
+ #ifdef DEVELOPER
+ 		rpc_rpcecho_shutdown();
+ #endif
++#ifdef DFS_SUPPORT
+ 		rpc_netdfs_shutdown();
++#endif
+ 		rpc_initshutdown_shutdown();
+ #ifdef EXTRA_SERVICES
+ 		rpc_eventlog_shutdown();
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -629,7 +629,9 @@ static struct cmd_set *rpcclient_command
+ #endif
+ 	netlogon_commands,
+ 	srvsvc_commands,
++#ifdef DFS_SUPPORT
+ 	dfs_commands,
++#endif
+ #ifdef DEVELOPER
+ 	echo_commands,
+ #endif
diff --git a/package/network/services/samba36/patches/250-remove_domain_logon.patch b/package/network/services/samba36/patches/250-remove_domain_logon.patch
new file mode 100644
index 0000000000..2db6524f6b
--- /dev/null
+++ b/package/network/services/samba36/patches/250-remove_domain_logon.patch
@@ -0,0 +1,185 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -606,6 +606,7 @@ static bool samr_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef NETLOGON_SUPPORT
+ static bool netlogon_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -654,6 +655,7 @@ static bool netlogon_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool spoolss_init_cb(void *ptr)
+ {
+@@ -1116,12 +1118,15 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		return false;
+ 	}
+ 
++#ifdef NETLOGON_SUPPORT
+ 	netlogon_cb.init         = netlogon_init_cb;
+ 	netlogon_cb.shutdown     = NULL;
+ 	netlogon_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_netlogon_init(&netlogon_cb))) {
+ 		return false;
+ 	}
++#endif
++
+ 
+ 	rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
+ 					   "rpc_server",
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -103,9 +103,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_samr)) {
+ 		return false;
+ 	}
++#ifdef NETLOGON_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_netlogon)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_srvsvc)) {
+ 		return false;
+ 	}
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -157,7 +157,9 @@ static void exit_server_common(enum serv
+ 		rpc_winreg_shutdown();
+ #endif
+ 
++#ifdef NETLOGON_SUPPORT
+ 		rpc_netlogon_shutdown();
++#endif
+ 		rpc_samr_shutdown();
+ 		rpc_lsarpc_shutdown();
+ 	}
+--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
++++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
+@@ -91,9 +91,11 @@ bool init_service_op_table( void )
+ 	i++;
+ #endif
+ 
++#ifdef NETLOGON_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" );
+ 	svcctl_ops[i].ops  = &netlogon_svc_ops;
+ 	i++;
++#endif
+ 
+ #ifdef WINREG_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "RemoteRegistry" );
+--- a/source3/nmbd/nmbd_processlogon.c
++++ b/source3/nmbd/nmbd_processlogon.c
+@@ -320,6 +320,10 @@ void process_logon_packet(struct packet_
+ 	NTSTATUS status;
+ 	const char *pdc_name;
+ 
++#ifndef NETLOGON_SUPPORT
++	return;
++#endif
++
+ 	in_addr_to_sockaddr_storage(&ss, p->ip);
+ 	pss = iface_ip((struct sockaddr *)&ss);
+ 	if (!pss) {
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -627,7 +627,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
+ #endif
++#ifdef NETLOGON_SUPPORT
+ 	netlogon_commands,
++#endif
+ 	srvsvc_commands,
+ #ifdef DFS_SUPPORT
+ 	dfs_commands,
+--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
++++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+@@ -820,6 +820,10 @@ WERROR _wkssvc_NetrJoinDomain2(struct pi
+ 	WERROR werr;
+ 	struct security_token *token = p->session_info->security_token;
+ 
++#ifndef NETLOGON_SUPPORT
++	return WERR_NOT_SUPPORTED;
++#endif
++
+ 	if (!r->in.domain_name) {
+ 		return WERR_INVALID_PARAM;
+ 	}
+@@ -897,6 +901,10 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct 
+ 	WERROR werr;
+ 	struct security_token *token = p->session_info->security_token;
+ 
++#ifndef NETLOGON_SUPPORT
++	return WERR_NOT_SUPPORTED;
++#endif
++
+ 	if (!r->in.account || !r->in.encrypted_password) {
+ 		return WERR_INVALID_PARAM;
+ 	}
+--- a/source3/libsmb/trusts_util.c
++++ b/source3/libsmb/trusts_util.c
+@@ -46,9 +46,11 @@ NTSTATUS trust_pw_change_and_store_it(st
+ 	NTSTATUS nt_status;
+ 
+ 	switch (sec_channel_type) {
++#ifdef NETLOGON_SUPPORT
+ 	case SEC_CHAN_WKSTA:
+ 	case SEC_CHAN_DOMAIN:
+ 		break;
++#endif
+ 	default:
+ 		return NT_STATUS_NOT_SUPPORTED;
+ 	}
+@@ -159,6 +161,11 @@ bool enumerate_domain_trusts( TALLOC_CTX
+ 	*num_domains = 0;
+ 	*sids = NULL;
+ 
++#ifndef NETLOGON_SUPPORT
++	return False;
++#endif
++
++
+ 	/* lookup a DC first */
+ 
+ 	if ( !get_dc_name(domain, NULL, dc_name, &dc_ss) ) {
+@@ -243,6 +250,10 @@ NTSTATUS change_trust_account_password( 
+ 	struct cli_state *cli = NULL;
+ 	struct rpc_pipe_client *netlogon_pipe = NULL;
+ 
++#ifndef NETLOGON_SUPPORT
++	return NT_STATUS_UNSUCCESSFUL;
++#endif
++
+ 	DEBUG(5,("change_trust_account_password: Attempting to change trust account password in domain %s....\n",
+ 		domain));
+ 
+--- a/source3/auth/auth_domain.c
++++ b/source3/auth/auth_domain.c
+@@ -538,7 +538,9 @@ static NTSTATUS auth_init_trustdomain(st
+ 
+ NTSTATUS auth_domain_init(void) 
+ {
++#ifdef NETLOGON_SUPPORT
+ 	smb_register_auth(AUTH_INTERFACE_VERSION, "trustdomain", auth_init_trustdomain);
+ 	smb_register_auth(AUTH_INTERFACE_VERSION, "ntdomain", auth_init_ntdomain);
++#endif
+ 	return NT_STATUS_OK;
+ }
+--- a/source3/smbd/process.c
++++ b/source3/smbd/process.c
+@@ -2483,8 +2483,10 @@ static bool housekeeping_fn(const struct
+ 	/* check if we need to reload services */
+ 	check_reload(sconn, time_mono(NULL));
+ 
++#ifdef NETLOGON_SUPPORT
+ 	/* Change machine password if neccessary. */
+ 	attempt_machine_password_change();
++#endif
+ 
+         /*
+ 	 * Force a log file check.
diff --git a/package/network/services/samba36/patches/260-remove_samr.patch b/package/network/services/samba36/patches/260-remove_samr.patch
new file mode 100644
index 0000000000..b1700779ee
--- /dev/null
+++ b/package/network/services/samba36/patches/260-remove_samr.patch
@@ -0,0 +1,155 @@
+--- a/source3/rpc_server/rpc_handles.c
++++ b/source3/rpc_server/rpc_handles.c
+@@ -59,8 +59,11 @@ struct handle_list {
+ 
+ static bool is_samr_lsa_pipe(const struct ndr_syntax_id *syntax)
+ {
+-	return (ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id)
+-		|| ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id));
++	return
++#ifdef SAMR_SUPPORT
++		ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id) ||
++#endif
++		ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id);
+ }
+ 
+ size_t num_pipe_handles(struct pipes_struct *p)
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -100,9 +100,11 @@ static bool initialize_interfaces(void)
+ 		return false;
+ 	}
+ #endif
++#ifdef SAMR_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_samr)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef NETLOGON_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_netlogon)) {
+ 		return false;
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -557,6 +557,7 @@ static bool lsarpc_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef SAMR_SUPPORT
+ static bool samr_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -605,6 +606,7 @@ static bool samr_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ #ifdef NETLOGON_SUPPORT
+ static bool netlogon_init_cb(void *ptr)
+@@ -1111,12 +1113,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		return false;
+ 	}
+ 
++#ifdef SAMR_SUPPORT
+ 	samr_cb.init         = samr_init_cb;
+ 	samr_cb.shutdown     = NULL;
+ 	samr_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_samr_init(&samr_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ #ifdef NETLOGON_SUPPORT
+ 	netlogon_cb.init         = netlogon_init_cb;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -160,7 +160,9 @@ static void exit_server_common(enum serv
+ #ifdef NETLOGON_SUPPORT
+ 		rpc_netlogon_shutdown();
+ #endif
++#ifdef SAMR_SUPPORT
+ 		rpc_samr_shutdown();
++#endif
+ 		rpc_lsarpc_shutdown();
+ 	}
+ 
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -623,7 +623,9 @@ static struct cmd_set *rpcclient_command
+ 	rpcclient_commands,
+ 	lsarpc_commands,
+ 	ds_commands,
++#ifdef SAMR_SUPPORT
+ 	samr_commands,
++#endif
+ #ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
+ #endif
+--- a/source3/smbd/lanman.c
++++ b/source3/smbd/lanman.c
+@@ -2353,6 +2353,10 @@ static bool api_RNetGroupEnum(struct smb
+ 	NTSTATUS status, result;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct 
+ 	NTSTATUS status, result;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !UserName || !p) {
+ 		return False;
+ 	}
+@@ -2733,6 +2741,10 @@ static bool api_RNetUserEnum(struct smbd
+ 
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -2979,6 +2991,10 @@ static bool api_SetUserPassword(struct s
+ 	int min_pwd_length;
+ 	struct dcerpc_binding_handle *b = NULL;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	/* Skip 2 strings. */
+ 	p = skip_string(param,tpscnt,np);
+ 	p = skip_string(param,tpscnt,p);
+@@ -3224,6 +3240,10 @@ static bool api_SamOEMChangePassword(str
+ 	int bufsize;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	*rparam_len = 4;
+ 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
+ 	if (!*rparam) {
+@@ -4265,6 +4285,10 @@ static bool api_RNetUserGetInfo(struct s
+ 	union samr_UserInfo *info;
+ 	struct dcerpc_binding_handle *b = NULL;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !UserName || !p) {
+ 		return False;
+ 	}
diff --git a/package/network/services/samba36/patches/270-remove_registry_backend.patch b/package/network/services/samba36/patches/270-remove_registry_backend.patch
new file mode 100644
index 0000000000..a1cc87771a
--- /dev/null
+++ b/package/network/services/samba36/patches/270-remove_registry_backend.patch
@@ -0,0 +1,43 @@
+--- a/source3/lib/smbconf/smbconf_init.c
++++ b/source3/lib/smbconf/smbconf_init.c
+@@ -68,9 +68,12 @@ sbcErr smbconf_init(TALLOC_CTX *mem_ctx,
+ 		}
+ 	}
+ 
++#ifdef REGISTRY_BACKEND
+ 	if (strequal(backend, "registry") || strequal(backend, "reg")) {
+ 		err = smbconf_init_reg(mem_ctx, conf_ctx, path);
+-	} else if (strequal(backend, "file") || strequal(backend, "txt")) {
++	} else
++#endif
++	if (strequal(backend, "file") || strequal(backend, "txt")) {
+ 		err = smbconf_init_txt(mem_ctx, conf_ctx, path);
+ 	} else if (sep == NULL) {
+ 		/*
+--- a/source3/lib/netapi/serverinfo.c
++++ b/source3/lib/netapi/serverinfo.c
+@@ -557,7 +557,10 @@ static WERROR NetServerSetInfo_l_1005(st
+ 		return WERR_INVALID_PARAM;
+ 	}
+ 
+-	if (!lp_config_backend_is_registry()) {
++#ifdef REGISTRY_BACKEND
++	if (!lp_config_backend_is_registry())
++#endif
++	{
+ 		libnetapi_set_error_string(ctx,
+ 			"Configuration manipulation requested but not "
+ 			"supported by backend");
+--- a/source3/smbd/server.c
++++ b/source3/smbd/server.c
+@@ -1210,8 +1210,10 @@ extern void build_options(bool screen);
+ 		exit(1);
+ 	}
+ 
++#ifdef REGISTRY_BACKEND
+ 	if (!W_ERROR_IS_OK(registry_init_full()))
+ 		exit(1);
++#endif
+ 
+ #ifdef PRINTER_SUPPORT
+ 	if (!print_backend_init(smbd_messaging_context()))
diff --git a/package/network/services/samba36/patches/280-strip_srvsvc.patch b/package/network/services/samba36/patches/280-strip_srvsvc.patch
new file mode 100644
index 0000000000..b93e3fce6a
--- /dev/null
+++ b/package/network/services/samba36/patches/280-strip_srvsvc.patch
@@ -0,0 +1,143 @@
+--- a/source3/smbd/lanman.c
++++ b/source3/smbd/lanman.c
+@@ -2197,6 +2197,10 @@ static bool api_RNetShareAdd(struct smbd
+ 	struct srvsvc_NetShareInfo2 info2;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SRVSVC_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -3838,10 +3842,7 @@ static bool api_RNetServerGetInfo(struct
+ 	NTSTATUS status;
+ 	WERROR werr;
+ 	TALLOC_CTX *mem_ctx = talloc_tos();
+-	struct rpc_pipe_client *cli = NULL;
+-	union srvsvc_NetSrvInfo info;
+ 	int errcode;
+-	struct dcerpc_binding_handle *b;
+ 
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+@@ -3904,66 +3905,16 @@ static bool api_RNetServerGetInfo(struct
+ 	p = *rdata;
+ 	p2 = p + struct_len;
+ 
+-	status = rpc_pipe_open_interface(mem_ctx, &ndr_table_srvsvc.syntax_id,
+-					conn->session_info,
+-					&conn->sconn->client_id,
+-					conn->sconn->msg_ctx,
+-					&cli);
+-	if (!NT_STATUS_IS_OK(status)) {
+-		DEBUG(0,("api_RNetServerGetInfo: could not connect to srvsvc: %s\n",
+-			  nt_errstr(status)));
+-		errcode = W_ERROR_V(ntstatus_to_werror(status));
+-		goto out;
+-	}
+-
+-	b = cli->binding_handle;
+-
+-	status = dcerpc_srvsvc_NetSrvGetInfo(b, mem_ctx,
+-					     NULL,
+-					     101,
+-					     &info,
+-					     &werr);
+-	if (!NT_STATUS_IS_OK(status)) {
+-		errcode = W_ERROR_V(ntstatus_to_werror(status));
+-		goto out;
+-	}
+-	if (!W_ERROR_IS_OK(werr)) {
+-		errcode = W_ERROR_V(werr);
+-		goto out;
+-	}
+-
+-	if (info.info101 == NULL) {
+-		errcode = W_ERROR_V(WERR_INVALID_PARAM);
+-		goto out;
+-	}
+-
+ 	if (uLevel != 20) {
+-		srvstr_push(NULL, 0, p, info.info101->server_name, 16,
++		srvstr_push(NULL, 0, p, global_myname(), 16,
+ 			STR_ASCII|STR_UPPER|STR_TERMINATE);
+-  	}
++	}
+ 	p += 16;
+ 	if (uLevel > 0) {
+-		SCVAL(p,0,info.info101->version_major);
+-		SCVAL(p,1,info.info101->version_minor);
+-		SIVAL(p,2,info.info101->server_type);
+-
+-		if (mdrcnt == struct_len) {
+-			SIVAL(p,6,0);
+-		} else {
+-			SIVAL(p,6,PTR_DIFF(p2,*rdata));
+-			if (mdrcnt - struct_len <= 0) {
+-				return false;
+-			}
+-			push_ascii(p2,
+-				info.info101->comment,
+-				MIN(mdrcnt - struct_len,
+-					MAX_SERVER_STRING_LENGTH),
+-				STR_TERMINATE);
+-			p2 = skip_string(*rdata,*rdata_len,p2);
+-			if (!p2) {
+-				return False;
+-			}
+-		}
++		SCVAL(p,0,lp_major_announce_version());
++		SCVAL(p,1,lp_minor_announce_version());
++		SIVAL(p,2,lp_default_server_announce());
++		SIVAL(p,6,0);
+ 	}
+ 
+ 	if (uLevel > 1) {
+@@ -5654,6 +5605,10 @@ static bool api_RNetSessionEnum(struct s
+ 	uint32_t totalentries, resume_handle = 0;
+ 	uint32_t count = 0;
+ 
++#ifndef SRVSVC_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
++++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+@@ -1533,6 +1533,10 @@ WERROR _srvsvc_NetShareSetInfo(struct pi
+ 	TALLOC_CTX *ctx = p->mem_ctx;
+ 	union srvsvc_NetShareInfo *info = r->in.info;
+ 
++#ifndef FULL_SRVSVC
++	return WERR_ACCESS_DENIED;
++#endif
++
+ 	DEBUG(5,("_srvsvc_NetShareSetInfo: %d\n", __LINE__));
+ 
+ 	if (!r->in.share_name) {
+@@ -1763,6 +1767,10 @@ WERROR _srvsvc_NetShareAdd(struct pipes_
+ 	int max_connections = 0;
+ 	TALLOC_CTX *ctx = p->mem_ctx;
+ 
++#ifndef FULL_SRVSVC
++	return WERR_ACCESS_DENIED;
++#endif
++
+ 	DEBUG(5,("_srvsvc_NetShareAdd: %d\n", __LINE__));
+ 
+ 	if (r->out.parm_error) {
+@@ -1945,6 +1953,10 @@ WERROR _srvsvc_NetShareDel(struct pipes_
+ 	struct share_params *params;
+ 	TALLOC_CTX *ctx = p->mem_ctx;
+ 
++#ifndef FULL_SRVSVC
++	return WERR_ACCESS_DENIED;
++#endif
++
+ 	DEBUG(5,("_srvsvc_NetShareDel: %d\n", __LINE__));
+ 
+ 	if (!r->in.share_name) {
diff --git a/package/network/services/samba36/patches/290-remove_lsa.patch b/package/network/services/samba36/patches/290-remove_lsa.patch
new file mode 100644
index 0000000000..8fd48c4282
--- /dev/null
+++ b/package/network/services/samba36/patches/290-remove_lsa.patch
@@ -0,0 +1,73 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -92,9 +92,11 @@ bool smb_register_ndr_interface(const st
+ 
+ static bool initialize_interfaces(void)
+ {
++#ifdef LSA_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_lsarpc)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef ACTIVE_DIRECTORY
+ 	if (!smb_register_ndr_interface(&ndr_table_dssetup)) {
+ 		return false;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -163,7 +163,9 @@ static void exit_server_common(enum serv
+ #ifdef SAMR_SUPPORT
+ 		rpc_samr_shutdown();
+ #endif
++#ifdef LSA_SUPPORT
+ 		rpc_lsarpc_shutdown();
++#endif
+ 	}
+ 
+ 	/*
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -508,6 +508,7 @@ static bool srvsvc_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef LSA_SUPPORT
+ static bool lsarpc_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -556,6 +557,7 @@ static bool lsarpc_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ #ifdef SAMR_SUPPORT
+ static bool samr_init_cb(void *ptr)
+@@ -1106,12 +1108,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 	}
+ 
+ 
++#ifdef LSA_SUPPORT
+ 	lsarpc_cb.init         = lsarpc_init_cb;
+ 	lsarpc_cb.shutdown     = NULL;
+ 	lsarpc_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_lsarpc_init(&lsarpc_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ #ifdef SAMR_SUPPORT
+ 	samr_cb.init         = samr_init_cb;
+--- a/source3/rpc_server/rpc_handles.c
++++ b/source3/rpc_server/rpc_handles.c
+@@ -63,7 +63,10 @@ static bool is_samr_lsa_pipe(const struc
+ #ifdef SAMR_SUPPORT
+ 		ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id) ||
+ #endif
+-		ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id);
++#ifdef LSA_SUPPORT
++		ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id) ||
++#endif
++		false;
+ }
+ 
+ size_t num_pipe_handles(struct pipes_struct *p)
diff --git a/package/network/services/samba36/patches/300-assert_debug_level.patch b/package/network/services/samba36/patches/300-assert_debug_level.patch
new file mode 100644
index 0000000000..c5b07168c6
--- /dev/null
+++ b/package/network/services/samba36/patches/300-assert_debug_level.patch
@@ -0,0 +1,11 @@
+--- a/lib/util/util.h
++++ b/lib/util/util.h
+@@ -53,7 +53,7 @@ extern const char *panic_action;
+ #else
+ /* redefine the assert macro for non-developer builds */
+ #define SMB_ASSERT(b) do { if (!(b)) { \
+-        DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \
++        DEBUG(3,("PANIC: assert failed at %s(%d): %s\n", \
+ 	    __FILE__, __LINE__, #b)); }} while (0)
+ #endif
+ 
diff --git a/package/network/services/samba36/patches/310-remove_error_strings.patch b/package/network/services/samba36/patches/310-remove_error_strings.patch
new file mode 100644
index 0000000000..2adbc08193
--- /dev/null
+++ b/package/network/services/samba36/patches/310-remove_error_strings.patch
@@ -0,0 +1,253 @@
+--- a/libcli/util/doserr.c
++++ b/libcli/util/doserr.c
+@@ -28,6 +28,7 @@ struct werror_code_struct {
+ 
+ static const struct werror_code_struct dos_errs[] =
+ {
++#ifdef VERBOSE_ERROR
+ 	{ "WERR_OK", WERR_OK },
+ 	{ "WERR_BADFILE", WERR_BADFILE },
+ 	{ "WERR_ACCESS_DENIED", WERR_ACCESS_DENIED },
+@@ -2668,6 +2669,7 @@ static const struct werror_code_struct d
+ 	{ "WERR_AMBIGUOUS_SYSTEM_DEVICE", WERR_AMBIGUOUS_SYSTEM_DEVICE },
+ 	{ "WERR_SYSTEM_DEVICE_NOT_FOUND", WERR_SYSTEM_DEVICE_NOT_FOUND },
+ 	/* END GENERATED-WIN32-ERROR-CODES */
++#endif
+ 	{ NULL, W_ERROR(0) }
+ };
+ 
+@@ -2684,12 +2686,14 @@ const char *win_errstr(WERROR werror)
+         static char msg[40];
+         int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (dos_errs[idx].dos_errstr != NULL) {
+ 		if (W_ERROR_V(dos_errs[idx].werror) == 
+                     W_ERROR_V(werror))
+                         return dos_errs[idx].dos_errstr;
+ 		idx++;
+ 	}
++#endif
+ 
+ 	slprintf(msg, sizeof(msg), "DOS code 0x%08x", W_ERROR_V(werror));
+ 
+@@ -2702,6 +2706,7 @@ struct werror_str_struct {
+ };
+ 
+ const struct werror_str_struct dos_err_strs[] = {
++#ifdef VERBOSE_ERROR
+ 	{ WERR_OK, "Success" },
+ 	{ WERR_ACCESS_DENIED, "Access is denied" },
+ 	{ WERR_INVALID_PARAM, "Invalid parameter" },
+@@ -5324,6 +5329,7 @@ const struct werror_str_struct dos_err_s
+ 	{ WERR_AMBIGUOUS_SYSTEM_DEVICE, "The requested system device cannot be identified due to multiple indistinguishable devices potentially matching the identification criteria." },
+ 	{ WERR_SYSTEM_DEVICE_NOT_FOUND, "The requested system device cannot be found." },
+ 	/* END GENERATED-WIN32-ERROR-CODES-DESC */
++#endif
+ };
+ 
+ 
+@@ -5334,6 +5340,7 @@ const struct werror_str_struct dos_err_s
+ 
+ const char *get_friendly_werror_msg(WERROR werror)
+ {
++#ifdef VERBOSE_ERROR
+ 	int i = 0;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(dos_err_strs); i++) {
+@@ -5342,6 +5349,7 @@ const char *get_friendly_werror_msg(WERR
+ 			return dos_err_strs[i].friendly_errstr;
+ 		}
+ 	}
++#endif
+ 
+ 	return win_errstr(werror);
+ }
+--- a/librpc/ndr/libndr.h
++++ b/librpc/ndr/libndr.h
+@@ -598,4 +598,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_enum
+ 
+ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b);
+ 
++#ifndef VERBOSE_ERROR
++#define ndr_print_bool(...) do {} while (0)
++#define ndr_print_struct(...) do {} while (0)
++#define ndr_print_null(...) do {} while (0)
++#define ndr_print_enum(...) do {} while (0)
++#define ndr_print_bitmap_flag(...) do {} while (0)
++#define ndr_print_ptr(...) do {} while (0)
++#define ndr_print_union(...) do {} while (0)
++#define ndr_print_bad_level(...) do {} while (0)
++#define ndr_print_array_uint8(...) do {} while (0)
++#define ndr_print_string_array(...) do {} while (0)
++#define ndr_print_string_array(...) do {} while (0)
++#define ndr_print_NTSTATUS(...) do {} while (0)
++#define ndr_print_WERROR(...) do {} while (0)
++#endif
++
+ #endif /* __LIBNDR_H__ */
+--- a/librpc/ndr/ndr_basic.c
++++ b/librpc/ndr/ndr_basic.c
+@@ -31,6 +31,19 @@
+ #define NDR_SIVAL(ndr, ofs, v) do { if (NDR_BE(ndr))  { RSIVAL(ndr->data,ofs,v); } else SIVAL(ndr->data,ofs,v); } while (0)
+ #define NDR_SIVALS(ndr, ofs, v) do { if (NDR_BE(ndr))  { RSIVALS(ndr->data,ofs,v); } else SIVALS(ndr->data,ofs,v); } while (0)
+ 
++#undef ndr_print_bool
++#undef ndr_print_struct
++#undef ndr_print_null
++#undef ndr_print_enum
++#undef ndr_print_bitmap_flag
++#undef ndr_print_ptr
++#undef ndr_print_union
++#undef ndr_print_bad_level
++#undef ndr_print_array_uint8
++#undef ndr_print_string_array
++#undef ndr_print_string_array
++#undef ndr_print_NTSTATUS
++#undef ndr_print_WERROR
+ 
+ /*
+   check for data leaks from the server by looking for non-zero pad bytes
+--- a/librpc/ndr/ndr_string.c
++++ b/librpc/ndr/ndr_string.c
+@@ -588,6 +588,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_stri
+ 	return NDR_ERR_SUCCESS;
+ }
+ 
++#undef ndr_print_string_array
+ _PUBLIC_ void ndr_print_string_array(struct ndr_print *ndr, const char *name, const char **a)
+ {
+ 	uint32_t count;
+--- a/librpc/rpc/dcerpc_error.c
++++ b/librpc/rpc/dcerpc_error.c
+@@ -31,6 +31,7 @@ struct dcerpc_fault_table {
+ static const struct dcerpc_fault_table dcerpc_faults[] =
+ {
+ #define _FAULT_STR(x) { #x , x }
++#ifdef VERBOSE_ERROR
+ 	_FAULT_STR(DCERPC_NCA_S_COMM_FAILURE),
+ 	_FAULT_STR(DCERPC_NCA_S_OP_RNG_ERROR),
+ 	_FAULT_STR(DCERPC_NCA_S_UNKNOWN_IF),
+@@ -78,6 +79,7 @@ static const struct dcerpc_fault_table d
+ 	_FAULT_STR(DCERPC_NCA_S_FAULT_CODESET_CONV_ERROR),
+ 	_FAULT_STR(DCERPC_NCA_S_FAULT_OBJECT_NOT_FOUND),
+ 	_FAULT_STR(DCERPC_NCA_S_FAULT_NO_CLIENT_STUB),
++#endif
+ 	{ NULL, 0 }
+ #undef _FAULT_STR
+ };
+@@ -87,12 +89,14 @@ _PUBLIC_ const char *dcerpc_errstr(TALLO
+ 	int idx = 0;
+ 	WERROR werr = W_ERROR(fault_code);
+ 
++#ifdef VERBOSE_ERROR
+ 	while (dcerpc_faults[idx].errstr != NULL) {
+ 		if (dcerpc_faults[idx].faultcode == fault_code) {
+ 			return dcerpc_faults[idx].errstr;
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	return win_errstr(werr);
+ }
+--- a/source3/libsmb/nterr.c
++++ b/source3/libsmb/nterr.c
+@@ -702,6 +702,7 @@ const char *nt_errstr(NTSTATUS nt_code)
+ 					NT_STATUS_DOS_CODE(nt_code));
+ 	}
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_errs[idx].nt_errstr != NULL) {
+ 		if (NT_STATUS_V(nt_errs[idx].nt_errcode) ==
+ 		    NT_STATUS_V(nt_code)) {
+@@ -709,6 +710,7 @@ const char *nt_errstr(NTSTATUS nt_code)
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	result = talloc_asprintf(talloc_tos(), "NT code 0x%08x",
+ 				 NT_STATUS_V(nt_code));
+@@ -724,12 +726,14 @@ const char *get_friendly_nt_error_msg(NT
+ {
+ 	int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_err_desc[idx].nt_errstr != NULL) {
+ 		if (NT_STATUS_V(nt_err_desc[idx].nt_errcode) == NT_STATUS_V(nt_code)) {
+ 			return nt_err_desc[idx].nt_errstr;
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	/* fall back to NT_STATUS_XXX string */
+ 
+@@ -745,6 +749,7 @@ const char *get_nt_error_c_code(NTSTATUS
+ 	char *result;
+ 	int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_errs[idx].nt_errstr != NULL) {
+ 		if (NT_STATUS_V(nt_errs[idx].nt_errcode) ==
+ 		    NT_STATUS_V(nt_code)) {
+@@ -752,6 +757,7 @@ const char *get_nt_error_c_code(NTSTATUS
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	result = talloc_asprintf(talloc_tos(), "NT_STATUS(0x%08x)",
+ 				 NT_STATUS_V(nt_code));
+@@ -767,12 +773,14 @@ NTSTATUS nt_status_string_to_code(const 
+ {
+ 	int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_errs[idx].nt_errstr != NULL) {
+ 		if (strcasecmp(nt_errs[idx].nt_errstr, nt_status_str) == 0) {
+ 			return nt_errs[idx].nt_errcode;
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 	return NT_STATUS_UNSUCCESSFUL;
+ }
+ 
+--- a/lib/tdb/common/tdb_private.h
++++ b/lib/tdb/common/tdb_private.h
+@@ -69,7 +69,11 @@ typedef uint32_t tdb_off_t;
+ /* NB assumes there is a local variable called "tdb" that is the
+  * current context, also takes doubly-parenthesized print-style
+  * argument. */
++#ifdef VERBOSE_DEBUG
+ #define TDB_LOG(x) tdb->log.log_fn x
++#else
++#define TDB_LOG(x) do {} while(0)
++#endif
+ 
+ #ifdef TDB_TRACE
+ void tdb_trace(struct tdb_context *tdb, const char *op);
+--- a/source3/script/mkbuildoptions.awk
++++ b/source3/script/mkbuildoptions.awk
+@@ -55,7 +55,7 @@ BEGIN {
+ 	print "****************************************************************************/";
+ 	print "void build_options(bool screen)";
+ 	print "{";
+-	print "       if ((DEBUGLEVEL < 4) && (!screen)) {";
++	print "       if ((DEBUGLEVEL < 4) || (!screen)) {";
+ 	print "	       return;";
+ 	print "       }";
+ 	print "";
+--- a/source3/script/mkbuildoptions-waf.awk
++++ b/source3/script/mkbuildoptions-waf.awk
+@@ -55,7 +55,7 @@ BEGIN {
+ 	print "****************************************************************************/";
+ 	print "void build_options(bool screen)";
+ 	print "{";
+-	print "       if ((DEBUGLEVEL < 4) && (!screen)) {";
++	print "       if ((DEBUGLEVEL < 4) || (!screen)) {";
+ 	print "	       return;";
+ 	print "       }";
+ 	print "";
diff --git a/package/network/services/samba36/patches/320-debug_level_checks.patch b/package/network/services/samba36/patches/320-debug_level_checks.patch
new file mode 100644
index 0000000000..c6f2e6e0d9
--- /dev/null
+++ b/package/network/services/samba36/patches/320-debug_level_checks.patch
@@ -0,0 +1,22 @@
+--- a/lib/util/debug.h
++++ b/lib/util/debug.h
+@@ -45,7 +45,7 @@ bool dbghdr( int level, const char *loca
+  * Redefine DEBUGLEVEL because so we don't have to change every source file
+  * that *unnecessarily* references it.
+  */
+-#define DEBUGLEVEL DEBUGLEVEL_CLASS[DBGC_ALL]
++#define DEBUGLEVEL 0
+ 
+ /*
+  * Define all new debug classes here. A class is represented by an entry in
+--- a/source3/nmbd/asyncdns.c
++++ b/source3/nmbd/asyncdns.c
+@@ -85,7 +85,7 @@ static void asyncdns_process(void)
+ 	struct query_record r;
+ 	unstring qname;
+ 
+-	DEBUGLEVEL = -1;
++	DEBUGLEVEL_CLASS[DBGC_ALL] = -1;
+ 
+ 	while (1) {
+ 		NTSTATUS status;
diff --git a/package/network/services/samba36/patches/330-librpc_default_print.patch b/package/network/services/samba36/patches/330-librpc_default_print.patch
new file mode 100644
index 0000000000..f17b1e2396
--- /dev/null
+++ b/package/network/services/samba36/patches/330-librpc_default_print.patch
@@ -0,0 +1,8854 @@
+--- a/source3/librpc/ndr/util.c
++++ b/source3/librpc/ndr/util.c
+@@ -28,3 +28,7 @@ _PUBLIC_ void ndr_print_sockaddr_storage
+ 	char addr[INET6_ADDRSTRLEN];
+ 	ndr->print(ndr, "%-25s: %s", name, print_sockaddr(addr, sizeof(addr), ss));
+ }
++
++_PUBLIC_ void ndr_print_disabled(struct ndr_print *ndr, const char *name, int flags, void *r)
++{
++}
+--- a/source3/librpc/gen_ndr/ndr_atsvc.c
++++ b/source3/librpc/gen_ndr/ndr_atsvc.c
+@@ -867,7 +867,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobAdd,
+-		(ndr_print_function_t) ndr_print_atsvc_JobAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -876,7 +876,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobDel),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobDel,
+-		(ndr_print_function_t) ndr_print_atsvc_JobDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -885,7 +885,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobEnum,
+-		(ndr_print_function_t) ndr_print_atsvc_JobEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -894,7 +894,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobGetInfo,
+-		(ndr_print_function_t) ndr_print_atsvc_JobGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_audiosrv.c
++++ b/source3/librpc/gen_ndr/ndr_audiosrv.c
+@@ -594,7 +594,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_CreatezoneFactoriesList),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_CreatezoneFactoriesList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_CreatezoneFactoriesList,
+-		(ndr_print_function_t) ndr_print_audiosrv_CreatezoneFactoriesList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -603,7 +603,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_CreateGfxFactoriesList),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_CreateGfxFactoriesList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_CreateGfxFactoriesList,
+-		(ndr_print_function_t) ndr_print_audiosrv_CreateGfxFactoriesList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -612,7 +612,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_CreateGfxList),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_CreateGfxList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_CreateGfxList,
+-		(ndr_print_function_t) ndr_print_audiosrv_CreateGfxList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -621,7 +621,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_RemoveGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_RemoveGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_RemoveGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_RemoveGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -630,7 +630,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_AddGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_AddGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_AddGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_AddGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -639,7 +639,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_ModifyGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_ModifyGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_ModifyGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_ModifyGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -648,7 +648,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_OpenGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_OpenGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_OpenGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_OpenGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -657,7 +657,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_Logon),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_Logon,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_Logon,
+-		(ndr_print_function_t) ndr_print_audiosrv_Logon,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -666,7 +666,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_Logoff),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_Logoff,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_Logoff,
+-		(ndr_print_function_t) ndr_print_audiosrv_Logoff,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -675,7 +675,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_RegisterSessionNotificationEvent),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_RegisterSessionNotificationEvent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_RegisterSessionNotificationEvent,
+-		(ndr_print_function_t) ndr_print_audiosrv_RegisterSessionNotificationEvent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -684,7 +684,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_UnregisterSessionNotificationEvent),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_UnregisterSessionNotificationEvent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_UnregisterSessionNotificationEvent,
+-		(ndr_print_function_t) ndr_print_audiosrv_UnregisterSessionNotificationEvent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -693,7 +693,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_SessionConnectState),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_SessionConnectState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_SessionConnectState,
+-		(ndr_print_function_t) ndr_print_audiosrv_SessionConnectState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -702,7 +702,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_DriverOpenDrvRegKey),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_DriverOpenDrvRegKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_DriverOpenDrvRegKey,
+-		(ndr_print_function_t) ndr_print_audiosrv_DriverOpenDrvRegKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -711,7 +711,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_AdvisePreferredDeviceChange),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_AdvisePreferredDeviceChange,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_AdvisePreferredDeviceChange,
+-		(ndr_print_function_t) ndr_print_audiosrv_AdvisePreferredDeviceChange,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -720,7 +720,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_GetPnpInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_GetPnpInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_GetPnpInfo,
+-		(ndr_print_function_t) ndr_print_audiosrv_GetPnpInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_backupkey.c
++++ b/source3/librpc/gen_ndr/ndr_backupkey.c
+@@ -740,7 +740,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct bkrp_BackupKey),
+ 		(ndr_push_flags_fn_t) ndr_push_bkrp_BackupKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_bkrp_BackupKey,
+-		(ndr_print_function_t) ndr_print_bkrp_BackupKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_browser.c
++++ b/source3/librpc/gen_ndr/ndr_browser.c
+@@ -928,7 +928,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrServerEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrServerEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrServerEnum,
+-		(ndr_print_function_t) ndr_print_BrowserrServerEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -937,7 +937,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrDebugCall),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrDebugCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrDebugCall,
+-		(ndr_print_function_t) ndr_print_BrowserrDebugCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -946,7 +946,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrQueryOtherDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrQueryOtherDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrQueryOtherDomains,
+-		(ndr_print_function_t) ndr_print_BrowserrQueryOtherDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -955,7 +955,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrResetNetlogonState),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrResetNetlogonState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrResetNetlogonState,
+-		(ndr_print_function_t) ndr_print_BrowserrResetNetlogonState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -964,7 +964,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrDebugTrace),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrDebugTrace,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrDebugTrace,
+-		(ndr_print_function_t) ndr_print_BrowserrDebugTrace,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -973,7 +973,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrQueryStatistics),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrQueryStatistics,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrQueryStatistics,
+-		(ndr_print_function_t) ndr_print_BrowserrQueryStatistics,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -982,7 +982,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserResetStatistics),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserResetStatistics,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserResetStatistics,
+-		(ndr_print_function_t) ndr_print_BrowserResetStatistics,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -991,7 +991,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct NetrBrowserStatisticsClear),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrBrowserStatisticsClear,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrBrowserStatisticsClear,
+-		(ndr_print_function_t) ndr_print_NetrBrowserStatisticsClear,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1000,7 +1000,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct NetrBrowserStatisticsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrBrowserStatisticsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrBrowserStatisticsGet,
+-		(ndr_print_function_t) ndr_print_NetrBrowserStatisticsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1009,7 +1009,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrSetNetlogonState),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrSetNetlogonState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrSetNetlogonState,
+-		(ndr_print_function_t) ndr_print_BrowserrSetNetlogonState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1018,7 +1018,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrQueryEmulatedDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrQueryEmulatedDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrQueryEmulatedDomains,
+-		(ndr_print_function_t) ndr_print_BrowserrQueryEmulatedDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1027,7 +1027,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrServerEnumEx),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrServerEnumEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrServerEnumEx,
+-		(ndr_print_function_t) ndr_print_BrowserrServerEnumEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dbgidl.c
++++ b/source3/librpc/gen_ndr/ndr_dbgidl.c
+@@ -48,7 +48,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dummy_dbgidl),
+ 		(ndr_push_flags_fn_t) ndr_push_dummy_dbgidl,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dummy_dbgidl,
+-		(ndr_print_function_t) ndr_print_dummy_dbgidl,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dcom.c
++++ b/source3/librpc/gen_ndr/ndr_dcom.c
+@@ -128,7 +128,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct UseProtSeq),
+ 		(ndr_push_flags_fn_t) ndr_push_UseProtSeq,
+ 		(ndr_pull_flags_fn_t) ndr_pull_UseProtSeq,
+-		(ndr_print_function_t) ndr_print_UseProtSeq,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -137,7 +137,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct GetCustomProtseqInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_GetCustomProtseqInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetCustomProtseqInfo,
+-		(ndr_print_function_t) ndr_print_GetCustomProtseqInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -146,7 +146,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct UpdateResolverBindings),
+ 		(ndr_push_flags_fn_t) ndr_push_UpdateResolverBindings,
+ 		(ndr_pull_flags_fn_t) ndr_pull_UpdateResolverBindings,
+-		(ndr_print_function_t) ndr_print_UpdateResolverBindings,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -450,7 +450,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct QueryInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_QueryInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_QueryInterface,
+-		(ndr_print_function_t) ndr_print_QueryInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -459,7 +459,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct AddRef),
+ 		(ndr_push_flags_fn_t) ndr_push_AddRef,
+ 		(ndr_pull_flags_fn_t) ndr_pull_AddRef,
+-		(ndr_print_function_t) ndr_print_AddRef,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -468,7 +468,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Release),
+ 		(ndr_push_flags_fn_t) ndr_push_Release,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Release,
+-		(ndr_print_function_t) ndr_print_Release,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -849,7 +849,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateInstance,
+-		(ndr_print_function_t) ndr_print_CreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -858,7 +858,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemoteCreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_RemoteCreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemoteCreateInstance,
+-		(ndr_print_function_t) ndr_print_RemoteCreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -867,7 +867,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct LockServer),
+ 		(ndr_push_flags_fn_t) ndr_push_LockServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_LockServer,
+-		(ndr_print_function_t) ndr_print_LockServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -876,7 +876,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemoteLockServer),
+ 		(ndr_push_flags_fn_t) ndr_push_RemoteLockServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemoteLockServer,
+-		(ndr_print_function_t) ndr_print_RemoteLockServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1434,7 +1434,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemQueryInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_RemQueryInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemQueryInterface,
+-		(ndr_print_function_t) ndr_print_RemQueryInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1443,7 +1443,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemAddRef),
+ 		(ndr_push_flags_fn_t) ndr_push_RemAddRef,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemAddRef,
+-		(ndr_print_function_t) ndr_print_RemAddRef,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1452,7 +1452,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemRelease),
+ 		(ndr_push_flags_fn_t) ndr_push_RemRelease,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemRelease,
+-		(ndr_print_function_t) ndr_print_RemRelease,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1590,7 +1590,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetClassObject),
+ 		(ndr_push_flags_fn_t) ndr_push_GetClassObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetClassObject,
+-		(ndr_print_function_t) ndr_print_GetClassObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1701,7 +1701,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ISCMLocalActivator_CreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_ISCMLocalActivator_CreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ISCMLocalActivator_CreateInstance,
+-		(ndr_print_function_t) ndr_print_ISCMLocalActivator_CreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1788,7 +1788,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IMachineLocalActivator_foo),
+ 		(ndr_push_flags_fn_t) ndr_push_IMachineLocalActivator_foo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IMachineLocalActivator_foo,
+-		(ndr_print_function_t) ndr_print_IMachineLocalActivator_foo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1875,7 +1875,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ILocalObjectExporter_Foo),
+ 		(ndr_push_flags_fn_t) ndr_push_ILocalObjectExporter_Foo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ILocalObjectExporter_Foo,
+-		(ndr_print_function_t) ndr_print_ILocalObjectExporter_Foo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2031,7 +2031,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ISystemActivatorRemoteCreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_ISystemActivatorRemoteCreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ISystemActivatorRemoteCreateInstance,
+-		(ndr_print_function_t) ndr_print_ISystemActivatorRemoteCreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2319,7 +2319,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemQueryInterface2),
+ 		(ndr_push_flags_fn_t) ndr_push_RemQueryInterface2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemQueryInterface2,
+-		(ndr_print_function_t) ndr_print_RemQueryInterface2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3040,7 +3040,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetTypeInfoCount),
+ 		(ndr_push_flags_fn_t) ndr_push_GetTypeInfoCount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetTypeInfoCount,
+-		(ndr_print_function_t) ndr_print_GetTypeInfoCount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3049,7 +3049,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetTypeInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_GetTypeInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetTypeInfo,
+-		(ndr_print_function_t) ndr_print_GetTypeInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3058,7 +3058,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetIDsOfNames),
+ 		(ndr_push_flags_fn_t) ndr_push_GetIDsOfNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetIDsOfNames,
+-		(ndr_print_function_t) ndr_print_GetIDsOfNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3067,7 +3067,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Invoke),
+ 		(ndr_push_flags_fn_t) ndr_push_Invoke,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Invoke,
+-		(ndr_print_function_t) ndr_print_Invoke,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3243,7 +3243,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct MarshalInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_MarshalInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_MarshalInterface,
+-		(ndr_print_function_t) ndr_print_MarshalInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3252,7 +3252,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct UnMarshalInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_UnMarshalInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_UnMarshalInterface,
+-		(ndr_print_function_t) ndr_print_UnMarshalInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3385,7 +3385,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct MakeCoffee),
+ 		(ndr_push_flags_fn_t) ndr_push_MakeCoffee,
+ 		(ndr_pull_flags_fn_t) ndr_pull_MakeCoffee,
+-		(ndr_print_function_t) ndr_print_MakeCoffee,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3681,7 +3681,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Read),
+ 		(ndr_push_flags_fn_t) ndr_push_Read,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Read,
+-		(ndr_print_function_t) ndr_print_Read,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3690,7 +3690,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Write),
+ 		(ndr_push_flags_fn_t) ndr_push_Write,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Write,
+-		(ndr_print_function_t) ndr_print_Write,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dfs.c
++++ b/source3/librpc/gen_ndr/ndr_dfs.c
+@@ -5910,7 +5910,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_GetManagerVersion),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetManagerVersion,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetManagerVersion,
+-		(ndr_print_function_t) ndr_print_dfs_GetManagerVersion,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5919,7 +5919,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Add),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Add,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Add,
+-		(ndr_print_function_t) ndr_print_dfs_Add,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5928,7 +5928,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Remove),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Remove,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Remove,
+-		(ndr_print_function_t) ndr_print_dfs_Remove,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5937,7 +5937,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_SetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_SetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_SetInfo,
+-		(ndr_print_function_t) ndr_print_dfs_SetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5946,7 +5946,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_GetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetInfo,
+-		(ndr_print_function_t) ndr_print_dfs_GetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5955,7 +5955,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Enum),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Enum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Enum,
+-		(ndr_print_function_t) ndr_print_dfs_Enum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5964,7 +5964,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Rename),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Rename,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Rename,
+-		(ndr_print_function_t) ndr_print_dfs_Rename,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5973,7 +5973,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Move),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Move,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Move,
+-		(ndr_print_function_t) ndr_print_dfs_Move,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5982,7 +5982,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_ManagerGetConfigInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_ManagerGetConfigInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_ManagerGetConfigInfo,
+-		(ndr_print_function_t) ndr_print_dfs_ManagerGetConfigInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5991,7 +5991,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_ManagerSendSiteInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_ManagerSendSiteInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_ManagerSendSiteInfo,
+-		(ndr_print_function_t) ndr_print_dfs_ManagerSendSiteInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6000,7 +6000,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_AddFtRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_AddFtRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_AddFtRoot,
+-		(ndr_print_function_t) ndr_print_dfs_AddFtRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6009,7 +6009,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_RemoveFtRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_RemoveFtRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_RemoveFtRoot,
+-		(ndr_print_function_t) ndr_print_dfs_RemoveFtRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6018,7 +6018,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_AddStdRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_AddStdRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_AddStdRoot,
+-		(ndr_print_function_t) ndr_print_dfs_AddStdRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6027,7 +6027,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_RemoveStdRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_RemoveStdRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_RemoveStdRoot,
+-		(ndr_print_function_t) ndr_print_dfs_RemoveStdRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6036,7 +6036,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_ManagerInitialize),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_ManagerInitialize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_ManagerInitialize,
+-		(ndr_print_function_t) ndr_print_dfs_ManagerInitialize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6045,7 +6045,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_AddStdRootForced),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_AddStdRootForced,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_AddStdRootForced,
+-		(ndr_print_function_t) ndr_print_dfs_AddStdRootForced,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6054,7 +6054,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_GetDcAddress),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetDcAddress,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetDcAddress,
+-		(ndr_print_function_t) ndr_print_dfs_GetDcAddress,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6063,7 +6063,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_SetDcAddress),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_SetDcAddress,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_SetDcAddress,
+-		(ndr_print_function_t) ndr_print_dfs_SetDcAddress,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6072,7 +6072,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_FlushFtTable),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_FlushFtTable,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_FlushFtTable,
+-		(ndr_print_function_t) ndr_print_dfs_FlushFtTable,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6081,7 +6081,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Add2),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Add2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Add2,
+-		(ndr_print_function_t) ndr_print_dfs_Add2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6090,7 +6090,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Remove2),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Remove2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Remove2,
+-		(ndr_print_function_t) ndr_print_dfs_Remove2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6099,7 +6099,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_EnumEx),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_EnumEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_EnumEx,
+-		(ndr_print_function_t) ndr_print_dfs_EnumEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6108,7 +6108,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_SetInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_SetInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_SetInfo2,
+-		(ndr_print_function_t) ndr_print_dfs_SetInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dfsblobs.c
++++ b/source3/librpc/gen_ndr/ndr_dfsblobs.c
+@@ -1398,7 +1398,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dfs_GetDFSReferral),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetDFSReferral,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetDFSReferral,
+-		(ndr_print_function_t) ndr_print_dfs_GetDFSReferral,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dns.c
++++ b/source3/librpc/gen_ndr/ndr_dns.c
+@@ -860,7 +860,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_dns_name_packet),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_dns_name_packet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_dns_name_packet,
+-		(ndr_print_function_t) ndr_print_decode_dns_name_packet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dnsp.c
++++ b/source3/librpc/gen_ndr/ndr_dnsp.c
+@@ -700,7 +700,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_DnssrvRpcRecord),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_DnssrvRpcRecord,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_DnssrvRpcRecord,
+-		(ndr_print_function_t) ndr_print_decode_DnssrvRpcRecord,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dnsserver.c
++++ b/source3/librpc/gen_ndr/ndr_dnsserver.c
+@@ -48,7 +48,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dnsserver_foo),
+ 		(ndr_push_flags_fn_t) ndr_push_dnsserver_foo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dnsserver_foo,
+-		(ndr_print_function_t) ndr_print_dnsserver_foo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_drsblobs.c
++++ b/source3/librpc/gen_ndr/ndr_drsblobs.c
+@@ -5275,7 +5275,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_replPropertyMetaData),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_replPropertyMetaData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_replPropertyMetaData,
+-		(ndr_print_function_t) ndr_print_decode_replPropertyMetaData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5284,7 +5284,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_replUpToDateVector),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_replUpToDateVector,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_replUpToDateVector,
+-		(ndr_print_function_t) ndr_print_decode_replUpToDateVector,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5293,7 +5293,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_repsFromTo),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_repsFromTo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_repsFromTo,
+-		(ndr_print_function_t) ndr_print_decode_repsFromTo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5302,7 +5302,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_partialAttributeSet),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_partialAttributeSet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_partialAttributeSet,
+-		(ndr_print_function_t) ndr_print_decode_partialAttributeSet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5311,7 +5311,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_prefixMap),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_prefixMap,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_prefixMap,
+-		(ndr_print_function_t) ndr_print_decode_prefixMap,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5320,7 +5320,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_ldapControlDirSync),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ldapControlDirSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ldapControlDirSync,
+-		(ndr_print_function_t) ndr_print_decode_ldapControlDirSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5329,7 +5329,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_supplementalCredentials),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_supplementalCredentials,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_supplementalCredentials,
+-		(ndr_print_function_t) ndr_print_decode_supplementalCredentials,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5338,7 +5338,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_Packages),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_Packages,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_Packages,
+-		(ndr_print_function_t) ndr_print_decode_Packages,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5347,7 +5347,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_PrimaryKerberos),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_PrimaryKerberos,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_PrimaryKerberos,
+-		(ndr_print_function_t) ndr_print_decode_PrimaryKerberos,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5356,7 +5356,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_PrimaryCLEARTEXT),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_PrimaryCLEARTEXT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_PrimaryCLEARTEXT,
+-		(ndr_print_function_t) ndr_print_decode_PrimaryCLEARTEXT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5365,7 +5365,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_PrimaryWDigest),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_PrimaryWDigest,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_PrimaryWDigest,
+-		(ndr_print_function_t) ndr_print_decode_PrimaryWDigest,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5374,7 +5374,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_trustAuthInOut),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_trustAuthInOut,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_trustAuthInOut,
+-		(ndr_print_function_t) ndr_print_decode_trustAuthInOut,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5383,7 +5383,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_trustDomainPasswords),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_trustDomainPasswords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_trustDomainPasswords,
+-		(ndr_print_function_t) ndr_print_decode_trustDomainPasswords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5392,7 +5392,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_ExtendedErrorInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ExtendedErrorInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ExtendedErrorInfo,
+-		(ndr_print_function_t) ndr_print_decode_ExtendedErrorInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5401,7 +5401,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_ForestTrustInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ForestTrustInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ForestTrustInfo,
+-		(ndr_print_function_t) ndr_print_decode_ForestTrustInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_drsuapi.c
++++ b/source3/librpc/gen_ndr/ndr_drsuapi.c
+@@ -16500,7 +16500,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsBind),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsBind,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsBind,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsBind,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16509,7 +16509,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsUnbind),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsUnbind,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsUnbind,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsUnbind,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16518,7 +16518,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaSync),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaSync,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16527,7 +16527,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetNCChanges),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetNCChanges,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetNCChanges,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetNCChanges,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16536,7 +16536,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaUpdateRefs),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaUpdateRefs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaUpdateRefs,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaUpdateRefs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16545,7 +16545,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaAdd,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16554,7 +16554,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaDel),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaDel,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16563,7 +16563,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaMod),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaMod,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaMod,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaMod,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16572,7 +16572,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_VERIFY_NAMES),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_VERIFY_NAMES,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_VERIFY_NAMES,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_VERIFY_NAMES,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16581,7 +16581,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetMemberships),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetMemberships,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetMemberships,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetMemberships,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16590,7 +16590,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_INTER_DOMAIN_MOVE),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_INTER_DOMAIN_MOVE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_INTER_DOMAIN_MOVE,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_INTER_DOMAIN_MOVE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16599,7 +16599,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetNT4ChangeLog),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetNT4ChangeLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetNT4ChangeLog,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetNT4ChangeLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16608,7 +16608,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsCrackNames),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsCrackNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsCrackNames,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsCrackNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16617,7 +16617,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsWriteAccountSpn),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsWriteAccountSpn,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsWriteAccountSpn,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsWriteAccountSpn,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16626,7 +16626,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsRemoveDSServer),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsRemoveDSServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsRemoveDSServer,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsRemoveDSServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16635,7 +16635,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_REMOVE_DS_DOMAIN),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_REMOVE_DS_DOMAIN,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_REMOVE_DS_DOMAIN,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_REMOVE_DS_DOMAIN,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16644,7 +16644,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetDomainControllerInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetDomainControllerInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetDomainControllerInfo,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetDomainControllerInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16653,7 +16653,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsAddEntry),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsAddEntry,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsAddEntry,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsAddEntry,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16662,7 +16662,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsExecuteKCC),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsExecuteKCC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsExecuteKCC,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsExecuteKCC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16671,7 +16671,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaGetInfo,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16680,7 +16680,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_ADD_SID_HISTORY),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_ADD_SID_HISTORY,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_ADD_SID_HISTORY,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_ADD_SID_HISTORY,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16689,7 +16689,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetMemberships2),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetMemberships2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetMemberships2,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetMemberships2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16698,7 +16698,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_REPLICA_VERIFY_OBJECTS),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_REPLICA_VERIFY_OBJECTS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_REPLICA_VERIFY_OBJECTS,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_REPLICA_VERIFY_OBJECTS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16707,7 +16707,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_GET_OBJECT_EXISTENCE),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_GET_OBJECT_EXISTENCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_GET_OBJECT_EXISTENCE,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_GET_OBJECT_EXISTENCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16716,7 +16716,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_QuerySitesByCost),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_QuerySitesByCost,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_QuerySitesByCost,
+-		(ndr_print_function_t) ndr_print_drsuapi_QuerySitesByCost,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dsbackup.c
++++ b/source3/librpc/gen_ndr/ndr_dsbackup.c
+@@ -360,7 +360,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupPrepare),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupPrepare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupPrepare,
+-		(ndr_print_function_t) ndr_print_HrRBackupPrepare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -369,7 +369,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupEnd),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupEnd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupEnd,
+-		(ndr_print_function_t) ndr_print_HrRBackupEnd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -378,7 +378,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupGetAttachmentInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupGetAttachmentInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupGetAttachmentInformation,
+-		(ndr_print_function_t) ndr_print_HrRBackupGetAttachmentInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -387,7 +387,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupOpenFile),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupOpenFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupOpenFile,
+-		(ndr_print_function_t) ndr_print_HrRBackupOpenFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -396,7 +396,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupRead),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupRead,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupRead,
+-		(ndr_print_function_t) ndr_print_HrRBackupRead,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -405,7 +405,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupClose),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupClose,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupClose,
+-		(ndr_print_function_t) ndr_print_HrRBackupClose,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -414,7 +414,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupGetBackupLogs),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupGetBackupLogs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupGetBackupLogs,
+-		(ndr_print_function_t) ndr_print_HrRBackupGetBackupLogs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -423,7 +423,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupTruncateLogs),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupTruncateLogs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupTruncateLogs,
+-		(ndr_print_function_t) ndr_print_HrRBackupTruncateLogs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -432,7 +432,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupPing),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupPing,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupPing,
+-		(ndr_print_function_t) ndr_print_HrRBackupPing,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -789,7 +789,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRIsNTDSOnline),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRIsNTDSOnline,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRIsNTDSOnline,
+-		(ndr_print_function_t) ndr_print_HrRIsNTDSOnline,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -798,7 +798,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestorePrepare),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestorePrepare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestorePrepare,
+-		(ndr_print_function_t) ndr_print_HrRRestorePrepare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -807,7 +807,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreRegister),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreRegister,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreRegister,
+-		(ndr_print_function_t) ndr_print_HrRRestoreRegister,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -816,7 +816,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreRegisterComplete),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreRegisterComplete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreRegisterComplete,
+-		(ndr_print_function_t) ndr_print_HrRRestoreRegisterComplete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -825,7 +825,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreGetDatabaseLocations),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreGetDatabaseLocations,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreGetDatabaseLocations,
+-		(ndr_print_function_t) ndr_print_HrRRestoreGetDatabaseLocations,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -834,7 +834,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreEnd),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreEnd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreEnd,
+-		(ndr_print_function_t) ndr_print_HrRRestoreEnd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -843,7 +843,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreSetCurrentLogNumber),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreSetCurrentLogNumber,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreSetCurrentLogNumber,
+-		(ndr_print_function_t) ndr_print_HrRRestoreSetCurrentLogNumber,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -852,7 +852,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreCheckLogsForBackup),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreCheckLogsForBackup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreCheckLogsForBackup,
+-		(ndr_print_function_t) ndr_print_HrRRestoreCheckLogsForBackup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dssetup.c
++++ b/source3/librpc/gen_ndr/ndr_dssetup.c
+@@ -995,7 +995,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleGetPrimaryDomainInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleGetPrimaryDomainInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleGetPrimaryDomainInformation,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleGetPrimaryDomainInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1004,7 +1004,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDnsNameToFlatName),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDnsNameToFlatName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDnsNameToFlatName,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDnsNameToFlatName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1013,7 +1013,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDcAsDc),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDcAsDc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDcAsDc,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDcAsDc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1022,7 +1022,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDcAsReplica),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDcAsReplica,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDcAsReplica,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDcAsReplica,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1031,7 +1031,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDemoteDc),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDemoteDc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDemoteDc,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDemoteDc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1040,7 +1040,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleGetDcOperationProgress),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleGetDcOperationProgress,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleGetDcOperationProgress,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleGetDcOperationProgress,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1049,7 +1049,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleGetDcOperationResults),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleGetDcOperationResults,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleGetDcOperationResults,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleGetDcOperationResults,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1058,7 +1058,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleCancel),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleCancel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleCancel,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleCancel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1067,7 +1067,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleServerSaveStateForUpgrade),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleServerSaveStateForUpgrade,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleServerSaveStateForUpgrade,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleServerSaveStateForUpgrade,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1076,7 +1076,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleUpgradeDownlevelServer),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleUpgradeDownlevelServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleUpgradeDownlevelServer,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleUpgradeDownlevelServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1085,7 +1085,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleAbortDownlevelServerUpgrade),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleAbortDownlevelServerUpgrade,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleAbortDownlevelServerUpgrade,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleAbortDownlevelServerUpgrade,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_echo.c
++++ b/source3/librpc/gen_ndr/ndr_echo.c
+@@ -1458,7 +1458,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_AddOne),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_AddOne,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_AddOne,
+-		(ndr_print_function_t) ndr_print_echo_AddOne,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1467,7 +1467,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_EchoData),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_EchoData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_EchoData,
+-		(ndr_print_function_t) ndr_print_echo_EchoData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1476,7 +1476,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_SinkData),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_SinkData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_SinkData,
+-		(ndr_print_function_t) ndr_print_echo_SinkData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1485,7 +1485,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_SourceData),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_SourceData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_SourceData,
+-		(ndr_print_function_t) ndr_print_echo_SourceData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1494,7 +1494,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestCall),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestCall,
+-		(ndr_print_function_t) ndr_print_echo_TestCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1503,7 +1503,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestCall2),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestCall2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestCall2,
+-		(ndr_print_function_t) ndr_print_echo_TestCall2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1512,7 +1512,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestSleep),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestSleep,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestSleep,
+-		(ndr_print_function_t) ndr_print_echo_TestSleep,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1521,7 +1521,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestEnum,
+-		(ndr_print_function_t) ndr_print_echo_TestEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1530,7 +1530,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestSurrounding),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestSurrounding,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestSurrounding,
+-		(ndr_print_function_t) ndr_print_echo_TestSurrounding,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1539,7 +1539,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestDoublePointer),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestDoublePointer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestDoublePointer,
+-		(ndr_print_function_t) ndr_print_echo_TestDoublePointer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_efs.c
++++ b/source3/librpc/gen_ndr/ndr_efs.c
+@@ -1327,7 +1327,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcOpenFileRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcOpenFileRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcOpenFileRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcOpenFileRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1336,7 +1336,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcReadFileRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcReadFileRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcReadFileRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcReadFileRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1345,7 +1345,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcWriteFileRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcWriteFileRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcWriteFileRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcWriteFileRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1354,7 +1354,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcCloseRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcCloseRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcCloseRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcCloseRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1363,7 +1363,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcEncryptFileSrv),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcEncryptFileSrv,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcEncryptFileSrv,
+-		(ndr_print_function_t) ndr_print_EfsRpcEncryptFileSrv,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1372,7 +1372,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcDecryptFileSrv),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcDecryptFileSrv,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcDecryptFileSrv,
+-		(ndr_print_function_t) ndr_print_EfsRpcDecryptFileSrv,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1381,7 +1381,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcQueryUsersOnFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcQueryUsersOnFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcQueryUsersOnFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcQueryUsersOnFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1390,7 +1390,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcQueryRecoveryAgents),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcQueryRecoveryAgents,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcQueryRecoveryAgents,
+-		(ndr_print_function_t) ndr_print_EfsRpcQueryRecoveryAgents,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1399,7 +1399,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcRemoveUsersFromFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcRemoveUsersFromFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcRemoveUsersFromFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcRemoveUsersFromFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1408,7 +1408,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcAddUsersToFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcAddUsersToFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcAddUsersToFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcAddUsersToFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1417,7 +1417,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcSetFileEncryptionKey),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcSetFileEncryptionKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcSetFileEncryptionKey,
+-		(ndr_print_function_t) ndr_print_EfsRpcSetFileEncryptionKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1426,7 +1426,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcNotSupported),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcNotSupported,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcNotSupported,
+-		(ndr_print_function_t) ndr_print_EfsRpcNotSupported,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1435,7 +1435,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcFileKeyInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcFileKeyInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcFileKeyInfo,
+-		(ndr_print_function_t) ndr_print_EfsRpcFileKeyInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1444,7 +1444,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcDuplicateEncryptionInfoFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcDuplicateEncryptionInfoFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcDuplicateEncryptionInfoFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcDuplicateEncryptionInfoFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_epmapper.c
++++ b/source3/librpc/gen_ndr/ndr_epmapper.c
+@@ -2754,7 +2754,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Insert),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Insert,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Insert,
+-		(ndr_print_function_t) ndr_print_epm_Insert,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2763,7 +2763,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Delete),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Delete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Delete,
+-		(ndr_print_function_t) ndr_print_epm_Delete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2772,7 +2772,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Lookup),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Lookup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Lookup,
+-		(ndr_print_function_t) ndr_print_epm_Lookup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2781,7 +2781,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Map),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Map,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Map,
+-		(ndr_print_function_t) ndr_print_epm_Map,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2790,7 +2790,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_LookupHandleFree),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_LookupHandleFree,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_LookupHandleFree,
+-		(ndr_print_function_t) ndr_print_epm_LookupHandleFree,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2799,7 +2799,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_InqObject),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_InqObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_InqObject,
+-		(ndr_print_function_t) ndr_print_epm_InqObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2808,7 +2808,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_MgmtDelete),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_MgmtDelete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_MgmtDelete,
+-		(ndr_print_function_t) ndr_print_epm_MgmtDelete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2817,7 +2817,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_MapAuth),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_MapAuth,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_MapAuth,
+-		(ndr_print_function_t) ndr_print_epm_MapAuth,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_eventlog.c
++++ b/source3/librpc/gen_ndr/ndr_eventlog.c
+@@ -2983,7 +2983,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ClearEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ClearEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ClearEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_ClearEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2992,7 +2992,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_BackupEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_BackupEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_BackupEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_BackupEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3001,7 +3001,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_CloseEventLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_CloseEventLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_CloseEventLog,
+-		(ndr_print_function_t) ndr_print_eventlog_CloseEventLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3010,7 +3010,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_DeregisterEventSource),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_DeregisterEventSource,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_DeregisterEventSource,
+-		(ndr_print_function_t) ndr_print_eventlog_DeregisterEventSource,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3019,7 +3019,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_GetNumRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_GetNumRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_GetNumRecords,
+-		(ndr_print_function_t) ndr_print_eventlog_GetNumRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3028,7 +3028,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_GetOldestRecord),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_GetOldestRecord,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_GetOldestRecord,
+-		(ndr_print_function_t) ndr_print_eventlog_GetOldestRecord,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3037,7 +3037,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ChangeNotify),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ChangeNotify,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ChangeNotify,
+-		(ndr_print_function_t) ndr_print_eventlog_ChangeNotify,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3046,7 +3046,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3055,7 +3055,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_RegisterEventSourceW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_RegisterEventSourceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_RegisterEventSourceW,
+-		(ndr_print_function_t) ndr_print_eventlog_RegisterEventSourceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3064,7 +3064,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenBackupEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenBackupEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenBackupEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenBackupEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3073,7 +3073,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReadEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReadEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReadEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_ReadEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3082,7 +3082,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReportEventW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReportEventW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReportEventW,
+-		(ndr_print_function_t) ndr_print_eventlog_ReportEventW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3091,7 +3091,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ClearEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ClearEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ClearEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_ClearEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3100,7 +3100,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_BackupEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_BackupEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_BackupEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_BackupEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3109,7 +3109,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3118,7 +3118,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_RegisterEventSourceA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_RegisterEventSourceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_RegisterEventSourceA,
+-		(ndr_print_function_t) ndr_print_eventlog_RegisterEventSourceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3127,7 +3127,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenBackupEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenBackupEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenBackupEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenBackupEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3136,7 +3136,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReadEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReadEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReadEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_ReadEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3145,7 +3145,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReportEventA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReportEventA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReportEventA,
+-		(ndr_print_function_t) ndr_print_eventlog_ReportEventA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3154,7 +3154,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_RegisterClusterSvc),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_RegisterClusterSvc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_RegisterClusterSvc,
+-		(ndr_print_function_t) ndr_print_eventlog_RegisterClusterSvc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3163,7 +3163,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_DeregisterClusterSvc),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_DeregisterClusterSvc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_DeregisterClusterSvc,
+-		(ndr_print_function_t) ndr_print_eventlog_DeregisterClusterSvc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3172,7 +3172,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_WriteClusterEvents),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_WriteClusterEvents,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_WriteClusterEvents,
+-		(ndr_print_function_t) ndr_print_eventlog_WriteClusterEvents,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3181,7 +3181,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_GetLogInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_GetLogInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_GetLogInformation,
+-		(ndr_print_function_t) ndr_print_eventlog_GetLogInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3190,7 +3190,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_FlushEventLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_FlushEventLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_FlushEventLog,
+-		(ndr_print_function_t) ndr_print_eventlog_FlushEventLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3199,7 +3199,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReportEventAndSourceW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReportEventAndSourceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReportEventAndSourceW,
+-		(ndr_print_function_t) ndr_print_eventlog_ReportEventAndSourceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_eventlog6.c
++++ b/source3/librpc/gen_ndr/ndr_eventlog6.c
+@@ -5482,7 +5482,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRegisterRemoteSubscription),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRegisterRemoteSubscription,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRegisterRemoteSubscription,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRegisterRemoteSubscription,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5491,7 +5491,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRemoteSubscriptionNextAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRemoteSubscriptionNextAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRemoteSubscriptionNextAsync,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRemoteSubscriptionNextAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5500,7 +5500,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRemoteSubscriptionNext),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRemoteSubscriptionNext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRemoteSubscriptionNext,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRemoteSubscriptionNext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5509,7 +5509,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRemoteSubscriptionWaitAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRemoteSubscriptionWaitAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRemoteSubscriptionWaitAsync,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRemoteSubscriptionWaitAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5518,7 +5518,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRegisterControllableOperation),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRegisterControllableOperation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRegisterControllableOperation,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRegisterControllableOperation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5527,7 +5527,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRegisterLogQuery),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRegisterLogQuery,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRegisterLogQuery,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRegisterLogQuery,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5536,7 +5536,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcClearLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcClearLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcClearLog,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcClearLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5545,7 +5545,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcExportLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcExportLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcExportLog,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcExportLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5554,7 +5554,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcLocalizeExportLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcLocalizeExportLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcLocalizeExportLog,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcLocalizeExportLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5563,7 +5563,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcMessageRender),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcMessageRender,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcMessageRender,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcMessageRender,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5572,7 +5572,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcMessageRenderDefault),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcMessageRenderDefault,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcMessageRenderDefault,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcMessageRenderDefault,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5581,7 +5581,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcQueryNext),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcQueryNext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcQueryNext,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcQueryNext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5590,7 +5590,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcQuerySeek),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcQuerySeek,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcQuerySeek,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcQuerySeek,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5599,7 +5599,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcClose),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcClose,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcClose,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcClose,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5608,7 +5608,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcCancel),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcCancel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcCancel,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcCancel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5617,7 +5617,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcAssertConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcAssertConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcAssertConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcAssertConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5626,7 +5626,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRetractConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRetractConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRetractConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRetractConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5635,7 +5635,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcOpenLogHandle),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcOpenLogHandle,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcOpenLogHandle,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcOpenLogHandle,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5644,7 +5644,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetLogFileInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetLogFileInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetLogFileInfo,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetLogFileInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5653,7 +5653,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetChannelList),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetChannelList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetChannelList,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetChannelList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5662,7 +5662,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetChannelConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetChannelConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetChannelConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetChannelConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5671,7 +5671,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcPutChannelConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcPutChannelConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcPutChannelConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcPutChannelConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5680,7 +5680,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherList),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherList,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5689,7 +5689,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherListForChannel),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherListForChannel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherListForChannel,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherListForChannel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5698,7 +5698,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherMetadata),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherMetadata,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherMetadata,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherMetadata,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5707,7 +5707,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherResourceMetadata),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherResourceMetadata,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherResourceMetadata,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherResourceMetadata,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5716,7 +5716,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetEventMetadataEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetEventMetadataEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetEventMetadataEnum,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetEventMetadataEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5725,7 +5725,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetNextEventMetadata),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetNextEventMetadata,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetNextEventMetadata,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetNextEventMetadata,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5734,7 +5734,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetClassicLogDisplayName),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetClassicLogDisplayName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetClassicLogDisplayName,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetClassicLogDisplayName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_frsapi.c
++++ b/source3/librpc/gen_ndr/ndr_frsapi.c
+@@ -979,7 +979,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_VERIFY_PROMOTION),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_VERIFY_PROMOTION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_VERIFY_PROMOTION,
+-		(ndr_print_function_t) ndr_print_FRSAPI_VERIFY_PROMOTION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -988,7 +988,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_PROMOTION_STATUS),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_PROMOTION_STATUS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_PROMOTION_STATUS,
+-		(ndr_print_function_t) ndr_print_FRSAPI_PROMOTION_STATUS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -997,7 +997,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_START_DEMOTION),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_START_DEMOTION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_START_DEMOTION,
+-		(ndr_print_function_t) ndr_print_FRSAPI_START_DEMOTION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1006,7 +1006,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_COMMIT_DEMOTION),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_COMMIT_DEMOTION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_COMMIT_DEMOTION,
+-		(ndr_print_function_t) ndr_print_FRSAPI_COMMIT_DEMOTION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1015,7 +1015,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_SetDsPollingIntervalW),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_SetDsPollingIntervalW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_SetDsPollingIntervalW,
+-		(ndr_print_function_t) ndr_print_frsapi_SetDsPollingIntervalW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1024,7 +1024,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_GetDsPollingIntervalW),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_GetDsPollingIntervalW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_GetDsPollingIntervalW,
+-		(ndr_print_function_t) ndr_print_frsapi_GetDsPollingIntervalW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1033,7 +1033,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_VERIFY_PROMOTION_W),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_VERIFY_PROMOTION_W,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_VERIFY_PROMOTION_W,
+-		(ndr_print_function_t) ndr_print_FRSAPI_VERIFY_PROMOTION_W,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1042,7 +1042,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_InfoW),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_InfoW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_InfoW,
+-		(ndr_print_function_t) ndr_print_frsapi_InfoW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1051,7 +1051,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_IsPathReplicated),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_IsPathReplicated,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_IsPathReplicated,
+-		(ndr_print_function_t) ndr_print_frsapi_IsPathReplicated,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1060,7 +1060,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_WriterCommand),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_WriterCommand,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_WriterCommand,
+-		(ndr_print_function_t) ndr_print_frsapi_WriterCommand,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1069,7 +1069,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_ForceReplication),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_ForceReplication,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_ForceReplication,
+-		(ndr_print_function_t) ndr_print_frsapi_ForceReplication,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_frsrpc.c
++++ b/source3/librpc/gen_ndr/ndr_frsrpc.c
+@@ -2781,7 +2781,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsSendCommPkt),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsSendCommPkt,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsSendCommPkt,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsSendCommPkt,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2790,7 +2790,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsVerifyPromotionParent),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsVerifyPromotionParent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsVerifyPromotionParent,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsVerifyPromotionParent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2799,7 +2799,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsStartPromotionParent),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsStartPromotionParent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsStartPromotionParent,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsStartPromotionParent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2808,7 +2808,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsNOP),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsNOP,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsNOP,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsNOP,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2817,7 +2817,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2826,7 +2826,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_5),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_5,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_5,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_5,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2835,7 +2835,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_6),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_6,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_6,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_6,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2844,7 +2844,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_7),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_7,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_7,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_7,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2853,7 +2853,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_8),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_8,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_8,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_8,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2862,7 +2862,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_9),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_9,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_9,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_9,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2871,7 +2871,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_VERIFY_PROMOTION_PARENT_EX),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_VERIFY_PROMOTION_PARENT_EX,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_VERIFY_PROMOTION_PARENT_EX,
+-		(ndr_print_function_t) ndr_print_FRSRPC_VERIFY_PROMOTION_PARENT_EX,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_frstrans.c
++++ b/source3/librpc/gen_ndr/ndr_frstrans.c
+@@ -2331,7 +2331,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_CheckConnectivity),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_CheckConnectivity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_CheckConnectivity,
+-		(ndr_print_function_t) ndr_print_frstrans_CheckConnectivity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2340,7 +2340,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_EstablishConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_EstablishConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_EstablishConnection,
+-		(ndr_print_function_t) ndr_print_frstrans_EstablishConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2349,7 +2349,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_EstablishSession),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_EstablishSession,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_EstablishSession,
+-		(ndr_print_function_t) ndr_print_frstrans_EstablishSession,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2358,7 +2358,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RequestUpdates),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RequestUpdates,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RequestUpdates,
+-		(ndr_print_function_t) ndr_print_frstrans_RequestUpdates,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2367,7 +2367,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RequestVersionVector),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RequestVersionVector,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RequestVersionVector,
+-		(ndr_print_function_t) ndr_print_frstrans_RequestVersionVector,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2376,7 +2376,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_AsyncPoll),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_AsyncPoll,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_AsyncPoll,
+-		(ndr_print_function_t) ndr_print_frstrans_AsyncPoll,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2385,7 +2385,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_REQUEST_RECORDS),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_REQUEST_RECORDS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_REQUEST_RECORDS,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_REQUEST_RECORDS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2394,7 +2394,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_UPDATE_CANCEL),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_UPDATE_CANCEL,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_UPDATE_CANCEL,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_UPDATE_CANCEL,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2403,7 +2403,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RAW_GET_FILE_DATA),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RAW_GET_FILE_DATA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RAW_GET_FILE_DATA,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RAW_GET_FILE_DATA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2412,7 +2412,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_GET_SIGNATURES),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_GET_SIGNATURES,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_GET_SIGNATURES,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_GET_SIGNATURES,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2421,7 +2421,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_PUSH_SOURCE_NEEDS),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_PUSH_SOURCE_NEEDS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_PUSH_SOURCE_NEEDS,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_PUSH_SOURCE_NEEDS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2430,7 +2430,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_GET_FILE_DATA),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_GET_FILE_DATA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_GET_FILE_DATA,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_GET_FILE_DATA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2439,7 +2439,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_CLOSE),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_CLOSE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_CLOSE,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_CLOSE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2448,7 +2448,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_InitializeFileTransferAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_InitializeFileTransferAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_InitializeFileTransferAsync,
+-		(ndr_print_function_t) ndr_print_frstrans_InitializeFileTransferAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2457,7 +2457,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2466,7 +2466,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RawGetFileDataAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RawGetFileDataAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RawGetFileDataAsync,
+-		(ndr_print_function_t) ndr_print_frstrans_RawGetFileDataAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 1, frstrans_RawGetFileDataAsync_out_pipes },
+ 	},
+@@ -2475,7 +2475,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RdcGetFileDataAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RdcGetFileDataAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RdcGetFileDataAsync,
+-		(ndr_print_function_t) ndr_print_frstrans_RdcGetFileDataAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 1, frstrans_RdcGetFileDataAsync_out_pipes },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_initshutdown.c
++++ b/source3/librpc/gen_ndr/ndr_initshutdown.c
+@@ -277,7 +277,7 @@ static const struct ndr_interface_call i
+ 		sizeof(struct initshutdown_Init),
+ 		(ndr_push_flags_fn_t) ndr_push_initshutdown_Init,
+ 		(ndr_pull_flags_fn_t) ndr_pull_initshutdown_Init,
+-		(ndr_print_function_t) ndr_print_initshutdown_Init,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -286,7 +286,7 @@ static const struct ndr_interface_call i
+ 		sizeof(struct initshutdown_Abort),
+ 		(ndr_push_flags_fn_t) ndr_push_initshutdown_Abort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_initshutdown_Abort,
+-		(ndr_print_function_t) ndr_print_initshutdown_Abort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -295,7 +295,7 @@ static const struct ndr_interface_call i
+ 		sizeof(struct initshutdown_InitEx),
+ 		(ndr_push_flags_fn_t) ndr_push_initshutdown_InitEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_initshutdown_InitEx,
+-		(ndr_print_function_t) ndr_print_initshutdown_InitEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_keysvc.c
++++ b/source3/librpc/gen_ndr/ndr_keysvc.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct keysvc_Unknown0),
+ 		(ndr_push_flags_fn_t) ndr_push_keysvc_Unknown0,
+ 		(ndr_pull_flags_fn_t) ndr_pull_keysvc_Unknown0,
+-		(ndr_print_function_t) ndr_print_keysvc_Unknown0,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_krb5pac.c
++++ b/source3/librpc/gen_ndr/ndr_krb5pac.c
+@@ -1002,7 +1002,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_pac),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_pac,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_pac,
+-		(ndr_print_function_t) ndr_print_decode_pac,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1011,7 +1011,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_pac_raw),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_pac_raw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_pac_raw,
+-		(ndr_print_function_t) ndr_print_decode_pac_raw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1020,7 +1020,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_login_info),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_login_info,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_login_info,
+-		(ndr_print_function_t) ndr_print_decode_login_info,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1029,7 +1029,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_login_info_ctr),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_login_info_ctr,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_login_info_ctr,
+-		(ndr_print_function_t) ndr_print_decode_login_info_ctr,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1038,7 +1038,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_pac_validate),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_pac_validate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_pac_validate,
+-		(ndr_print_function_t) ndr_print_decode_pac_validate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_lsa.c
++++ b/source3/librpc/gen_ndr/ndr_lsa.c
+@@ -13565,7 +13565,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_Close),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_Close,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_Close,
+-		(ndr_print_function_t) ndr_print_lsa_Close,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13574,7 +13574,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_Delete),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_Delete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_Delete,
+-		(ndr_print_function_t) ndr_print_lsa_Delete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13583,7 +13583,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumPrivs),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumPrivs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumPrivs,
+-		(ndr_print_function_t) ndr_print_lsa_EnumPrivs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13592,7 +13592,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QuerySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QuerySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QuerySecurity,
+-		(ndr_print_function_t) ndr_print_lsa_QuerySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13601,7 +13601,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetSecObj),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetSecObj,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetSecObj,
+-		(ndr_print_function_t) ndr_print_lsa_SetSecObj,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13610,7 +13610,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_ChangePassword),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_ChangePassword,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_ChangePassword,
+-		(ndr_print_function_t) ndr_print_lsa_ChangePassword,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13619,7 +13619,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_OpenPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13628,7 +13628,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryInfoPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryInfoPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryInfoPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_QueryInfoPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13637,7 +13637,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetInfoPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetInfoPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetInfoPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_SetInfoPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13646,7 +13646,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_ClearAuditLog),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_ClearAuditLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_ClearAuditLog,
+-		(ndr_print_function_t) ndr_print_lsa_ClearAuditLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13655,7 +13655,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateAccount,
+-		(ndr_print_function_t) ndr_print_lsa_CreateAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13664,7 +13664,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumAccounts),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumAccounts,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumAccounts,
+-		(ndr_print_function_t) ndr_print_lsa_EnumAccounts,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13673,7 +13673,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_CreateTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13682,7 +13682,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumTrustDom),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumTrustDom,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumTrustDom,
+-		(ndr_print_function_t) ndr_print_lsa_EnumTrustDom,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13691,7 +13691,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13700,7 +13700,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupSids),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupSids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupSids,
+-		(ndr_print_function_t) ndr_print_lsa_LookupSids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13709,7 +13709,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateSecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateSecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateSecret,
+-		(ndr_print_function_t) ndr_print_lsa_CreateSecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13718,7 +13718,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenAccount,
+-		(ndr_print_function_t) ndr_print_lsa_OpenAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13727,7 +13727,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumPrivsAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumPrivsAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumPrivsAccount,
+-		(ndr_print_function_t) ndr_print_lsa_EnumPrivsAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13736,7 +13736,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_AddPrivilegesToAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_AddPrivilegesToAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_AddPrivilegesToAccount,
+-		(ndr_print_function_t) ndr_print_lsa_AddPrivilegesToAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13745,7 +13745,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_RemovePrivilegesFromAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_RemovePrivilegesFromAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_RemovePrivilegesFromAccount,
+-		(ndr_print_function_t) ndr_print_lsa_RemovePrivilegesFromAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13754,7 +13754,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_GetQuotasForAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_GetQuotasForAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_GetQuotasForAccount,
+-		(ndr_print_function_t) ndr_print_lsa_GetQuotasForAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13763,7 +13763,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetQuotasForAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetQuotasForAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetQuotasForAccount,
+-		(ndr_print_function_t) ndr_print_lsa_SetQuotasForAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13772,7 +13772,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_GetSystemAccessAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_GetSystemAccessAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_GetSystemAccessAccount,
+-		(ndr_print_function_t) ndr_print_lsa_GetSystemAccessAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13781,7 +13781,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetSystemAccessAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetSystemAccessAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetSystemAccessAccount,
+-		(ndr_print_function_t) ndr_print_lsa_SetSystemAccessAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13790,7 +13790,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_OpenTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13799,7 +13799,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryTrustedDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryTrustedDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryTrustedDomainInfo,
+-		(ndr_print_function_t) ndr_print_lsa_QueryTrustedDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13808,7 +13808,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetInformationTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetInformationTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetInformationTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_SetInformationTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13817,7 +13817,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenSecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenSecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenSecret,
+-		(ndr_print_function_t) ndr_print_lsa_OpenSecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13826,7 +13826,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetSecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetSecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetSecret,
+-		(ndr_print_function_t) ndr_print_lsa_SetSecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13835,7 +13835,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QuerySecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QuerySecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QuerySecret,
+-		(ndr_print_function_t) ndr_print_lsa_QuerySecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13844,7 +13844,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupPrivValue),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupPrivValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupPrivValue,
+-		(ndr_print_function_t) ndr_print_lsa_LookupPrivValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13853,7 +13853,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupPrivName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupPrivName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupPrivName,
+-		(ndr_print_function_t) ndr_print_lsa_LookupPrivName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13862,7 +13862,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupPrivDisplayName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupPrivDisplayName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupPrivDisplayName,
+-		(ndr_print_function_t) ndr_print_lsa_LookupPrivDisplayName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13871,7 +13871,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_DeleteObject),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_DeleteObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_DeleteObject,
+-		(ndr_print_function_t) ndr_print_lsa_DeleteObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13880,7 +13880,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumAccountsWithUserRight),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumAccountsWithUserRight,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumAccountsWithUserRight,
+-		(ndr_print_function_t) ndr_print_lsa_EnumAccountsWithUserRight,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13889,7 +13889,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumAccountRights),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumAccountRights,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumAccountRights,
+-		(ndr_print_function_t) ndr_print_lsa_EnumAccountRights,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13898,7 +13898,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_AddAccountRights),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_AddAccountRights,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_AddAccountRights,
+-		(ndr_print_function_t) ndr_print_lsa_AddAccountRights,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13907,7 +13907,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_RemoveAccountRights),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_RemoveAccountRights,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_RemoveAccountRights,
+-		(ndr_print_function_t) ndr_print_lsa_RemoveAccountRights,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13916,7 +13916,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryTrustedDomainInfoBySid),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryTrustedDomainInfoBySid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryTrustedDomainInfoBySid,
+-		(ndr_print_function_t) ndr_print_lsa_QueryTrustedDomainInfoBySid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13925,7 +13925,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetTrustedDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetTrustedDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetTrustedDomainInfo,
+-		(ndr_print_function_t) ndr_print_lsa_SetTrustedDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13934,7 +13934,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_DeleteTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_DeleteTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_DeleteTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_DeleteTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13943,7 +13943,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_StorePrivateData),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_StorePrivateData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_StorePrivateData,
+-		(ndr_print_function_t) ndr_print_lsa_StorePrivateData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13952,7 +13952,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_RetrievePrivateData),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_RetrievePrivateData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_RetrievePrivateData,
+-		(ndr_print_function_t) ndr_print_lsa_RetrievePrivateData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13961,7 +13961,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenPolicy2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenPolicy2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenPolicy2,
+-		(ndr_print_function_t) ndr_print_lsa_OpenPolicy2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13970,7 +13970,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_GetUserName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_GetUserName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_GetUserName,
+-		(ndr_print_function_t) ndr_print_lsa_GetUserName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13979,7 +13979,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryInfoPolicy2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryInfoPolicy2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryInfoPolicy2,
+-		(ndr_print_function_t) ndr_print_lsa_QueryInfoPolicy2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13988,7 +13988,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetInfoPolicy2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetInfoPolicy2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetInfoPolicy2,
+-		(ndr_print_function_t) ndr_print_lsa_SetInfoPolicy2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13997,7 +13997,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryTrustedDomainInfoByName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryTrustedDomainInfoByName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryTrustedDomainInfoByName,
+-		(ndr_print_function_t) ndr_print_lsa_QueryTrustedDomainInfoByName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14006,7 +14006,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetTrustedDomainInfoByName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetTrustedDomainInfoByName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetTrustedDomainInfoByName,
+-		(ndr_print_function_t) ndr_print_lsa_SetTrustedDomainInfoByName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14015,7 +14015,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumTrustedDomainsEx),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumTrustedDomainsEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumTrustedDomainsEx,
+-		(ndr_print_function_t) ndr_print_lsa_EnumTrustedDomainsEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14024,7 +14024,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateTrustedDomainEx),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateTrustedDomainEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateTrustedDomainEx,
+-		(ndr_print_function_t) ndr_print_lsa_CreateTrustedDomainEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14033,7 +14033,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CloseTrustedDomainEx),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CloseTrustedDomainEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CloseTrustedDomainEx,
+-		(ndr_print_function_t) ndr_print_lsa_CloseTrustedDomainEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14042,7 +14042,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryDomainInformationPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryDomainInformationPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryDomainInformationPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_QueryDomainInformationPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14051,7 +14051,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetDomainInformationPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetDomainInformationPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetDomainInformationPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_SetDomainInformationPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14060,7 +14060,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenTrustedDomainByName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenTrustedDomainByName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenTrustedDomainByName,
+-		(ndr_print_function_t) ndr_print_lsa_OpenTrustedDomainByName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14069,7 +14069,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_TestCall),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_TestCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_TestCall,
+-		(ndr_print_function_t) ndr_print_lsa_TestCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14078,7 +14078,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupSids2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupSids2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupSids2,
+-		(ndr_print_function_t) ndr_print_lsa_LookupSids2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14087,7 +14087,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames2,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14096,7 +14096,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateTrustedDomainEx2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateTrustedDomainEx2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateTrustedDomainEx2,
+-		(ndr_print_function_t) ndr_print_lsa_CreateTrustedDomainEx2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14105,7 +14105,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRWRITE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRWRITE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRWRITE,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRWRITE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14114,7 +14114,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRREAD),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRREAD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRREAD,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRREAD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14123,7 +14123,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRENUMERATE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRENUMERATE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRENUMERATE,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRENUMERATE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14132,7 +14132,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRWRITEDOMAINCREDENTIALS),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRWRITEDOMAINCREDENTIALS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRWRITEDOMAINCREDENTIALS,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRWRITEDOMAINCREDENTIALS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14141,7 +14141,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRREADDOMAINCREDENTIALS),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRREADDOMAINCREDENTIALS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRREADDOMAINCREDENTIALS,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRREADDOMAINCREDENTIALS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14150,7 +14150,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRDELETE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRDELETE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRDELETE,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRDELETE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14159,7 +14159,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRGETTARGETINFO),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRGETTARGETINFO,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRGETTARGETINFO,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRGETTARGETINFO,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14168,7 +14168,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRPROFILELOADED),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRPROFILELOADED,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRPROFILELOADED,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRPROFILELOADED,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14177,7 +14177,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames3),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames3,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14186,7 +14186,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRGETSESSIONTYPES),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRGETSESSIONTYPES,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRGETSESSIONTYPES,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRGETSESSIONTYPES,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14195,7 +14195,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARREGISTERAUDITEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARREGISTERAUDITEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARREGISTERAUDITEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARREGISTERAUDITEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14204,7 +14204,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARGENAUDITEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARGENAUDITEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARGENAUDITEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARGENAUDITEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14213,7 +14213,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARUNREGISTERAUDITEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARUNREGISTERAUDITEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARUNREGISTERAUDITEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARUNREGISTERAUDITEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14222,7 +14222,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_lsaRQueryForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_lsaRQueryForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_lsaRQueryForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_lsa_lsaRQueryForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14231,7 +14231,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_lsaRSetForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_lsaRSetForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_lsaRSetForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_lsa_lsaRSetForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14240,7 +14240,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRRENAME),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRRENAME,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRRENAME,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRRENAME,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14249,7 +14249,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupSids3),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupSids3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupSids3,
+-		(ndr_print_function_t) ndr_print_lsa_LookupSids3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14258,7 +14258,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames4),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames4,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames4,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames4,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14267,7 +14267,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSAROPENPOLICYSCE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSAROPENPOLICYSCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSAROPENPOLICYSCE,
+-		(ndr_print_function_t) ndr_print_lsa_LSAROPENPOLICYSCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14276,7 +14276,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARADTREGISTERSECURITYEVENTSOURCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARADTREGISTERSECURITYEVENTSOURCE,
+-		(ndr_print_function_t) ndr_print_lsa_LSARADTREGISTERSECURITYEVENTSOURCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14285,7 +14285,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE,
+-		(ndr_print_function_t) ndr_print_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14294,7 +14294,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARADTREPORTSECURITYEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARADTREPORTSECURITYEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARADTREPORTSECURITYEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARADTREPORTSECURITYEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_mgmt.c
++++ b/source3/librpc/gen_ndr/ndr_mgmt.c
+@@ -515,7 +515,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_inq_if_ids),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_inq_if_ids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_inq_if_ids,
+-		(ndr_print_function_t) ndr_print_mgmt_inq_if_ids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -524,7 +524,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_inq_stats),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_inq_stats,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_inq_stats,
+-		(ndr_print_function_t) ndr_print_mgmt_inq_stats,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -533,7 +533,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_is_server_listening),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_is_server_listening,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_is_server_listening,
+-		(ndr_print_function_t) ndr_print_mgmt_is_server_listening,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -542,7 +542,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_stop_server_listening),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_stop_server_listening,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_stop_server_listening,
+-		(ndr_print_function_t) ndr_print_mgmt_stop_server_listening,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -551,7 +551,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_inq_princ_name),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_inq_princ_name,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_inq_princ_name,
+-		(ndr_print_function_t) ndr_print_mgmt_inq_princ_name,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_msgsvc.c
++++ b/source3/librpc/gen_ndr/ndr_msgsvc.c
+@@ -165,7 +165,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameAdd,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -174,7 +174,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameEnum,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -183,7 +183,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameGetInfo,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -192,7 +192,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameDel),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameDel,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -276,7 +276,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrSendMessage),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrSendMessage,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrSendMessage,
+-		(ndr_print_function_t) ndr_print_NetrSendMessage,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_nbt.c
++++ b/source3/librpc/gen_ndr/ndr_nbt.c
+@@ -3671,7 +3671,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_nbt_netlogon_packet),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_nbt_netlogon_packet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_nbt_netlogon_packet,
+-		(ndr_print_function_t) ndr_print_decode_nbt_netlogon_packet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_netlogon.c
++++ b/source3/librpc/gen_ndr/ndr_netlogon.c
+@@ -17827,7 +17827,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonUasLogon),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonUasLogon,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonUasLogon,
+-		(ndr_print_function_t) ndr_print_netr_LogonUasLogon,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17836,7 +17836,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonUasLogoff),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonUasLogoff,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonUasLogoff,
+-		(ndr_print_function_t) ndr_print_netr_LogonUasLogoff,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17845,7 +17845,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogon),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogon,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogon,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogon,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17854,7 +17854,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogoff),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogoff,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogoff,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogoff,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17863,7 +17863,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerReqChallenge),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerReqChallenge,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerReqChallenge,
+-		(ndr_print_function_t) ndr_print_netr_ServerReqChallenge,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17872,7 +17872,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerAuthenticate),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerAuthenticate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerAuthenticate,
+-		(ndr_print_function_t) ndr_print_netr_ServerAuthenticate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17881,7 +17881,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerPasswordSet),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerPasswordSet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerPasswordSet,
+-		(ndr_print_function_t) ndr_print_netr_ServerPasswordSet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17890,7 +17890,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseDeltas),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseDeltas,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseDeltas,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseDeltas,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17899,7 +17899,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseSync),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseSync,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17908,7 +17908,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_AccountDeltas),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_AccountDeltas,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_AccountDeltas,
+-		(ndr_print_function_t) ndr_print_netr_AccountDeltas,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17917,7 +17917,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_AccountSync),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_AccountSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_AccountSync,
+-		(ndr_print_function_t) ndr_print_netr_AccountSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17926,7 +17926,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_GetDcName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_GetDcName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_GetDcName,
+-		(ndr_print_function_t) ndr_print_netr_GetDcName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17935,7 +17935,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonControl),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonControl,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonControl,
+-		(ndr_print_function_t) ndr_print_netr_LogonControl,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17944,7 +17944,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_GetAnyDCName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_GetAnyDCName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_GetAnyDCName,
+-		(ndr_print_function_t) ndr_print_netr_GetAnyDCName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17953,7 +17953,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonControl2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonControl2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonControl2,
+-		(ndr_print_function_t) ndr_print_netr_LogonControl2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17962,7 +17962,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerAuthenticate2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerAuthenticate2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerAuthenticate2,
+-		(ndr_print_function_t) ndr_print_netr_ServerAuthenticate2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17971,7 +17971,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseSync2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseSync2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseSync2,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseSync2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17980,7 +17980,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseRedo),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseRedo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseRedo,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseRedo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17989,7 +17989,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonControl2Ex),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonControl2Ex,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonControl2Ex,
+-		(ndr_print_function_t) ndr_print_netr_LogonControl2Ex,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17998,7 +17998,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NetrEnumerateTrustedDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NetrEnumerateTrustedDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NetrEnumerateTrustedDomains,
+-		(ndr_print_function_t) ndr_print_netr_NetrEnumerateTrustedDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18007,7 +18007,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetDCName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetDCName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetDCName,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetDCName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18016,7 +18016,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonGetCapabilities),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonGetCapabilities,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonGetCapabilities,
+-		(ndr_print_function_t) ndr_print_netr_LogonGetCapabilities,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18025,7 +18025,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONSETSERVICEBITS),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONSETSERVICEBITS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONSETSERVICEBITS,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONSETSERVICEBITS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18034,7 +18034,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonGetTrustRid),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonGetTrustRid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonGetTrustRid,
+-		(ndr_print_function_t) ndr_print_netr_LogonGetTrustRid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18043,7 +18043,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONCOMPUTESERVERDIGEST),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONCOMPUTESERVERDIGEST,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONCOMPUTESERVERDIGEST,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONCOMPUTESERVERDIGEST,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18052,7 +18052,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONCOMPUTECLIENTDIGEST),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONCOMPUTECLIENTDIGEST,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONCOMPUTECLIENTDIGEST,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONCOMPUTECLIENTDIGEST,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18061,7 +18061,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerAuthenticate3),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerAuthenticate3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerAuthenticate3,
+-		(ndr_print_function_t) ndr_print_netr_ServerAuthenticate3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18070,7 +18070,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetDCNameEx),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetDCNameEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetDCNameEx,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetDCNameEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18079,7 +18079,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetSiteName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetSiteName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetSiteName,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetSiteName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18088,7 +18088,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonGetDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonGetDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonGetDomainInfo,
+-		(ndr_print_function_t) ndr_print_netr_LogonGetDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18097,7 +18097,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerPasswordSet2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerPasswordSet2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerPasswordSet2,
+-		(ndr_print_function_t) ndr_print_netr_ServerPasswordSet2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18106,7 +18106,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerPasswordGet),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerPasswordGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerPasswordGet,
+-		(ndr_print_function_t) ndr_print_netr_ServerPasswordGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18115,7 +18115,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONSENDTOSAM),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONSENDTOSAM,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONSENDTOSAM,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONSENDTOSAM,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18124,7 +18124,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRAddressToSitenamesW),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRAddressToSitenamesW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRAddressToSitenamesW,
+-		(ndr_print_function_t) ndr_print_netr_DsRAddressToSitenamesW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18133,7 +18133,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetDCNameEx2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetDCNameEx2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetDCNameEx2,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetDCNameEx2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18142,7 +18142,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18151,7 +18151,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NetrEnumerateTrustedDomainsEx),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NetrEnumerateTrustedDomainsEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NetrEnumerateTrustedDomainsEx,
+-		(ndr_print_function_t) ndr_print_netr_NetrEnumerateTrustedDomainsEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18160,7 +18160,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRAddressToSitenamesExW),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRAddressToSitenamesExW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRAddressToSitenamesExW,
+-		(ndr_print_function_t) ndr_print_netr_DsRAddressToSitenamesExW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18169,7 +18169,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrGetDcSiteCoverageW),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrGetDcSiteCoverageW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrGetDcSiteCoverageW,
+-		(ndr_print_function_t) ndr_print_netr_DsrGetDcSiteCoverageW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18178,7 +18178,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogonEx),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogonEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogonEx,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogonEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18187,7 +18187,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrEnumerateDomainTrusts),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrEnumerateDomainTrusts,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrEnumerateDomainTrusts,
+-		(ndr_print_function_t) ndr_print_netr_DsrEnumerateDomainTrusts,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18196,7 +18196,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrDeregisterDNSHostRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrDeregisterDNSHostRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrDeregisterDNSHostRecords,
+-		(ndr_print_function_t) ndr_print_netr_DsrDeregisterDNSHostRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18205,7 +18205,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerTrustPasswordsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerTrustPasswordsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerTrustPasswordsGet,
+-		(ndr_print_function_t) ndr_print_netr_ServerTrustPasswordsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18214,7 +18214,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18223,7 +18223,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_GetForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_GetForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_GetForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_netr_GetForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18232,7 +18232,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogonWithFlags),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogonWithFlags,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogonWithFlags,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogonWithFlags,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18241,7 +18241,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerGetTrustInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerGetTrustInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerGetTrustInfo,
+-		(ndr_print_function_t) ndr_print_netr_ServerGetTrustInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18250,7 +18250,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_Unused47),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_Unused47,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_Unused47,
+-		(ndr_print_function_t) ndr_print_netr_Unused47,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18259,7 +18259,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrUpdateReadOnlyServerDnsRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrUpdateReadOnlyServerDnsRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrUpdateReadOnlyServerDnsRecords,
+-		(ndr_print_function_t) ndr_print_netr_DsrUpdateReadOnlyServerDnsRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_ntlmssp.c
++++ b/source3/librpc/gen_ndr/ndr_ntlmssp.c
+@@ -2408,7 +2408,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_NEGOTIATE_MESSAGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_NEGOTIATE_MESSAGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_NEGOTIATE_MESSAGE,
+-		(ndr_print_function_t) ndr_print_decode_NEGOTIATE_MESSAGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2417,7 +2417,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_CHALLENGE_MESSAGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_CHALLENGE_MESSAGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_CHALLENGE_MESSAGE,
+-		(ndr_print_function_t) ndr_print_decode_CHALLENGE_MESSAGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2426,7 +2426,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_AUTHENTICATE_MESSAGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_AUTHENTICATE_MESSAGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_AUTHENTICATE_MESSAGE,
+-		(ndr_print_function_t) ndr_print_decode_AUTHENTICATE_MESSAGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2435,7 +2435,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_NTLMv2_CLIENT_CHALLENGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_NTLMv2_CLIENT_CHALLENGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_NTLMv2_CLIENT_CHALLENGE,
+-		(ndr_print_function_t) ndr_print_decode_NTLMv2_CLIENT_CHALLENGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2444,7 +2444,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_NTLMv2_RESPONSE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_NTLMv2_RESPONSE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_NTLMv2_RESPONSE,
+-		(ndr_print_function_t) ndr_print_decode_NTLMv2_RESPONSE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_ntprinting.c
++++ b/source3/librpc/gen_ndr/ndr_ntprinting.c
+@@ -902,7 +902,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_ntprinting_form),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_form,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_form,
+-		(ndr_print_function_t) ndr_print_decode_ntprinting_form,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -911,7 +911,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_ntprinting_driver),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_driver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_driver,
+-		(ndr_print_function_t) ndr_print_decode_ntprinting_driver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -920,7 +920,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_ntprinting_printer),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_printer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_printer,
+-		(ndr_print_function_t) ndr_print_decode_ntprinting_printer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_ntsvcs.c
++++ b/source3/librpc/gen_ndr/ndr_ntsvcs.c
+@@ -3466,7 +3466,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_Disconnect),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_Disconnect,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_Disconnect,
+-		(ndr_print_function_t) ndr_print_PNP_Disconnect,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3475,7 +3475,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_Connect),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_Connect,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_Connect,
+-		(ndr_print_function_t) ndr_print_PNP_Connect,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3484,7 +3484,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetVersion),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetVersion,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetVersion,
+-		(ndr_print_function_t) ndr_print_PNP_GetVersion,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3493,7 +3493,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetGlobalState),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetGlobalState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetGlobalState,
+-		(ndr_print_function_t) ndr_print_PNP_GetGlobalState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3502,7 +3502,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_InitDetection),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_InitDetection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_InitDetection,
+-		(ndr_print_function_t) ndr_print_PNP_InitDetection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3511,7 +3511,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_ReportLogOn),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_ReportLogOn,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_ReportLogOn,
+-		(ndr_print_function_t) ndr_print_PNP_ReportLogOn,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3520,7 +3520,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_ValidateDeviceInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_ValidateDeviceInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_ValidateDeviceInstance,
+-		(ndr_print_function_t) ndr_print_PNP_ValidateDeviceInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3529,7 +3529,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetRootDeviceInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetRootDeviceInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetRootDeviceInstance,
+-		(ndr_print_function_t) ndr_print_PNP_GetRootDeviceInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3538,7 +3538,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetRelatedDeviceInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetRelatedDeviceInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetRelatedDeviceInstance,
+-		(ndr_print_function_t) ndr_print_PNP_GetRelatedDeviceInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3547,7 +3547,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_EnumerateSubKeys),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_EnumerateSubKeys,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_EnumerateSubKeys,
+-		(ndr_print_function_t) ndr_print_PNP_EnumerateSubKeys,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3556,7 +3556,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceList),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceList,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3565,7 +3565,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceListSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceListSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceListSize,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceListSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3574,7 +3574,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDepth),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDepth,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDepth,
+-		(ndr_print_function_t) ndr_print_PNP_GetDepth,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3583,7 +3583,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3592,7 +3592,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetDeviceRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetDeviceRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetDeviceRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_SetDeviceRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3601,7 +3601,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassInstance,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3610,7 +3610,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_CreateKey),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_CreateKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_CreateKey,
+-		(ndr_print_function_t) ndr_print_PNP_CreateKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3619,7 +3619,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DeleteRegistryKey),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DeleteRegistryKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DeleteRegistryKey,
+-		(ndr_print_function_t) ndr_print_PNP_DeleteRegistryKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3628,7 +3628,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassCount),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassCount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassCount,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassCount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3637,7 +3637,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassName),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassName,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3646,7 +3646,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DeleteClassKey),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DeleteClassKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DeleteClassKey,
+-		(ndr_print_function_t) ndr_print_PNP_DeleteClassKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3655,7 +3655,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetInterfaceDeviceAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetInterfaceDeviceAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetInterfaceDeviceAlias,
+-		(ndr_print_function_t) ndr_print_PNP_GetInterfaceDeviceAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3664,7 +3664,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetInterfaceDeviceList),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetInterfaceDeviceList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetInterfaceDeviceList,
+-		(ndr_print_function_t) ndr_print_PNP_GetInterfaceDeviceList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3673,7 +3673,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetInterfaceDeviceListSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetInterfaceDeviceListSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetInterfaceDeviceListSize,
+-		(ndr_print_function_t) ndr_print_PNP_GetInterfaceDeviceListSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3682,7 +3682,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RegisterDeviceClassAssociation),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RegisterDeviceClassAssociation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RegisterDeviceClassAssociation,
+-		(ndr_print_function_t) ndr_print_PNP_RegisterDeviceClassAssociation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3691,7 +3691,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_UnregisterDeviceClassAssociation),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_UnregisterDeviceClassAssociation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_UnregisterDeviceClassAssociation,
+-		(ndr_print_function_t) ndr_print_PNP_UnregisterDeviceClassAssociation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3700,7 +3700,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3709,7 +3709,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetClassRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetClassRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetClassRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_SetClassRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3718,7 +3718,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_CreateDevInst),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_CreateDevInst,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_CreateDevInst,
+-		(ndr_print_function_t) ndr_print_PNP_CreateDevInst,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3727,7 +3727,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DeviceInstanceAction),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DeviceInstanceAction,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DeviceInstanceAction,
+-		(ndr_print_function_t) ndr_print_PNP_DeviceInstanceAction,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3736,7 +3736,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceStatus,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3745,7 +3745,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetDeviceProblem),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetDeviceProblem,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetDeviceProblem,
+-		(ndr_print_function_t) ndr_print_PNP_SetDeviceProblem,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3754,7 +3754,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DisableDevInst),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DisableDevInst,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DisableDevInst,
+-		(ndr_print_function_t) ndr_print_PNP_DisableDevInst,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3763,7 +3763,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_UninstallDevInst),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_UninstallDevInst,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_UninstallDevInst,
+-		(ndr_print_function_t) ndr_print_PNP_UninstallDevInst,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3772,7 +3772,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_AddID),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_AddID,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_AddID,
+-		(ndr_print_function_t) ndr_print_PNP_AddID,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3781,7 +3781,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RegisterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RegisterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RegisterDriver,
+-		(ndr_print_function_t) ndr_print_PNP_RegisterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3790,7 +3790,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryRemove),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryRemove,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryRemove,
+-		(ndr_print_function_t) ndr_print_PNP_QueryRemove,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3799,7 +3799,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RequestDeviceEject),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RequestDeviceEject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RequestDeviceEject,
+-		(ndr_print_function_t) ndr_print_PNP_RequestDeviceEject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3808,7 +3808,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_IsDockStationPresent),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_IsDockStationPresent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_IsDockStationPresent,
+-		(ndr_print_function_t) ndr_print_PNP_IsDockStationPresent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3817,7 +3817,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RequestEjectPC),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RequestEjectPC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RequestEjectPC,
+-		(ndr_print_function_t) ndr_print_PNP_RequestEjectPC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3826,7 +3826,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_HwProfFlags),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_HwProfFlags,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_HwProfFlags,
+-		(ndr_print_function_t) ndr_print_PNP_HwProfFlags,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3835,7 +3835,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetHwProfInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetHwProfInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetHwProfInfo,
+-		(ndr_print_function_t) ndr_print_PNP_GetHwProfInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3844,7 +3844,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_AddEmptyLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_AddEmptyLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_AddEmptyLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_AddEmptyLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3853,7 +3853,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_FreeLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_FreeLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_FreeLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_FreeLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3862,7 +3862,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetFirstLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetFirstLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetFirstLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_GetFirstLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3871,7 +3871,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetNextLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetNextLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetNextLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_GetNextLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3880,7 +3880,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetLogConfPriority),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetLogConfPriority,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetLogConfPriority,
+-		(ndr_print_function_t) ndr_print_PNP_GetLogConfPriority,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3889,7 +3889,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_AddResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_AddResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_AddResDes,
+-		(ndr_print_function_t) ndr_print_PNP_AddResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3898,7 +3898,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_FreeResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_FreeResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_FreeResDes,
+-		(ndr_print_function_t) ndr_print_PNP_FreeResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3907,7 +3907,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetNextResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetNextResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetNextResDes,
+-		(ndr_print_function_t) ndr_print_PNP_GetNextResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3916,7 +3916,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetResDesData),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetResDesData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetResDesData,
+-		(ndr_print_function_t) ndr_print_PNP_GetResDesData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3925,7 +3925,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetResDesDataSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetResDesDataSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetResDesDataSize,
+-		(ndr_print_function_t) ndr_print_PNP_GetResDesDataSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3934,7 +3934,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_ModifyResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_ModifyResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_ModifyResDes,
+-		(ndr_print_function_t) ndr_print_PNP_ModifyResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3943,7 +3943,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DetectResourceLimit),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DetectResourceLimit,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DetectResourceLimit,
+-		(ndr_print_function_t) ndr_print_PNP_DetectResourceLimit,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3952,7 +3952,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryResConfList),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryResConfList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryResConfList,
+-		(ndr_print_function_t) ndr_print_PNP_QueryResConfList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3961,7 +3961,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetHwProf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetHwProf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetHwProf,
+-		(ndr_print_function_t) ndr_print_PNP_SetHwProf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3970,7 +3970,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryArbitratorFreeData),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryArbitratorFreeData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryArbitratorFreeData,
+-		(ndr_print_function_t) ndr_print_PNP_QueryArbitratorFreeData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3979,7 +3979,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryArbitratorFreeSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryArbitratorFreeSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryArbitratorFreeSize,
+-		(ndr_print_function_t) ndr_print_PNP_QueryArbitratorFreeSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3988,7 +3988,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RunDetection),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RunDetection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RunDetection,
+-		(ndr_print_function_t) ndr_print_PNP_RunDetection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3997,7 +3997,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RegisterNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RegisterNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RegisterNotification,
+-		(ndr_print_function_t) ndr_print_PNP_RegisterNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4006,7 +4006,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_UnregisterNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_UnregisterNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_UnregisterNotification,
+-		(ndr_print_function_t) ndr_print_PNP_UnregisterNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4015,7 +4015,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetCustomDevProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetCustomDevProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetCustomDevProp,
+-		(ndr_print_function_t) ndr_print_PNP_GetCustomDevProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4024,7 +4024,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetVersionInternal),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetVersionInternal,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetVersionInternal,
+-		(ndr_print_function_t) ndr_print_PNP_GetVersionInternal,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4033,7 +4033,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetBlockedDriverInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetBlockedDriverInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetBlockedDriverInfo,
+-		(ndr_print_function_t) ndr_print_PNP_GetBlockedDriverInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4042,7 +4042,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetServerSideDeviceInstallFlags),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetServerSideDeviceInstallFlags,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetServerSideDeviceInstallFlags,
+-		(ndr_print_function_t) ndr_print_PNP_GetServerSideDeviceInstallFlags,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_oxidresolver.c
++++ b/source3/librpc/gen_ndr/ndr_oxidresolver.c
+@@ -761,7 +761,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ResolveOxid),
+ 		(ndr_push_flags_fn_t) ndr_push_ResolveOxid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ResolveOxid,
+-		(ndr_print_function_t) ndr_print_ResolveOxid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -770,7 +770,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct SimplePing),
+ 		(ndr_push_flags_fn_t) ndr_push_SimplePing,
+ 		(ndr_pull_flags_fn_t) ndr_pull_SimplePing,
+-		(ndr_print_function_t) ndr_print_SimplePing,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -779,7 +779,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ComplexPing),
+ 		(ndr_push_flags_fn_t) ndr_push_ComplexPing,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ComplexPing,
+-		(ndr_print_function_t) ndr_print_ComplexPing,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -788,7 +788,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ServerAlive),
+ 		(ndr_push_flags_fn_t) ndr_push_ServerAlive,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ServerAlive,
+-		(ndr_print_function_t) ndr_print_ServerAlive,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -797,7 +797,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ResolveOxid2),
+ 		(ndr_push_flags_fn_t) ndr_push_ResolveOxid2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ResolveOxid2,
+-		(ndr_print_function_t) ndr_print_ResolveOxid2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -806,7 +806,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ServerAlive2),
+ 		(ndr_push_flags_fn_t) ndr_push_ServerAlive2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ServerAlive2,
+-		(ndr_print_function_t) ndr_print_ServerAlive2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_policyagent.c
++++ b/source3/librpc/gen_ndr/ndr_policyagent.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call p
+ 		sizeof(struct policyagent_Dummy),
+ 		(ndr_push_flags_fn_t) ndr_push_policyagent_Dummy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_policyagent_Dummy,
+-		(ndr_print_function_t) ndr_print_policyagent_Dummy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_preg.c
++++ b/source3/librpc/gen_ndr/ndr_preg.c
+@@ -204,7 +204,7 @@ static const struct ndr_interface_call p
+ 		sizeof(struct decode_preg_file),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_preg_file,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_preg_file,
+-		(ndr_print_function_t) ndr_print_decode_preg_file,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_remact.c
++++ b/source3/librpc/gen_ndr/ndr_remact.c
+@@ -373,7 +373,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemoteActivation),
+ 		(ndr_push_flags_fn_t) ndr_push_RemoteActivation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemoteActivation,
+-		(ndr_print_function_t) ndr_print_RemoteActivation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_rot.c
++++ b/source3/librpc/gen_ndr/ndr_rot.c
+@@ -489,7 +489,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_add),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_add,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_add,
+-		(ndr_print_function_t) ndr_print_rot_add,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -498,7 +498,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_remove),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_remove,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_remove,
+-		(ndr_print_function_t) ndr_print_rot_remove,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -507,7 +507,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_is_listed),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_is_listed,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_is_listed,
+-		(ndr_print_function_t) ndr_print_rot_is_listed,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -516,7 +516,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_get_interface_pointer),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_get_interface_pointer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_get_interface_pointer,
+-		(ndr_print_function_t) ndr_print_rot_get_interface_pointer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -525,7 +525,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_set_modification_time),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_set_modification_time,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_set_modification_time,
+-		(ndr_print_function_t) ndr_print_rot_set_modification_time,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -534,7 +534,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_get_modification_time),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_get_modification_time,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_get_modification_time,
+-		(ndr_print_function_t) ndr_print_rot_get_modification_time,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -543,7 +543,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_enum),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_enum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_enum,
+-		(ndr_print_function_t) ndr_print_rot_enum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_samr.c
++++ b/source3/librpc/gen_ndr/ndr_samr.c
+@@ -12674,7 +12674,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect,
+-		(ndr_print_function_t) ndr_print_samr_Connect,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12683,7 +12683,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Close),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Close,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Close,
+-		(ndr_print_function_t) ndr_print_samr_Close,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12692,7 +12692,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetSecurity,
+-		(ndr_print_function_t) ndr_print_samr_SetSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12701,7 +12701,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QuerySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QuerySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QuerySecurity,
+-		(ndr_print_function_t) ndr_print_samr_QuerySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12710,7 +12710,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Shutdown),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Shutdown,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Shutdown,
+-		(ndr_print_function_t) ndr_print_samr_Shutdown,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12719,7 +12719,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_LookupDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_LookupDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_LookupDomain,
+-		(ndr_print_function_t) ndr_print_samr_LookupDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12728,7 +12728,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomains,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12737,7 +12737,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenDomain,
+-		(ndr_print_function_t) ndr_print_samr_OpenDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12746,7 +12746,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDomainInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12755,7 +12755,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetDomainInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12764,7 +12764,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateDomainGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateDomainGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateDomainGroup,
+-		(ndr_print_function_t) ndr_print_samr_CreateDomainGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12773,7 +12773,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomainGroups),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomainGroups,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomainGroups,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomainGroups,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12782,7 +12782,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateUser,
+-		(ndr_print_function_t) ndr_print_samr_CreateUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12791,7 +12791,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomainUsers),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomainUsers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomainUsers,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomainUsers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12800,7 +12800,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateDomAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateDomAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateDomAlias,
+-		(ndr_print_function_t) ndr_print_samr_CreateDomAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12809,7 +12809,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomainAliases),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomainAliases,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomainAliases,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomainAliases,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12818,7 +12818,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetAliasMembership),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetAliasMembership,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetAliasMembership,
+-		(ndr_print_function_t) ndr_print_samr_GetAliasMembership,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12827,7 +12827,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_LookupNames),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_LookupNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_LookupNames,
+-		(ndr_print_function_t) ndr_print_samr_LookupNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12836,7 +12836,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_LookupRids),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_LookupRids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_LookupRids,
+-		(ndr_print_function_t) ndr_print_samr_LookupRids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12845,7 +12845,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenGroup,
+-		(ndr_print_function_t) ndr_print_samr_OpenGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12854,7 +12854,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryGroupInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryGroupInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryGroupInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryGroupInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12863,7 +12863,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetGroupInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetGroupInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetGroupInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetGroupInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12872,7 +12872,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_AddGroupMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_AddGroupMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_AddGroupMember,
+-		(ndr_print_function_t) ndr_print_samr_AddGroupMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12881,7 +12881,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteDomainGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteDomainGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteDomainGroup,
+-		(ndr_print_function_t) ndr_print_samr_DeleteDomainGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12890,7 +12890,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteGroupMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteGroupMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteGroupMember,
+-		(ndr_print_function_t) ndr_print_samr_DeleteGroupMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12899,7 +12899,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryGroupMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryGroupMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryGroupMember,
+-		(ndr_print_function_t) ndr_print_samr_QueryGroupMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12908,7 +12908,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetMemberAttributesOfGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetMemberAttributesOfGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetMemberAttributesOfGroup,
+-		(ndr_print_function_t) ndr_print_samr_SetMemberAttributesOfGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12917,7 +12917,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenAlias,
+-		(ndr_print_function_t) ndr_print_samr_OpenAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12926,7 +12926,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryAliasInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryAliasInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryAliasInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryAliasInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12935,7 +12935,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetAliasInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetAliasInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetAliasInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetAliasInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12944,7 +12944,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteDomAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteDomAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteDomAlias,
+-		(ndr_print_function_t) ndr_print_samr_DeleteDomAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12953,7 +12953,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_AddAliasMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_AddAliasMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_AddAliasMember,
+-		(ndr_print_function_t) ndr_print_samr_AddAliasMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12962,7 +12962,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteAliasMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteAliasMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteAliasMember,
+-		(ndr_print_function_t) ndr_print_samr_DeleteAliasMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12971,7 +12971,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetMembersInAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetMembersInAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetMembersInAlias,
+-		(ndr_print_function_t) ndr_print_samr_GetMembersInAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12980,7 +12980,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenUser,
+-		(ndr_print_function_t) ndr_print_samr_OpenUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12989,7 +12989,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteUser,
+-		(ndr_print_function_t) ndr_print_samr_DeleteUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12998,7 +12998,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryUserInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryUserInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryUserInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryUserInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13007,7 +13007,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetUserInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetUserInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetUserInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetUserInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13016,7 +13016,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ChangePasswordUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ChangePasswordUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ChangePasswordUser,
+-		(ndr_print_function_t) ndr_print_samr_ChangePasswordUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13025,7 +13025,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetGroupsForUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetGroupsForUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetGroupsForUser,
+-		(ndr_print_function_t) ndr_print_samr_GetGroupsForUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13034,7 +13034,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDisplayInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDisplayInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDisplayInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryDisplayInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13043,7 +13043,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetDisplayEnumerationIndex),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetDisplayEnumerationIndex,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetDisplayEnumerationIndex,
+-		(ndr_print_function_t) ndr_print_samr_GetDisplayEnumerationIndex,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13052,7 +13052,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_TestPrivateFunctionsDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_TestPrivateFunctionsDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_TestPrivateFunctionsDomain,
+-		(ndr_print_function_t) ndr_print_samr_TestPrivateFunctionsDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13061,7 +13061,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_TestPrivateFunctionsUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_TestPrivateFunctionsUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_TestPrivateFunctionsUser,
+-		(ndr_print_function_t) ndr_print_samr_TestPrivateFunctionsUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13070,7 +13070,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetUserPwInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetUserPwInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetUserPwInfo,
+-		(ndr_print_function_t) ndr_print_samr_GetUserPwInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13079,7 +13079,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_RemoveMemberFromForeignDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_RemoveMemberFromForeignDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_RemoveMemberFromForeignDomain,
+-		(ndr_print_function_t) ndr_print_samr_RemoveMemberFromForeignDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13088,7 +13088,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDomainInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDomainInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDomainInfo2,
+-		(ndr_print_function_t) ndr_print_samr_QueryDomainInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13097,7 +13097,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryUserInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryUserInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryUserInfo2,
+-		(ndr_print_function_t) ndr_print_samr_QueryUserInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13106,7 +13106,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDisplayInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDisplayInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDisplayInfo2,
+-		(ndr_print_function_t) ndr_print_samr_QueryDisplayInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13115,7 +13115,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetDisplayEnumerationIndex2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetDisplayEnumerationIndex2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetDisplayEnumerationIndex2,
+-		(ndr_print_function_t) ndr_print_samr_GetDisplayEnumerationIndex2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13124,7 +13124,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateUser2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateUser2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateUser2,
+-		(ndr_print_function_t) ndr_print_samr_CreateUser2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13133,7 +13133,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDisplayInfo3),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDisplayInfo3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDisplayInfo3,
+-		(ndr_print_function_t) ndr_print_samr_QueryDisplayInfo3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13142,7 +13142,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_AddMultipleMembersToAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_AddMultipleMembersToAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_AddMultipleMembersToAlias,
+-		(ndr_print_function_t) ndr_print_samr_AddMultipleMembersToAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13151,7 +13151,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_RemoveMultipleMembersFromAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_RemoveMultipleMembersFromAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_RemoveMultipleMembersFromAlias,
+-		(ndr_print_function_t) ndr_print_samr_RemoveMultipleMembersFromAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13160,7 +13160,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OemChangePasswordUser2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OemChangePasswordUser2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OemChangePasswordUser2,
+-		(ndr_print_function_t) ndr_print_samr_OemChangePasswordUser2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13169,7 +13169,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ChangePasswordUser2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ChangePasswordUser2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ChangePasswordUser2,
+-		(ndr_print_function_t) ndr_print_samr_ChangePasswordUser2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13178,7 +13178,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetDomPwInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetDomPwInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetDomPwInfo,
+-		(ndr_print_function_t) ndr_print_samr_GetDomPwInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13187,7 +13187,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect2,
+-		(ndr_print_function_t) ndr_print_samr_Connect2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13196,7 +13196,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetUserInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetUserInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetUserInfo2,
+-		(ndr_print_function_t) ndr_print_samr_SetUserInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13205,7 +13205,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetBootKeyInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetBootKeyInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetBootKeyInformation,
+-		(ndr_print_function_t) ndr_print_samr_SetBootKeyInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13214,7 +13214,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetBootKeyInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetBootKeyInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetBootKeyInformation,
+-		(ndr_print_function_t) ndr_print_samr_GetBootKeyInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13223,7 +13223,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect3),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect3,
+-		(ndr_print_function_t) ndr_print_samr_Connect3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13232,7 +13232,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect4),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect4,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect4,
+-		(ndr_print_function_t) ndr_print_samr_Connect4,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13241,7 +13241,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ChangePasswordUser3),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ChangePasswordUser3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ChangePasswordUser3,
+-		(ndr_print_function_t) ndr_print_samr_ChangePasswordUser3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13250,7 +13250,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect5),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect5,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect5,
+-		(ndr_print_function_t) ndr_print_samr_Connect5,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13259,7 +13259,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_RidToSid),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_RidToSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_RidToSid,
+-		(ndr_print_function_t) ndr_print_samr_RidToSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13268,7 +13268,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetDsrmPassword),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetDsrmPassword,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetDsrmPassword,
+-		(ndr_print_function_t) ndr_print_samr_SetDsrmPassword,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13277,7 +13277,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ValidatePassword),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ValidatePassword,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ValidatePassword,
+-		(ndr_print_function_t) ndr_print_samr_ValidatePassword,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_scerpc.c
++++ b/source3/librpc/gen_ndr/ndr_scerpc.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct scerpc_Unknown0),
+ 		(ndr_push_flags_fn_t) ndr_push_scerpc_Unknown0,
+ 		(ndr_pull_flags_fn_t) ndr_pull_scerpc_Unknown0,
+-		(ndr_print_function_t) ndr_print_scerpc_Unknown0,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_spoolss.c
++++ b/source3/librpc/gen_ndr/ndr_spoolss.c
+@@ -32660,7 +32660,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinters),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinters,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinters,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinters,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32669,7 +32669,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_OpenPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_OpenPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_OpenPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_OpenPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32678,7 +32678,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetJob,
+-		(ndr_print_function_t) ndr_print_spoolss_SetJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32687,7 +32687,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetJob,
+-		(ndr_print_function_t) ndr_print_spoolss_GetJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32696,7 +32696,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumJobs),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumJobs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumJobs,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumJobs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32705,7 +32705,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32714,7 +32714,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32723,7 +32723,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32732,7 +32732,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32741,7 +32741,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterDriver,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32750,7 +32750,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterDrivers),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterDrivers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterDrivers,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterDrivers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32759,7 +32759,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriver,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32768,7 +32768,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriverDirectory),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriverDirectory,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriverDirectory,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriverDirectory,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32777,7 +32777,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterDriver,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32786,7 +32786,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrintProcessor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrintProcessor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrintProcessor,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrintProcessor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32795,7 +32795,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrintProcessors),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrintProcessors,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrintProcessors,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrintProcessors,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32804,7 +32804,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrintProcessorDirectory),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrintProcessorDirectory,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrintProcessorDirectory,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrintProcessorDirectory,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32813,7 +32813,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_StartDocPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_StartDocPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_StartDocPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_StartDocPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32822,7 +32822,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_StartPagePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_StartPagePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_StartPagePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_StartPagePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32831,7 +32831,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_WritePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_WritePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_WritePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_WritePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32840,7 +32840,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EndPagePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EndPagePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EndPagePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_EndPagePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32849,7 +32849,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AbortPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AbortPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AbortPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_AbortPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32858,7 +32858,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ReadPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ReadPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ReadPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ReadPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32867,7 +32867,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EndDocPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EndDocPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EndDocPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_EndDocPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32876,7 +32876,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddJob,
+-		(ndr_print_function_t) ndr_print_spoolss_AddJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32885,7 +32885,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ScheduleJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ScheduleJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ScheduleJob,
+-		(ndr_print_function_t) ndr_print_spoolss_ScheduleJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32894,7 +32894,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32903,7 +32903,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32912,7 +32912,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_WaitForPrinterChange),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_WaitForPrinterChange,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_WaitForPrinterChange,
+-		(ndr_print_function_t) ndr_print_spoolss_WaitForPrinterChange,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32921,7 +32921,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ClosePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ClosePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ClosePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ClosePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32930,7 +32930,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddForm,
+-		(ndr_print_function_t) ndr_print_spoolss_AddForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32939,7 +32939,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeleteForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeleteForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeleteForm,
+-		(ndr_print_function_t) ndr_print_spoolss_DeleteForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32948,7 +32948,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetForm,
+-		(ndr_print_function_t) ndr_print_spoolss_GetForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32957,7 +32957,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetForm,
+-		(ndr_print_function_t) ndr_print_spoolss_SetForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32966,7 +32966,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumForms),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumForms,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumForms,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumForms,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32975,7 +32975,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPorts),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPorts,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPorts,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPorts,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32984,7 +32984,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumMonitors),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumMonitors,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumMonitors,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumMonitors,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32993,7 +32993,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPort,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33002,7 +33002,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ConfigurePort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ConfigurePort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ConfigurePort,
+-		(ndr_print_function_t) ndr_print_spoolss_ConfigurePort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33011,7 +33011,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePort,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33020,7 +33020,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_CreatePrinterIC),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_CreatePrinterIC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_CreatePrinterIC,
+-		(ndr_print_function_t) ndr_print_spoolss_CreatePrinterIC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33029,7 +33029,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_PlayGDIScriptOnPrinterIC),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_PlayGDIScriptOnPrinterIC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_PlayGDIScriptOnPrinterIC,
+-		(ndr_print_function_t) ndr_print_spoolss_PlayGDIScriptOnPrinterIC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33038,7 +33038,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterIC),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterIC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterIC,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterIC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33047,7 +33047,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33056,7 +33056,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33065,7 +33065,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_PrinterMessageBox),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_PrinterMessageBox,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_PrinterMessageBox,
+-		(ndr_print_function_t) ndr_print_spoolss_PrinterMessageBox,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33074,7 +33074,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddMonitor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddMonitor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddMonitor,
+-		(ndr_print_function_t) ndr_print_spoolss_AddMonitor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33083,7 +33083,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeleteMonitor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeleteMonitor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeleteMonitor,
+-		(ndr_print_function_t) ndr_print_spoolss_DeleteMonitor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33092,7 +33092,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrintProcessor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrintProcessor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrintProcessor,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrintProcessor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33101,7 +33101,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrintProvidor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrintProvidor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrintProvidor,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrintProvidor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33110,7 +33110,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrintProvidor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrintProvidor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrintProvidor,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrintProvidor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33119,7 +33119,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrintProcDataTypes),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrintProcDataTypes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrintProcDataTypes,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrintProcDataTypes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33128,7 +33128,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ResetPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ResetPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ResetPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ResetPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33137,7 +33137,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriver2),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriver2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriver2,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriver2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33146,7 +33146,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_FindFirstPrinterChangeNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_FindFirstPrinterChangeNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_FindFirstPrinterChangeNotification,
+-		(ndr_print_function_t) ndr_print_spoolss_FindFirstPrinterChangeNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33155,7 +33155,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_FindNextPrinterChangeNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_FindNextPrinterChangeNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_FindNextPrinterChangeNotification,
+-		(ndr_print_function_t) ndr_print_spoolss_FindNextPrinterChangeNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33164,7 +33164,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_FindClosePrinterNotify),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_FindClosePrinterNotify,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_FindClosePrinterNotify,
+-		(ndr_print_function_t) ndr_print_spoolss_FindClosePrinterNotify,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33173,7 +33173,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterFindFirstPrinterChangeNotificationOld),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterFindFirstPrinterChangeNotificationOld,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterFindFirstPrinterChangeNotificationOld,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterFindFirstPrinterChangeNotificationOld,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33182,7 +33182,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ReplyOpenPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ReplyOpenPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ReplyOpenPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ReplyOpenPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33191,7 +33191,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterReplyPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterReplyPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterReplyPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterReplyPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33200,7 +33200,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ReplyClosePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ReplyClosePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ReplyClosePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ReplyClosePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33209,7 +33209,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPortEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPortEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPortEx,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPortEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33218,7 +33218,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterFindFirstPrinterChangeNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterFindFirstPrinterChangeNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterFindFirstPrinterChangeNotification,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterFindFirstPrinterChangeNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33227,7 +33227,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SpoolerInit),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SpoolerInit,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SpoolerInit,
+-		(ndr_print_function_t) ndr_print_spoolss_SpoolerInit,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33236,7 +33236,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ResetPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ResetPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ResetPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_ResetPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33245,7 +33245,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RemoteFindFirstPrinterChangeNotifyEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RemoteFindFirstPrinterChangeNotifyEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RemoteFindFirstPrinterChangeNotifyEx,
+-		(ndr_print_function_t) ndr_print_spoolss_RemoteFindFirstPrinterChangeNotifyEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33254,7 +33254,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterReplyPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterReplyPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterReplyPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterReplyPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33263,7 +33263,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterRefreshPrinterChangeNotify),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterRefreshPrinterChangeNotify,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterRefreshPrinterChangeNotify,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterRefreshPrinterChangeNotify,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33272,7 +33272,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_44),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_44,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_44,
+-		(ndr_print_function_t) ndr_print_spoolss_44,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33281,7 +33281,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_OpenPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_OpenPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_OpenPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_OpenPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33290,7 +33290,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33299,7 +33299,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPort,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33308,7 +33308,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33317,7 +33317,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33326,7 +33326,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_4a),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_4a,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_4a,
+-		(ndr_print_function_t) ndr_print_spoolss_4a,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33335,7 +33335,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_4b),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_4b,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_4b,
+-		(ndr_print_function_t) ndr_print_spoolss_4b,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33344,7 +33344,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_4c),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_4c,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_4c,
+-		(ndr_print_function_t) ndr_print_spoolss_4c,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33353,7 +33353,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33362,7 +33362,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33371,7 +33371,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33380,7 +33380,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterKey),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterKey,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33389,7 +33389,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33398,7 +33398,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterKey),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterKey,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33407,7 +33407,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_53),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_53,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_53,
+-		(ndr_print_function_t) ndr_print_spoolss_53,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33416,7 +33416,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterDriverEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterDriverEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterDriverEx,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterDriverEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33425,7 +33425,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPerMachineConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPerMachineConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPerMachineConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPerMachineConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33434,7 +33434,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePerMachineConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePerMachineConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePerMachineConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePerMachineConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33443,7 +33443,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPerMachineConnections),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPerMachineConnections,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPerMachineConnections,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPerMachineConnections,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33452,7 +33452,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_XcvData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_XcvData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_XcvData,
+-		(ndr_print_function_t) ndr_print_spoolss_XcvData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33461,7 +33461,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterDriverEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterDriverEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterDriverEx,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterDriverEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33470,7 +33470,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5a),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5a,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5a,
+-		(ndr_print_function_t) ndr_print_spoolss_5a,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33479,7 +33479,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5b),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5b,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5b,
+-		(ndr_print_function_t) ndr_print_spoolss_5b,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33488,7 +33488,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5c),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5c,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5c,
+-		(ndr_print_function_t) ndr_print_spoolss_5c,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33497,7 +33497,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5d),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5d,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5d,
+-		(ndr_print_function_t) ndr_print_spoolss_5d,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33506,7 +33506,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5e),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5e,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5e,
+-		(ndr_print_function_t) ndr_print_spoolss_5e,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33515,7 +33515,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5f),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5f,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5f,
+-		(ndr_print_function_t) ndr_print_spoolss_5f,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33524,7 +33524,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_60),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_60,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_60,
+-		(ndr_print_function_t) ndr_print_spoolss_60,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33533,7 +33533,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_61),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_61,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_61,
+-		(ndr_print_function_t) ndr_print_spoolss_61,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33542,7 +33542,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_62),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_62,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_62,
+-		(ndr_print_function_t) ndr_print_spoolss_62,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33551,7 +33551,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_63),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_63,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_63,
+-		(ndr_print_function_t) ndr_print_spoolss_63,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33560,7 +33560,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_64),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_64,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_64,
+-		(ndr_print_function_t) ndr_print_spoolss_64,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33569,7 +33569,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_65),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_65,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_65,
+-		(ndr_print_function_t) ndr_print_spoolss_65,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33578,7 +33578,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetCorePrinterDrivers),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetCorePrinterDrivers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetCorePrinterDrivers,
+-		(ndr_print_function_t) ndr_print_spoolss_GetCorePrinterDrivers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33587,7 +33587,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_67),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_67,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_67,
+-		(ndr_print_function_t) ndr_print_spoolss_67,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33596,7 +33596,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriverPackagePath),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriverPackagePath,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriverPackagePath,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriverPackagePath,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33605,7 +33605,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_69),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_69,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_69,
+-		(ndr_print_function_t) ndr_print_spoolss_69,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33614,7 +33614,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6a),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6a,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6a,
+-		(ndr_print_function_t) ndr_print_spoolss_6a,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33623,7 +33623,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6b),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6b,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6b,
+-		(ndr_print_function_t) ndr_print_spoolss_6b,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33632,7 +33632,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6c),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6c,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6c,
+-		(ndr_print_function_t) ndr_print_spoolss_6c,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33641,7 +33641,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6d),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6d,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6d,
+-		(ndr_print_function_t) ndr_print_spoolss_6d,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
++++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
+@@ -20229,7 +20229,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20238,7 +20238,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20247,7 +20247,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevControl),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevControl,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevControl,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevControl,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20256,7 +20256,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20265,7 +20265,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20274,7 +20274,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQSetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20283,7 +20283,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQPurge),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQPurge,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQPurge,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQPurge,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20292,7 +20292,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQPurgeSelf),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQPurgeSelf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQPurgeSelf,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQPurgeSelf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20301,7 +20301,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetConnEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetConnEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetConnEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetConnEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20310,7 +20310,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetFileEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetFileEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetFileEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetFileEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20319,7 +20319,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetFileGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetFileGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetFileGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetFileGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20328,7 +20328,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetFileClose),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetFileClose,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetFileClose,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetFileClose,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20337,7 +20337,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSessEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSessEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSessEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSessEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20346,7 +20346,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSessDel),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSessDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSessDel,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSessDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20355,7 +20355,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareAdd,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20364,7 +20364,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareEnumAll),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareEnumAll,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareEnumAll,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareEnumAll,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20373,7 +20373,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20382,7 +20382,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareSetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20391,7 +20391,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDel),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDel,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20400,7 +20400,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDelSticky),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDelSticky,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDelSticky,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDelSticky,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20409,7 +20409,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareCheck),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareCheck,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareCheck,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareCheck,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20418,7 +20418,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSrvGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSrvGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSrvGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSrvGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20427,7 +20427,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSrvSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSrvSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSrvSetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSrvSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20436,7 +20436,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetDiskEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetDiskEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetDiskEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetDiskEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20445,7 +20445,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetServerStatisticsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetServerStatisticsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetServerStatisticsGet,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetServerStatisticsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20454,7 +20454,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetTransportAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetTransportAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetTransportAdd,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetTransportAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20463,7 +20463,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetTransportEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetTransportEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetTransportEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetTransportEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20472,7 +20472,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetTransportDel),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetTransportDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetTransportDel,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetTransportDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20481,7 +20481,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetRemoteTOD),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetRemoteTOD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetRemoteTOD,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetRemoteTOD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20490,7 +20490,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSetServiceBits),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSetServiceBits,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSetServiceBits,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSetServiceBits,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20499,7 +20499,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPathType),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPathType,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPathType,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPathType,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20508,7 +20508,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPathCanonicalize),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPathCanonicalize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPathCanonicalize,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPathCanonicalize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20517,7 +20517,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPathCompare),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPathCompare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPathCompare,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPathCompare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20526,7 +20526,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetNameValidate),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetNameValidate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetNameValidate,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetNameValidate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20535,7 +20535,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRPRNAMECANONICALIZE),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRPRNAMECANONICALIZE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRPRNAMECANONICALIZE,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRPRNAMECANONICALIZE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20544,7 +20544,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPRNameCompare),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPRNameCompare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPRNameCompare,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPRNameCompare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20553,7 +20553,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20562,7 +20562,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDelStart),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDelStart,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDelStart,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDelStart,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20571,7 +20571,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDelCommit),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDelCommit,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDelCommit,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDelCommit,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20580,7 +20580,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetGetFileSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetGetFileSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetGetFileSecurity,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetGetFileSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20589,7 +20589,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSetFileSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSetFileSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSetFileSecurity,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSetFileSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20598,7 +20598,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetServerTransportAddEx),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetServerTransportAddEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetServerTransportAddEx,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetServerTransportAddEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20607,7 +20607,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetServerSetServiceBitsEx),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetServerSetServiceBitsEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetServerSetServiceBitsEx,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetServerSetServiceBitsEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20616,7 +20616,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSGETVERSION),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSGETVERSION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSGETVERSION,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSGETVERSION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20625,7 +20625,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSCREATELOCALPARTITION),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSCREATELOCALPARTITION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSCREATELOCALPARTITION,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSCREATELOCALPARTITION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20634,7 +20634,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSDELETELOCALPARTITION),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSDELETELOCALPARTITION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSDELETELOCALPARTITION,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSDELETELOCALPARTITION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20643,7 +20643,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSSETLOCALVOLUMESTATE),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSSETLOCALVOLUMESTATE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSSETLOCALVOLUMESTATE,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSSETLOCALVOLUMESTATE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20652,7 +20652,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSSETSERVERINFO),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSSETSERVERINFO,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSSETSERVERINFO,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSSETSERVERINFO,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20661,7 +20661,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSCREATEEXITPOINT),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSCREATEEXITPOINT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSCREATEEXITPOINT,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSCREATEEXITPOINT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20670,7 +20670,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSDELETEEXITPOINT),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSDELETEEXITPOINT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSDELETEEXITPOINT,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSDELETEEXITPOINT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20679,7 +20679,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSMODIFYPREFIX),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSMODIFYPREFIX,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSMODIFYPREFIX,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSMODIFYPREFIX,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20688,7 +20688,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSFIXLOCALVOLUME),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSFIXLOCALVOLUME,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSFIXLOCALVOLUME,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSFIXLOCALVOLUME,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20697,7 +20697,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSMANAGERREPORTSITEINFO),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSMANAGERREPORTSITEINFO,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSMANAGERREPORTSITEINFO,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSMANAGERREPORTSITEINFO,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20706,7 +20706,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRSERVERTRANSPORTDELEX),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRSERVERTRANSPORTDELEX,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRSERVERTRANSPORTDELEX,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRSERVERTRANSPORTDELEX,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_svcctl.c
++++ b/source3/librpc/gen_ndr/ndr_svcctl.c
+@@ -7175,7 +7175,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_CloseServiceHandle),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_CloseServiceHandle,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_CloseServiceHandle,
+-		(ndr_print_function_t) ndr_print_svcctl_CloseServiceHandle,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7184,7 +7184,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ControlService),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ControlService,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ControlService,
+-		(ndr_print_function_t) ndr_print_svcctl_ControlService,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7193,7 +7193,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_DeleteService),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_DeleteService,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_DeleteService,
+-		(ndr_print_function_t) ndr_print_svcctl_DeleteService,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7202,7 +7202,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_LockServiceDatabase),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_LockServiceDatabase,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_LockServiceDatabase,
+-		(ndr_print_function_t) ndr_print_svcctl_LockServiceDatabase,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7211,7 +7211,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceObjectSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceObjectSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceObjectSecurity,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceObjectSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7220,7 +7220,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SetServiceObjectSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SetServiceObjectSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SetServiceObjectSecurity,
+-		(ndr_print_function_t) ndr_print_svcctl_SetServiceObjectSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7229,7 +7229,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceStatus,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7238,7 +7238,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SetServiceStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SetServiceStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SetServiceStatus,
+-		(ndr_print_function_t) ndr_print_svcctl_SetServiceStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7247,7 +7247,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_UnlockServiceDatabase),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_UnlockServiceDatabase,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_UnlockServiceDatabase,
+-		(ndr_print_function_t) ndr_print_svcctl_UnlockServiceDatabase,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7256,7 +7256,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_NotifyBootConfigStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_NotifyBootConfigStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_NotifyBootConfigStatus,
+-		(ndr_print_function_t) ndr_print_svcctl_NotifyBootConfigStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7265,7 +7265,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SCSetServiceBitsW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SCSetServiceBitsW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SCSetServiceBitsW,
+-		(ndr_print_function_t) ndr_print_svcctl_SCSetServiceBitsW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7274,7 +7274,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfigW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfigW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfigW,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfigW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7283,7 +7283,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_CreateServiceW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_CreateServiceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_CreateServiceW,
+-		(ndr_print_function_t) ndr_print_svcctl_CreateServiceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7292,7 +7292,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumDependentServicesW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumDependentServicesW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumDependentServicesW,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumDependentServicesW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7301,7 +7301,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumServicesStatusW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumServicesStatusW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumServicesStatusW,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumServicesStatusW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7310,7 +7310,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenSCManagerW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenSCManagerW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenSCManagerW,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenSCManagerW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7319,7 +7319,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenServiceW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenServiceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenServiceW,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenServiceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7328,7 +7328,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfigW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfigW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfigW,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfigW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7337,7 +7337,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceLockStatusW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceLockStatusW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceLockStatusW,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceLockStatusW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7346,7 +7346,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_StartServiceW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_StartServiceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_StartServiceW,
+-		(ndr_print_function_t) ndr_print_svcctl_StartServiceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7355,7 +7355,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceDisplayNameW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceDisplayNameW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceDisplayNameW,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceDisplayNameW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7364,7 +7364,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceKeyNameW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceKeyNameW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceKeyNameW,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceKeyNameW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7373,7 +7373,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SCSetServiceBitsA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SCSetServiceBitsA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SCSetServiceBitsA,
+-		(ndr_print_function_t) ndr_print_svcctl_SCSetServiceBitsA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7382,7 +7382,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfigA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfigA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfigA,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfigA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7391,7 +7391,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_CreateServiceA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_CreateServiceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_CreateServiceA,
+-		(ndr_print_function_t) ndr_print_svcctl_CreateServiceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7400,7 +7400,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumDependentServicesA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumDependentServicesA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumDependentServicesA,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumDependentServicesA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7409,7 +7409,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumServicesStatusA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumServicesStatusA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumServicesStatusA,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumServicesStatusA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7418,7 +7418,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenSCManagerA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenSCManagerA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenSCManagerA,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenSCManagerA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7427,7 +7427,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenServiceA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenServiceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenServiceA,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenServiceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7436,7 +7436,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfigA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfigA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfigA,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfigA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7445,7 +7445,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceLockStatusA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceLockStatusA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceLockStatusA,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceLockStatusA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7454,7 +7454,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_StartServiceA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_StartServiceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_StartServiceA,
+-		(ndr_print_function_t) ndr_print_svcctl_StartServiceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7463,7 +7463,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceDisplayNameA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceDisplayNameA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceDisplayNameA,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceDisplayNameA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7472,7 +7472,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceKeyNameA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceKeyNameA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceKeyNameA,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceKeyNameA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7481,7 +7481,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetCurrentGroupeStateW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetCurrentGroupeStateW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetCurrentGroupeStateW,
+-		(ndr_print_function_t) ndr_print_svcctl_GetCurrentGroupeStateW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7490,7 +7490,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumServiceGroupW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumServiceGroupW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumServiceGroupW,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumServiceGroupW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7499,7 +7499,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfig2A),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfig2A,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfig2A,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfig2A,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7508,7 +7508,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfig2W),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfig2W,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfig2W,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfig2W,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7517,7 +7517,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfig2A),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfig2A,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfig2A,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfig2A,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7526,7 +7526,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfig2W),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfig2W,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfig2W,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfig2W,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7535,7 +7535,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceStatusEx),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceStatusEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceStatusEx,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceStatusEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7544,7 +7544,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct EnumServicesStatusExA),
+ 		(ndr_push_flags_fn_t) ndr_push_EnumServicesStatusExA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EnumServicesStatusExA,
+-		(ndr_print_function_t) ndr_print_EnumServicesStatusExA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7553,7 +7553,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct EnumServicesStatusExW),
+ 		(ndr_push_flags_fn_t) ndr_push_EnumServicesStatusExW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EnumServicesStatusExW,
+-		(ndr_print_function_t) ndr_print_EnumServicesStatusExW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7562,7 +7562,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SCSendTSMessage),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SCSendTSMessage,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SCSendTSMessage,
+-		(ndr_print_function_t) ndr_print_svcctl_SCSendTSMessage,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_trkwks.c
++++ b/source3/librpc/gen_ndr/ndr_trkwks.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call t
+ 		sizeof(struct trkwks_Unknown0),
+ 		(ndr_push_flags_fn_t) ndr_push_trkwks_Unknown0,
+ 		(ndr_pull_flags_fn_t) ndr_pull_trkwks_Unknown0,
+-		(ndr_print_function_t) ndr_print_trkwks_Unknown0,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_unixinfo.c
++++ b/source3/librpc/gen_ndr/ndr_unixinfo.c
+@@ -472,7 +472,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_SidToUid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_SidToUid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_SidToUid,
+-		(ndr_print_function_t) ndr_print_unixinfo_SidToUid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -481,7 +481,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_UidToSid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_UidToSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_UidToSid,
+-		(ndr_print_function_t) ndr_print_unixinfo_UidToSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -490,7 +490,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_SidToGid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_SidToGid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_SidToGid,
+-		(ndr_print_function_t) ndr_print_unixinfo_SidToGid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -499,7 +499,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_GidToSid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_GidToSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_GidToSid,
+-		(ndr_print_function_t) ndr_print_unixinfo_GidToSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -508,7 +508,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_GetPWUid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_GetPWUid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_GetPWUid,
+-		(ndr_print_function_t) ndr_print_unixinfo_GetPWUid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_w32time.c
++++ b/source3/librpc/gen_ndr/ndr_w32time.c
+@@ -135,7 +135,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct w32time_SyncTime),
+ 		(ndr_push_flags_fn_t) ndr_push_w32time_SyncTime,
+ 		(ndr_pull_flags_fn_t) ndr_pull_w32time_SyncTime,
+-		(ndr_print_function_t) ndr_print_w32time_SyncTime,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -144,7 +144,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct w32time_GetNetLogonServiceBits),
+ 		(ndr_push_flags_fn_t) ndr_push_w32time_GetNetLogonServiceBits,
+ 		(ndr_pull_flags_fn_t) ndr_pull_w32time_GetNetLogonServiceBits,
+-		(ndr_print_function_t) ndr_print_w32time_GetNetLogonServiceBits,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -153,7 +153,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct w32time_QueryProviderStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_w32time_QueryProviderStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_w32time_QueryProviderStatus,
+-		(ndr_print_function_t) ndr_print_w32time_QueryProviderStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wbint.c
++++ b/source3/librpc/gen_ndr/ndr_wbint.c
+@@ -2696,7 +2696,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Ping),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Ping,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Ping,
+-		(ndr_print_function_t) ndr_print_wbint_Ping,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2705,7 +2705,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupSid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupSid,
+-		(ndr_print_function_t) ndr_print_wbint_LookupSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2714,7 +2714,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupSids),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupSids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupSids,
+-		(ndr_print_function_t) ndr_print_wbint_LookupSids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2723,7 +2723,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupName),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupName,
+-		(ndr_print_function_t) ndr_print_wbint_LookupName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2732,7 +2732,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Sid2Uid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Sid2Uid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Sid2Uid,
+-		(ndr_print_function_t) ndr_print_wbint_Sid2Uid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2741,7 +2741,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Sid2Gid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Sid2Gid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Sid2Gid,
+-		(ndr_print_function_t) ndr_print_wbint_Sid2Gid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2750,7 +2750,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Sids2UnixIDs),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Sids2UnixIDs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Sids2UnixIDs,
+-		(ndr_print_function_t) ndr_print_wbint_Sids2UnixIDs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2759,7 +2759,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Uid2Sid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Uid2Sid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Uid2Sid,
+-		(ndr_print_function_t) ndr_print_wbint_Uid2Sid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2768,7 +2768,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Gid2Sid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Gid2Sid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Gid2Sid,
+-		(ndr_print_function_t) ndr_print_wbint_Gid2Sid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2777,7 +2777,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_AllocateUid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_AllocateUid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_AllocateUid,
+-		(ndr_print_function_t) ndr_print_wbint_AllocateUid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2786,7 +2786,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_AllocateGid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_AllocateGid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_AllocateGid,
+-		(ndr_print_function_t) ndr_print_wbint_AllocateGid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2795,7 +2795,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QueryUser),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QueryUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QueryUser,
+-		(ndr_print_function_t) ndr_print_wbint_QueryUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2804,7 +2804,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupUserAliases),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupUserAliases,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupUserAliases,
+-		(ndr_print_function_t) ndr_print_wbint_LookupUserAliases,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2813,7 +2813,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupUserGroups),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupUserGroups,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupUserGroups,
+-		(ndr_print_function_t) ndr_print_wbint_LookupUserGroups,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2822,7 +2822,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QuerySequenceNumber),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QuerySequenceNumber,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QuerySequenceNumber,
+-		(ndr_print_function_t) ndr_print_wbint_QuerySequenceNumber,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2831,7 +2831,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupGroupMembers),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupGroupMembers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupGroupMembers,
+-		(ndr_print_function_t) ndr_print_wbint_LookupGroupMembers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2840,7 +2840,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QueryUserList),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QueryUserList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QueryUserList,
+-		(ndr_print_function_t) ndr_print_wbint_QueryUserList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2849,7 +2849,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QueryGroupList),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QueryGroupList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QueryGroupList,
+-		(ndr_print_function_t) ndr_print_wbint_QueryGroupList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2858,7 +2858,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_DsGetDcName),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_DsGetDcName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_DsGetDcName,
+-		(ndr_print_function_t) ndr_print_wbint_DsGetDcName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2867,7 +2867,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupRids),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupRids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupRids,
+-		(ndr_print_function_t) ndr_print_wbint_LookupRids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2876,7 +2876,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_CheckMachineAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_CheckMachineAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_CheckMachineAccount,
+-		(ndr_print_function_t) ndr_print_wbint_CheckMachineAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2885,7 +2885,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_ChangeMachineAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_ChangeMachineAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_ChangeMachineAccount,
+-		(ndr_print_function_t) ndr_print_wbint_ChangeMachineAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2894,7 +2894,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_PingDc),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_PingDc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_PingDc,
+-		(ndr_print_function_t) ndr_print_wbint_PingDc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_winreg.c
++++ b/source3/librpc/gen_ndr/ndr_winreg.c
+@@ -4864,7 +4864,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKCR),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKCR,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKCR,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKCR,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4873,7 +4873,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKCU),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKCU,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKCU,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKCU,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4882,7 +4882,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKLM),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKLM,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKLM,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKLM,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4891,7 +4891,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKPD),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKPD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKPD,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKPD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4900,7 +4900,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKU),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKU,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKU,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKU,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4909,7 +4909,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_CloseKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_CloseKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_CloseKey,
+-		(ndr_print_function_t) ndr_print_winreg_CloseKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4918,7 +4918,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_CreateKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_CreateKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_CreateKey,
+-		(ndr_print_function_t) ndr_print_winreg_CreateKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4927,7 +4927,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_DeleteKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_DeleteKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_DeleteKey,
+-		(ndr_print_function_t) ndr_print_winreg_DeleteKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4936,7 +4936,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_DeleteValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_DeleteValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_DeleteValue,
+-		(ndr_print_function_t) ndr_print_winreg_DeleteValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4945,7 +4945,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_EnumKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_EnumKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_EnumKey,
+-		(ndr_print_function_t) ndr_print_winreg_EnumKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4954,7 +4954,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_EnumValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_EnumValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_EnumValue,
+-		(ndr_print_function_t) ndr_print_winreg_EnumValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4963,7 +4963,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_FlushKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_FlushKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_FlushKey,
+-		(ndr_print_function_t) ndr_print_winreg_FlushKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4972,7 +4972,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_GetKeySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_GetKeySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_GetKeySecurity,
+-		(ndr_print_function_t) ndr_print_winreg_GetKeySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4981,7 +4981,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_LoadKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_LoadKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_LoadKey,
+-		(ndr_print_function_t) ndr_print_winreg_LoadKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4990,7 +4990,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_NotifyChangeKeyValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_NotifyChangeKeyValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_NotifyChangeKeyValue,
+-		(ndr_print_function_t) ndr_print_winreg_NotifyChangeKeyValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4999,7 +4999,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenKey,
+-		(ndr_print_function_t) ndr_print_winreg_OpenKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5008,7 +5008,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryInfoKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryInfoKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryInfoKey,
+-		(ndr_print_function_t) ndr_print_winreg_QueryInfoKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5017,7 +5017,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryValue,
+-		(ndr_print_function_t) ndr_print_winreg_QueryValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5026,7 +5026,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_ReplaceKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_ReplaceKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_ReplaceKey,
+-		(ndr_print_function_t) ndr_print_winreg_ReplaceKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5035,7 +5035,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_RestoreKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_RestoreKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_RestoreKey,
+-		(ndr_print_function_t) ndr_print_winreg_RestoreKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5044,7 +5044,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SaveKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SaveKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SaveKey,
+-		(ndr_print_function_t) ndr_print_winreg_SaveKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5053,7 +5053,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SetKeySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SetKeySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SetKeySecurity,
+-		(ndr_print_function_t) ndr_print_winreg_SetKeySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5062,7 +5062,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SetValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SetValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SetValue,
+-		(ndr_print_function_t) ndr_print_winreg_SetValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5071,7 +5071,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_UnLoadKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_UnLoadKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_UnLoadKey,
+-		(ndr_print_function_t) ndr_print_winreg_UnLoadKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5080,7 +5080,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_InitiateSystemShutdown),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_InitiateSystemShutdown,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_InitiateSystemShutdown,
+-		(ndr_print_function_t) ndr_print_winreg_InitiateSystemShutdown,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5089,7 +5089,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_AbortSystemShutdown),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_AbortSystemShutdown,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_AbortSystemShutdown,
+-		(ndr_print_function_t) ndr_print_winreg_AbortSystemShutdown,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5098,7 +5098,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_GetVersion),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_GetVersion,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_GetVersion,
+-		(ndr_print_function_t) ndr_print_winreg_GetVersion,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5107,7 +5107,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKCC),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKCC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKCC,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKCC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5116,7 +5116,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKDD),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKDD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKDD,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKDD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5125,7 +5125,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryMultipleValues),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryMultipleValues,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryMultipleValues,
+-		(ndr_print_function_t) ndr_print_winreg_QueryMultipleValues,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5134,7 +5134,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_InitiateSystemShutdownEx),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_InitiateSystemShutdownEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_InitiateSystemShutdownEx,
+-		(ndr_print_function_t) ndr_print_winreg_InitiateSystemShutdownEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5143,7 +5143,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SaveKeyEx),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SaveKeyEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SaveKeyEx,
+-		(ndr_print_function_t) ndr_print_winreg_SaveKeyEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5152,7 +5152,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKPT),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKPT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKPT,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKPT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5161,7 +5161,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKPN),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKPN,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKPN,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKPN,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5170,7 +5170,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryMultipleValues2),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryMultipleValues2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryMultipleValues2,
+-		(ndr_print_function_t) ndr_print_winreg_QueryMultipleValues2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5179,7 +5179,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_DeleteKeyEx),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_DeleteKeyEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_DeleteKeyEx,
+-		(ndr_print_function_t) ndr_print_winreg_DeleteKeyEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wkssvc.c
++++ b/source3/librpc/gen_ndr/ndr_wkssvc.c
+@@ -11005,7 +11005,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaGetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11014,7 +11014,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaSetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11023,7 +11023,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaEnumUsers),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaEnumUsers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaEnumUsers,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaEnumUsers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11032,7 +11032,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaUserGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaUserGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaUserGetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaUserGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11041,7 +11041,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaUserSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaUserSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaUserSetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaUserSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11050,7 +11050,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaTransportEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaTransportEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaTransportEnum,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaTransportEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11059,7 +11059,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaTransportAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaTransportAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaTransportAdd,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaTransportAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11068,7 +11068,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaTransportDel),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaTransportDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaTransportDel,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaTransportDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11077,7 +11077,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseAdd,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11086,7 +11086,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseGetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11095,7 +11095,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseDel),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseDel,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11104,7 +11104,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseEnum,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11113,7 +11113,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrMessageBufferSend),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrMessageBufferSend,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrMessageBufferSend,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrMessageBufferSend,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11122,7 +11122,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWorkstationStatisticsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWorkstationStatisticsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWorkstationStatisticsGet,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWorkstationStatisticsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11131,7 +11131,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrLogonDomainNameAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrLogonDomainNameAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrLogonDomainNameAdd,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrLogonDomainNameAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11140,7 +11140,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrLogonDomainNameDel),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrLogonDomainNameDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrLogonDomainNameDel,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrLogonDomainNameDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11149,7 +11149,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrJoinDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrJoinDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrJoinDomain,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrJoinDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11158,7 +11158,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUnjoinDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUnjoinDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUnjoinDomain,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUnjoinDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11167,7 +11167,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrRenameMachineInDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrRenameMachineInDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrRenameMachineInDomain,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrRenameMachineInDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11176,7 +11176,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrValidateName),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrValidateName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrValidateName,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrValidateName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11185,7 +11185,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrGetJoinInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrGetJoinInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrGetJoinInformation,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrGetJoinInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11194,7 +11194,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrGetJoinableOus),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrGetJoinableOus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrGetJoinableOus,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrGetJoinableOus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11203,7 +11203,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrJoinDomain2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrJoinDomain2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrJoinDomain2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrJoinDomain2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11212,7 +11212,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUnjoinDomain2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUnjoinDomain2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUnjoinDomain2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUnjoinDomain2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11221,7 +11221,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrRenameMachineInDomain2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrRenameMachineInDomain2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrRenameMachineInDomain2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrRenameMachineInDomain2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11230,7 +11230,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrValidateName2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrValidateName2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrValidateName2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrValidateName2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11239,7 +11239,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrGetJoinableOus2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrGetJoinableOus2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrGetJoinableOus2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrGetJoinableOus2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11248,7 +11248,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrAddAlternateComputerName),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrAddAlternateComputerName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrAddAlternateComputerName,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrAddAlternateComputerName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11257,7 +11257,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrRemoveAlternateComputerName),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrRemoveAlternateComputerName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrRemoveAlternateComputerName,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrRemoveAlternateComputerName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11266,7 +11266,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrSetPrimaryComputername),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrSetPrimaryComputername,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrSetPrimaryComputername,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrSetPrimaryComputername,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11275,7 +11275,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrEnumerateComputerNames),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrEnumerateComputerNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrEnumerateComputerNames,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrEnumerateComputerNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wmi.c
++++ b/source3/librpc/gen_ndr/ndr_wmi.c
+@@ -139,7 +139,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Delete),
+ 		(ndr_push_flags_fn_t) ndr_push_Delete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Delete,
+-		(ndr_print_function_t) ndr_print_Delete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3704,7 +3704,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct OpenNamespace),
+ 		(ndr_push_flags_fn_t) ndr_push_OpenNamespace,
+ 		(ndr_pull_flags_fn_t) ndr_pull_OpenNamespace,
+-		(ndr_print_function_t) ndr_print_OpenNamespace,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3713,7 +3713,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CancelAsyncCall),
+ 		(ndr_push_flags_fn_t) ndr_push_CancelAsyncCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CancelAsyncCall,
+-		(ndr_print_function_t) ndr_print_CancelAsyncCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3722,7 +3722,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct QueryObjectSink),
+ 		(ndr_push_flags_fn_t) ndr_push_QueryObjectSink,
+ 		(ndr_pull_flags_fn_t) ndr_pull_QueryObjectSink,
+-		(ndr_print_function_t) ndr_print_QueryObjectSink,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3731,7 +3731,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetObject),
+ 		(ndr_push_flags_fn_t) ndr_push_GetObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetObject,
+-		(ndr_print_function_t) ndr_print_GetObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3740,7 +3740,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetObjectAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_GetObjectAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetObjectAsync,
+-		(ndr_print_function_t) ndr_print_GetObjectAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3749,7 +3749,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutClass),
+ 		(ndr_push_flags_fn_t) ndr_push_PutClass,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutClass,
+-		(ndr_print_function_t) ndr_print_PutClass,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3758,7 +3758,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutClassAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_PutClassAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutClassAsync,
+-		(ndr_print_function_t) ndr_print_PutClassAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3767,7 +3767,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteClass),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteClass,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteClass,
+-		(ndr_print_function_t) ndr_print_DeleteClass,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3776,7 +3776,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteClassAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteClassAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteClassAsync,
+-		(ndr_print_function_t) ndr_print_DeleteClassAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3785,7 +3785,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateClassEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateClassEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateClassEnum,
+-		(ndr_print_function_t) ndr_print_CreateClassEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3794,7 +3794,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateClassEnumAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateClassEnumAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateClassEnumAsync,
+-		(ndr_print_function_t) ndr_print_CreateClassEnumAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3803,7 +3803,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PutInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutInstance,
+-		(ndr_print_function_t) ndr_print_PutInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3812,7 +3812,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutInstanceAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_PutInstanceAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutInstanceAsync,
+-		(ndr_print_function_t) ndr_print_PutInstanceAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3821,7 +3821,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteInstance,
+-		(ndr_print_function_t) ndr_print_DeleteInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3830,7 +3830,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteInstanceAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteInstanceAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteInstanceAsync,
+-		(ndr_print_function_t) ndr_print_DeleteInstanceAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3839,7 +3839,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateInstanceEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateInstanceEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateInstanceEnum,
+-		(ndr_print_function_t) ndr_print_CreateInstanceEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3848,7 +3848,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateInstanceEnumAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateInstanceEnumAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateInstanceEnumAsync,
+-		(ndr_print_function_t) ndr_print_CreateInstanceEnumAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3857,7 +3857,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecQuery),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecQuery,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecQuery,
+-		(ndr_print_function_t) ndr_print_ExecQuery,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3866,7 +3866,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecQueryAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecQueryAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecQueryAsync,
+-		(ndr_print_function_t) ndr_print_ExecQueryAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3875,7 +3875,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecNotificationQuery),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecNotificationQuery,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecNotificationQuery,
+-		(ndr_print_function_t) ndr_print_ExecNotificationQuery,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3884,7 +3884,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecNotificationQueryAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecNotificationQueryAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecNotificationQueryAsync,
+-		(ndr_print_function_t) ndr_print_ExecNotificationQueryAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3893,7 +3893,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecMethod),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecMethod,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecMethod,
+-		(ndr_print_function_t) ndr_print_ExecMethod,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3902,7 +3902,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecMethodAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecMethodAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecMethodAsync,
+-		(ndr_print_function_t) ndr_print_ExecMethodAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4434,7 +4434,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Reset),
+ 		(ndr_push_flags_fn_t) ndr_push_Reset,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Reset,
+-		(ndr_print_function_t) ndr_print_Reset,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4443,7 +4443,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IEnumWbemClassObject_Next),
+ 		(ndr_push_flags_fn_t) ndr_push_IEnumWbemClassObject_Next,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IEnumWbemClassObject_Next,
+-		(ndr_print_function_t) ndr_print_IEnumWbemClassObject_Next,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4452,7 +4452,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct NextAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_NextAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NextAsync,
+-		(ndr_print_function_t) ndr_print_NextAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4461,7 +4461,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IEnumWbemClassObject_Clone),
+ 		(ndr_push_flags_fn_t) ndr_push_IEnumWbemClassObject_Clone,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IEnumWbemClassObject_Clone,
+-		(ndr_print_function_t) ndr_print_IEnumWbemClassObject_Clone,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4470,7 +4470,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Skip),
+ 		(ndr_push_flags_fn_t) ndr_push_Skip,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Skip,
+-		(ndr_print_function_t) ndr_print_Skip,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5143,7 +5143,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Clone),
+ 		(ndr_push_flags_fn_t) ndr_push_Clone,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Clone,
+-		(ndr_print_function_t) ndr_print_Clone,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5152,7 +5152,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetNames),
+ 		(ndr_push_flags_fn_t) ndr_push_GetNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetNames,
+-		(ndr_print_function_t) ndr_print_GetNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5161,7 +5161,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct BeginEnumeration),
+ 		(ndr_push_flags_fn_t) ndr_push_BeginEnumeration,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BeginEnumeration,
+-		(ndr_print_function_t) ndr_print_BeginEnumeration,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5170,7 +5170,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Next),
+ 		(ndr_push_flags_fn_t) ndr_push_Next,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Next,
+-		(ndr_print_function_t) ndr_print_Next,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5179,7 +5179,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct EndEnumeration),
+ 		(ndr_push_flags_fn_t) ndr_push_EndEnumeration,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EndEnumeration,
+-		(ndr_print_function_t) ndr_print_EndEnumeration,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5188,7 +5188,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct SetValue),
+ 		(ndr_push_flags_fn_t) ndr_push_SetValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_SetValue,
+-		(ndr_print_function_t) ndr_print_SetValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5197,7 +5197,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetValue),
+ 		(ndr_push_flags_fn_t) ndr_push_GetValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetValue,
+-		(ndr_print_function_t) ndr_print_GetValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5206,7 +5206,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteValue),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteValue,
+-		(ndr_print_function_t) ndr_print_DeleteValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5215,7 +5215,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteAll),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteAll,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteAll,
+-		(ndr_print_function_t) ndr_print_DeleteAll,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5963,7 +5963,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct EstablishPosition),
+ 		(ndr_push_flags_fn_t) ndr_push_EstablishPosition,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EstablishPosition,
+-		(ndr_print_function_t) ndr_print_EstablishPosition,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5972,7 +5972,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RequestChallenge),
+ 		(ndr_push_flags_fn_t) ndr_push_RequestChallenge,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RequestChallenge,
+-		(ndr_print_function_t) ndr_print_RequestChallenge,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5981,7 +5981,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct WBEMLogin),
+ 		(ndr_push_flags_fn_t) ndr_push_WBEMLogin,
+ 		(ndr_pull_flags_fn_t) ndr_pull_WBEMLogin,
+-		(ndr_print_function_t) ndr_print_WBEMLogin,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5990,7 +5990,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct NTLMLogin),
+ 		(ndr_push_flags_fn_t) ndr_push_NTLMLogin,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NTLMLogin,
+-		(ndr_print_function_t) ndr_print_NTLMLogin,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6225,7 +6225,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IWbemWCOSmartEnum_Next),
+ 		(ndr_push_flags_fn_t) ndr_push_IWbemWCOSmartEnum_Next,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IWbemWCOSmartEnum_Next,
+-		(ndr_print_function_t) ndr_print_IWbemWCOSmartEnum_Next,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6479,7 +6479,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Fetch),
+ 		(ndr_push_flags_fn_t) ndr_push_Fetch,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Fetch,
+-		(ndr_print_function_t) ndr_print_Fetch,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6488,7 +6488,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Test),
+ 		(ndr_push_flags_fn_t) ndr_push_Test,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Test,
+-		(ndr_print_function_t) ndr_print_Test,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6920,7 +6920,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetResultObject),
+ 		(ndr_push_flags_fn_t) ndr_push_GetResultObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetResultObject,
+-		(ndr_print_function_t) ndr_print_GetResultObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6929,7 +6929,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetResultString),
+ 		(ndr_push_flags_fn_t) ndr_push_GetResultString,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetResultString,
+-		(ndr_print_function_t) ndr_print_GetResultString,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6938,7 +6938,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetResultServices),
+ 		(ndr_push_flags_fn_t) ndr_push_GetResultServices,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetResultServices,
+-		(ndr_print_function_t) ndr_print_GetResultServices,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6947,7 +6947,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetCallStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_GetCallStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetCallStatus,
+-		(ndr_print_function_t) ndr_print_GetCallStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7211,7 +7211,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct SetStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_SetStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_SetStatus,
+-		(ndr_print_function_t) ndr_print_SetStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7220,7 +7220,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Indicate),
+ 		(ndr_push_flags_fn_t) ndr_push_Indicate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Indicate,
+-		(ndr_print_function_t) ndr_print_Indicate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wzcsvc.c
++++ b/source3/librpc/gen_ndr/ndr_wzcsvc.c
+@@ -711,7 +711,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EnumInterfaces),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EnumInterfaces,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EnumInterfaces,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EnumInterfaces,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -720,7 +720,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_QueryInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_QueryInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_QueryInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_QueryInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -729,7 +729,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_SetInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_SetInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_SetInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_SetInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -738,7 +738,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_RefreshInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_RefreshInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_RefreshInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_RefreshInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -747,7 +747,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_QueryContext),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_QueryContext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_QueryContext,
+-		(ndr_print_function_t) ndr_print_wzcsvc_QueryContext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -756,7 +756,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_SetContext),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_SetContext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_SetContext,
+-		(ndr_print_function_t) ndr_print_wzcsvc_SetContext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -765,7 +765,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolUIResponse),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolUIResponse,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolUIResponse,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolUIResponse,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -774,7 +774,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolGetCustomAuthData),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolGetCustomAuthData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolGetCustomAuthData,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolGetCustomAuthData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -783,7 +783,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolSetCustomAuthData),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolSetCustomAuthData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolSetCustomAuthData,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolSetCustomAuthData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -792,7 +792,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolGetInterfaceParams),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolGetInterfaceParams,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolGetInterfaceParams,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolGetInterfaceParams,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -801,7 +801,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolSetInterfaceParams),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolSetInterfaceParams,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolSetInterfaceParams,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolSetInterfaceParams,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -810,7 +810,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolReAuthenticateInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolReAuthenticateInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolReAuthenticateInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolReAuthenticateInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -819,7 +819,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolQueryInterfaceState),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolQueryInterfaceState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolQueryInterfaceState,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolQueryInterfaceState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -828,7 +828,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_OpenWZCDbLogSession),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_OpenWZCDbLogSession,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_OpenWZCDbLogSession,
+-		(ndr_print_function_t) ndr_print_wzcsvc_OpenWZCDbLogSession,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -837,7 +837,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_CloseWZCDbLogSession),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_CloseWZCDbLogSession,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_CloseWZCDbLogSession,
+-		(ndr_print_function_t) ndr_print_wzcsvc_CloseWZCDbLogSession,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -846,7 +846,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EnumWZCDbLogRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EnumWZCDbLogRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EnumWZCDbLogRecords,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EnumWZCDbLogRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -855,7 +855,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_FlushWZCdbLog),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_FlushWZCdbLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_FlushWZCdbLog,
+-		(ndr_print_function_t) ndr_print_wzcsvc_FlushWZCdbLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -864,7 +864,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_GetWZCDbLogRecord),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_GetWZCDbLogRecord,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_GetWZCDbLogRecord,
+-		(ndr_print_function_t) ndr_print_wzcsvc_GetWZCDbLogRecord,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_xattr.c
++++ b/source3/librpc/gen_ndr/ndr_xattr.c
+@@ -1101,7 +1101,7 @@ static const struct ndr_interface_call x
+ 		sizeof(struct xattr_parse_DOSATTRIB),
+ 		(ndr_push_flags_fn_t) ndr_push_xattr_parse_DOSATTRIB,
+ 		(ndr_pull_flags_fn_t) ndr_pull_xattr_parse_DOSATTRIB,
+-		(ndr_print_function_t) ndr_print_xattr_parse_DOSATTRIB,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- /dev/null
++++ b/source3/remove-librpc-print-calls.sh
+@@ -0,0 +1,22 @@
++#!/usr/bin/env bash
++set -e
++for file in ${1:-librpc/gen_ndr/ndr_*.c}; do
++	quilt add "$file" || true
++	awk '
++$0 ~ /^static const struct ndr_interface_call .* = {$/ {
++	replace = 1
++}
++
++$0 ~ /^}$/ {
++	replace = 0;
++}
++
++replace == 1 {
++	gsub(/.ndr_print_function_t. .*,/, "(ndr_print_function_t) ndr_print_disabled,", $0)
++}
++{
++	print $0
++}
++	' < "$file" > "$file.new"
++	mv "$file.new" "$file"
++done
+--- a/librpc/ndr/libndr.h
++++ b/librpc/ndr/libndr.h
+@@ -597,6 +597,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_enum
+ _PUBLIC_ enum ndr_err_code ndr_push_enum_uint1632(struct ndr_push *ndr, int ndr_flags, uint16_t v);
+ 
+ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b);
++_PUBLIC_ void ndr_print_disabled(struct ndr_print *ndr, const char *name, int flags, void *r);
+ 
+ #ifndef VERBOSE_ERROR
+ #define ndr_print_bool(...) do {} while (0)