From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 1 May 2014 12:17:52 +0000 (+0000)
Subject: samba: update to version 3.6.23
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=14d0375301f5094ac7213550c74b35909e05f0dd;p=openwrt%2Fstaging%2Fthess.git

samba: update to version 3.6.23

This updates samba to the most recent minor version.
This patch is based on a patch by Anton van Bohemen <avbohemen@ziggo.nl>

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 40618
---

diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 2644f7d565..91d8c0fddc 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
-PKG_VERSION:=3.6.11
-PKG_RELEASE:=2
+PKG_VERSION:=3.6.23
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
-	http://ftp.samba.org/pub/samba/old-versions
+	http://ftp.samba.org/pub/samba/stable
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=9039e0ab3e4fc632ff0a1a8f2433edb4
+PKG_MD5SUM:=2f7aee1dc5d31aefcb364600915b31dc
 
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=COPYING
diff --git a/package/network/services/samba36/patches/100-configure_fixes.patch b/package/network/services/samba36/patches/100-configure_fixes.patch
index e40a1337a9..16e35c8049 100644
--- a/package/network/services/samba36/patches/100-configure_fixes.patch
+++ b/package/network/services/samba36/patches/100-configure_fixes.patch
@@ -1,6 +1,6 @@
 --- a/source3/configure
 +++ b/source3/configure
-@@ -13318,10 +13318,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINF
+@@ -13294,10 +13294,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 :
diff --git a/package/network/services/samba36/patches/110-multicall.patch b/package/network/services/samba36/patches/110-multicall.patch
index a01bc5852b..22e6a3c1b3 100644
--- a/package/network/services/samba36/patches/110-multicall.patch
+++ b/package/network/services/samba36/patches/110-multicall.patch
@@ -1,6 +1,6 @@
 --- a/source3/Makefile.in
 +++ b/source3/Makefile.in
-@@ -73,20 +73,20 @@ LDAP_LIBS=@LDAP_LIBS@
+@@ -73,22 +73,22 @@ LDAP_LIBS=@LDAP_LIBS@
  NSCD_LIBS=@NSCD_LIBS@
  UUID_LIBS=@UUID_LIBS@
  LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
@@ -14,6 +14,8 @@
  LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
 -LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
 +LIBTALLOC_LIBS=@LIBTALLOC_STATIC@
+ LIBTEVENT=@LIBTEVENT_STATIC@ @LIBTEVENT_SHARED@
+ LIBTEVENT_LIBS=@LIBTEVENT_LIBS@
  LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
  LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
 -LIBTDB_LIBS=@LIBTDB_LIBS@
@@ -25,7 +27,7 @@
  LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
  LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
  
-@@ -214,7 +214,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_P
+@@ -216,7 +216,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_P
  
  # Note that all executable programs now provide for an optional executable suffix.
  
@@ -34,7 +36,7 @@
  
  BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
  	bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \
-@@ -1775,6 +1775,42 @@ bin/.dummy:
+@@ -1777,6 +1777,42 @@ bin/.dummy:
  	  dir=bin $(MAKEDIR); fi
  	@: >> $@ || : > $@ # what a fancy emoticon!
  
@@ -71,10 +73,10 @@
 +	@$(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) \
++		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) \
 +		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 +
- bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
+ bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
  	@echo Linking $@
  	@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
 --- /dev/null
diff --git a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
index 7d852c4c61..eb2936535d 100644
--- a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
+++ b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
@@ -1,6 +1,6 @@
 --- a/source3/Makefile.in
 +++ b/source3/Makefile.in
-@@ -1017,7 +1017,7 @@ TEST_LP_LOAD_OBJ = param/test_lp_load.o 
+@@ -1019,7 +1019,7 @@ TEST_LP_LOAD_OBJ = param/test_lp_load.o
  
  PASSWD_UTIL_OBJ = utils/passwd_util.o
  
@@ -9,7 +9,7 @@
  		$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
  		$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
  		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
-@@ -1789,7 +1789,7 @@ nmbd/nmbd_multicall.o: nmbd/nmbd.c nmbd/
+@@ -1791,7 +1791,7 @@ nmbd/nmbd_multicall.o: nmbd/nmbd.c nmbd/
  		echo "$(COMPILE_CC_PATH)" 1>&2;\
  		$(COMPILE_CC_PATH) >/dev/null 2>&1
  
@@ -18,7 +18,7 @@
  	@echo Compiling $<.c
  	@$(COMPILE_CC_PATH) -Dmain=smbpasswd_main && exit 0;\
  		echo "The following command failed:" 1>&2;\
-@@ -1798,7 +1798,7 @@ utils/smbpasswd_multicall.o: utils/smbpa
+@@ -1800,7 +1800,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)))
diff --git a/package/network/services/samba36/patches/200-remove_printer_support.patch b/package/network/services/samba36/patches/200-remove_printer_support.patch
index 19d357f32b..de567a7627 100644
--- a/package/network/services/samba36/patches/200-remove_printer_support.patch
+++ b/package/network/services/samba36/patches/200-remove_printer_support.patch
@@ -25,7 +25,7 @@
  	dfs_commands,
 --- a/source3/printing/spoolssd.c
 +++ b/source3/printing/spoolssd.c
-@@ -153,6 +153,10 @@ void start_spoolssd(struct tevent_contex
+@@ -165,6 +165,10 @@ void start_spoolssd(struct tevent_contex
  	NTSTATUS status;
  	int ret;
  
@@ -38,7 +38,7 @@
  	pid = sys_fork();
 --- a/source3/utils/net_rpc.c
 +++ b/source3/utils/net_rpc.c
-@@ -7798,6 +7798,10 @@ int net_rpc_printer(struct net_context *
+@@ -7841,6 +7841,10 @@ int net_rpc_printer(struct net_context *
  		{NULL, NULL, 0, NULL, NULL}
  	};
  
@@ -51,7 +51,7 @@
  			d_printf(_("Usage:\n"));
 --- a/source3/smbd/reply.c
 +++ b/source3/smbd/reply.c
-@@ -5196,7 +5196,11 @@ void reply_printopen(struct smb_request 
+@@ -5208,7 +5208,11 @@ void reply_printopen(struct smb_request
  		return;
  	}
  
@@ -64,7 +64,7 @@
  		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
  		END_PROFILE(SMBsplopen);
  		return;
-@@ -5302,7 +5306,10 @@ void reply_printqueue(struct smb_request
+@@ -5314,7 +5318,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) */
@@ -78,7 +78,7 @@
  		return;
 --- a/source3/smbd/lanman.c
 +++ b/source3/smbd/lanman.c
-@@ -784,6 +784,10 @@ static bool api_DosPrintQGetInfo(struct 
+@@ -784,6 +784,10 @@ static bool api_DosPrintQGetInfo(struct
  	union spoolss_JobInfo *job_info = NULL;
  	union spoolss_PrinterInfo printer_info;
  
@@ -100,7 +100,7 @@
  	if (!param_format || !output_format1 || !p) {
  		return False;
  	}
-@@ -3350,6 +3358,10 @@ static bool api_RDosPrintJobDel(struct s
+@@ -3105,6 +3113,10 @@ static bool api_RDosPrintJobDel(struct s
  	struct spoolss_DevmodeContainer devmode_ctr;
  	enum spoolss_JobControl command;
  
@@ -111,7 +111,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -3483,6 +3495,10 @@ static bool api_WPrintQueueCtrl(struct s
+@@ -3238,6 +3250,10 @@ static bool api_WPrintQueueCtrl(struct s
  	struct sec_desc_buf secdesc_ctr;
  	enum spoolss_PrinterControl command;
  
@@ -122,7 +122,7 @@
  	if (!str1 || !str2 || !QueueName) {
  		return False;
  	}
-@@ -3649,6 +3665,10 @@ static bool api_PrintJobInfo(struct smbd
+@@ -3404,6 +3420,10 @@ static bool api_PrintJobInfo(struct smbd
  	union spoolss_JobInfo info;
  	struct spoolss_SetJobInfo1 info1;
  
@@ -133,7 +133,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -4792,6 +4812,10 @@ static bool api_WPrintJobGetInfo(struct 
+@@ -4547,6 +4567,10 @@ static bool api_WPrintJobGetInfo(struct
  	struct spoolss_DevmodeContainer devmode_ctr;
  	union spoolss_JobInfo info;
  
@@ -144,7 +144,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -4930,6 +4954,10 @@ static bool api_WPrintJobEnumerate(struc
+@@ -4685,6 +4709,10 @@ static bool api_WPrintJobEnumerate(struc
  	uint32_t count = 0;
  	union spoolss_JobInfo *info;
  
@@ -155,7 +155,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5135,6 +5163,10 @@ static bool api_WPrintDestGetInfo(struct
+@@ -4890,6 +4918,10 @@ static bool api_WPrintDestGetInfo(struct
  	struct spoolss_DevmodeContainer devmode_ctr;
  	union spoolss_PrinterInfo info;
  
@@ -166,7 +166,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5271,6 +5303,10 @@ static bool api_WPrintDestEnum(struct sm
+@@ -5026,6 +5058,10 @@ static bool api_WPrintDestEnum(struct sm
  	union spoolss_PrinterInfo *info;
  	uint32_t count;
  
@@ -177,7 +177,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5374,6 +5410,10 @@ static bool api_WPrintDriverEnum(struct 
+@@ -5129,6 +5165,10 @@ static bool api_WPrintDriverEnum(struct
  	int succnt;
  	struct pack_desc desc;
  
@@ -188,7 +188,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5438,6 +5478,10 @@ static bool api_WPrintQProcEnum(struct s
+@@ -5193,6 +5233,10 @@ static bool api_WPrintQProcEnum(struct s
  	int succnt;
  	struct pack_desc desc;
  
@@ -199,7 +199,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5502,6 +5546,10 @@ static bool api_WPrintPortEnum(struct sm
+@@ -5257,6 +5301,10 @@ static bool api_WPrintPortEnum(struct sm
  	int succnt;
  	struct pack_desc desc;
  
@@ -224,7 +224,7 @@
  		rpc_winreg_shutdown();
 --- a/source3/smbd/open.c
 +++ b/source3/smbd/open.c
-@@ -1566,6 +1566,9 @@ static NTSTATUS open_file_ntcreate(conne
+@@ -1608,6 +1608,9 @@ static NTSTATUS open_file_ntcreate(conne
  		 * Most of the passed parameters are ignored.
  		 */
  
@@ -303,7 +303,7 @@
  	}
 --- a/source3/smbd/process.c
 +++ b/source3/smbd/process.c
-@@ -2476,8 +2476,10 @@ static bool housekeeping_fn(const struct
+@@ -2423,8 +2423,10 @@ static bool housekeeping_fn(const struct
  
  	change_to_root_user();
  
@@ -316,7 +316,7 @@
  	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
+@@ -123,7 +123,9 @@ static void smb_pcap_updated(struct mess
  {
  	struct tevent_context *ev_ctx =
  		talloc_get_type_abort(private_data, struct tevent_context);
@@ -327,7 +327,7 @@
  	DEBUG(10,("Got message saying pcap was updated. Reloading.\n"));
  	change_to_root_user();
  	reload_printers(ev_ctx, msg);
-@@ -1231,6 +1233,7 @@ extern void build_options(bool screen);
+@@ -1277,6 +1279,7 @@ extern void build_options(bool screen);
  	 * The print backend init also migrates the printing tdb's,
  	 * this requires a winreg pipe.
  	 */
@@ -335,7 +335,7 @@
  	if (!print_backend_init(smbd_messaging_context()))
  		exit(1);
  
-@@ -1262,7 +1265,7 @@ extern void build_options(bool screen);
+@@ -1315,7 +1318,7 @@ extern void build_options(bool screen);
  				       smbd_messaging_context());
  		}
  	}
diff --git a/package/network/services/samba36/patches/210-remove_ad_support.patch b/package/network/services/samba36/patches/210-remove_ad_support.patch
index 1a10a30bd5..6742dc0479 100644
--- a/package/network/services/samba36/patches/210-remove_ad_support.patch
+++ b/package/network/services/samba36/patches/210-remove_ad_support.patch
@@ -71,7 +71,7 @@
  #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
+@@ -2904,12 +2904,14 @@ NTSTATUS cli_rpc_pipe_open_noauth_transp
  	status = rpc_pipe_bind(result, auth);
  	if (!NT_STATUS_IS_OK(status)) {
  		int lvl = 0;
diff --git a/package/network/services/samba36/patches/250-remove_domain_logon.patch b/package/network/services/samba36/patches/250-remove_domain_logon.patch
index e97285b666..f7582ef3bd 100644
--- a/package/network/services/samba36/patches/250-remove_domain_logon.patch
+++ b/package/network/services/samba36/patches/250-remove_domain_logon.patch
@@ -99,7 +99,7 @@
  	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
+@@ -824,6 +824,10 @@ WERROR _wkssvc_NetrJoinDomain2(struct pi
  	WERROR werr;
  	struct security_token *token = p->session_info->security_token;
  
@@ -110,7 +110,7 @@
  	if (!r->in.domain_name) {
  		return WERR_INVALID_PARAM;
  	}
-@@ -897,6 +901,10 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct 
+@@ -901,6 +905,10 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct
  	WERROR werr;
  	struct security_token *token = p->session_info->security_token;
  
@@ -147,7 +147,7 @@
  	/* lookup a DC first */
  
  	if ( !get_dc_name(domain, NULL, dc_name, &dc_ss) ) {
-@@ -243,6 +250,10 @@ NTSTATUS change_trust_account_password( 
+@@ -243,6 +250,10 @@ NTSTATUS change_trust_account_password(
  	struct cli_state *cli = NULL;
  	struct rpc_pipe_client *netlogon_pipe = NULL;
  
@@ -172,7 +172,7 @@
  }
 --- a/source3/smbd/process.c
 +++ b/source3/smbd/process.c
-@@ -2484,8 +2484,10 @@ static bool housekeeping_fn(const struct
+@@ -2431,8 +2431,10 @@ static bool housekeeping_fn(const struct
  	/* check if we need to reload services */
  	check_reload(sconn, time_mono(NULL));
  
diff --git a/package/network/services/samba36/patches/260-remove_samr.patch b/package/network/services/samba36/patches/260-remove_samr.patch
index eda6129893..7e55573056 100644
--- a/package/network/services/samba36/patches/260-remove_samr.patch
+++ b/package/network/services/samba36/patches/260-remove_samr.patch
@@ -98,7 +98,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct 
+@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct
  	NTSTATUS status, result;
  	struct dcerpc_binding_handle *b;
  
@@ -109,7 +109,7 @@
  	if (!str1 || !str2 || !UserName || !p) {
  		return False;
  	}
-@@ -2733,6 +2741,10 @@ static bool api_RNetUserEnum(struct smbd
+@@ -2741,6 +2749,10 @@ static bool api_RNetUserEnum(struct smbd
  
  	struct dcerpc_binding_handle *b;
  
@@ -120,18 +120,7 @@
  	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
+@@ -2979,6 +2991,10 @@ static bool api_SamOEMChangePassword(str
  	int bufsize;
  	struct dcerpc_binding_handle *b;
  
@@ -142,7 +131,7 @@
  	*rparam_len = 4;
  	*rparam = smb_realloc_limit(*rparam,*rparam_len);
  	if (!*rparam) {
-@@ -4265,6 +4285,10 @@ static bool api_RNetUserGetInfo(struct s
+@@ -4020,6 +4036,10 @@ static bool api_RNetUserGetInfo(struct s
  	union samr_UserInfo *info;
  	struct dcerpc_binding_handle *b = NULL;
  
diff --git a/package/network/services/samba36/patches/270-remove_registry_backend.patch b/package/network/services/samba36/patches/270-remove_registry_backend.patch
index 7714b86b77..147b1cec74 100644
--- a/package/network/services/samba36/patches/270-remove_registry_backend.patch
+++ b/package/network/services/samba36/patches/270-remove_registry_backend.patch
@@ -30,7 +30,7 @@
  			"supported by backend");
 --- a/source3/smbd/server.c
 +++ b/source3/smbd/server.c
-@@ -1184,8 +1184,10 @@ extern void build_options(bool screen);
+@@ -1230,8 +1230,10 @@ extern void build_options(bool screen);
  		exit(1);
  	}
  
diff --git a/package/network/services/samba36/patches/280-strip_srvsvc.patch b/package/network/services/samba36/patches/280-strip_srvsvc.patch
index b93e3fce6a..348cfbe7a4 100644
--- a/package/network/services/samba36/patches/280-strip_srvsvc.patch
+++ b/package/network/services/samba36/patches/280-strip_srvsvc.patch
@@ -11,7 +11,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -3838,10 +3842,7 @@ static bool api_RNetServerGetInfo(struct
+@@ -3589,10 +3593,7 @@ static bool api_RNetServerGetInfo(struct
  	NTSTATUS status;
  	WERROR werr;
  	TALLOC_CTX *mem_ctx = talloc_tos();
@@ -22,7 +22,7 @@
  
  	if (!str1 || !str2 || !p) {
  		return False;
-@@ -3904,66 +3905,16 @@ static bool api_RNetServerGetInfo(struct
+@@ -3655,66 +3656,16 @@ static bool api_RNetServerGetInfo(struct
  	p = *rdata;
  	p2 = p + struct_len;
  
@@ -95,7 +95,7 @@
  	}
  
  	if (uLevel > 1) {
-@@ -5654,6 +5605,10 @@ static bool api_RNetSessionEnum(struct s
+@@ -5405,6 +5356,10 @@ static bool api_RNetSessionEnum(struct s
  	uint32_t totalentries, resume_handle = 0;
  	uint32_t count = 0;
  
diff --git a/package/network/services/samba36/patches/310-remove_error_strings.patch b/package/network/services/samba36/patches/310-remove_error_strings.patch
index 44342eff59..8c7ae2d7d0 100644
--- a/package/network/services/samba36/patches/310-remove_error_strings.patch
+++ b/package/network/services/samba36/patches/310-remove_error_strings.patch
@@ -200,7 +200,7 @@
  
  	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 
+@@ -767,12 +773,14 @@ NTSTATUS nt_status_string_to_code(const
  {
  	int idx = 0;
  
diff --git a/package/network/services/samba36/patches/330-librpc_default_print.patch b/package/network/services/samba36/patches/330-librpc_default_print.patch
index 4d160867dc..f9c2e0e687 100644
--- a/package/network/services/samba36/patches/330-librpc_default_print.patch
+++ b/package/network/services/samba36/patches/330-librpc_default_print.patch
@@ -4007,7 +4007,7 @@
  	},
 --- 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
+@@ -914,7 +914,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,
@@ -4016,7 +4016,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -911,7 +911,7 @@ static const struct ndr_interface_call n
+@@ -923,7 +923,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,
@@ -4025,7 +4025,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -920,7 +920,7 @@ static const struct ndr_interface_call n
+@@ -932,7 +932,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,
@@ -5402,7 +5402,7 @@
  	},
 --- 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
+@@ -32661,7 +32661,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,
@@ -5411,7 +5411,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32669,7 +32669,7 @@ static const struct ndr_interface_call s
+@@ -32670,7 +32670,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,
@@ -5420,7 +5420,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32678,7 +32678,7 @@ static const struct ndr_interface_call s
+@@ -32679,7 +32679,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,
@@ -5429,7 +5429,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32687,7 +32687,7 @@ static const struct ndr_interface_call s
+@@ -32688,7 +32688,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,
@@ -5438,7 +5438,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32696,7 +32696,7 @@ static const struct ndr_interface_call s
+@@ -32697,7 +32697,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,
@@ -5447,7 +5447,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32705,7 +32705,7 @@ static const struct ndr_interface_call s
+@@ -32706,7 +32706,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,
@@ -5456,7 +5456,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32714,7 +32714,7 @@ static const struct ndr_interface_call s
+@@ -32715,7 +32715,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,
@@ -5465,7 +5465,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32723,7 +32723,7 @@ static const struct ndr_interface_call s
+@@ -32724,7 +32724,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,
@@ -5474,7 +5474,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32732,7 +32732,7 @@ static const struct ndr_interface_call s
+@@ -32733,7 +32733,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,
@@ -5483,7 +5483,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32741,7 +32741,7 @@ static const struct ndr_interface_call s
+@@ -32742,7 +32742,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,
@@ -5492,7 +5492,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32750,7 +32750,7 @@ static const struct ndr_interface_call s
+@@ -32751,7 +32751,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,
@@ -5501,7 +5501,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32759,7 +32759,7 @@ static const struct ndr_interface_call s
+@@ -32760,7 +32760,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,
@@ -5510,7 +5510,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32768,7 +32768,7 @@ static const struct ndr_interface_call s
+@@ -32769,7 +32769,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,
@@ -5519,7 +5519,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32777,7 +32777,7 @@ static const struct ndr_interface_call s
+@@ -32778,7 +32778,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,
@@ -5528,7 +5528,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32786,7 +32786,7 @@ static const struct ndr_interface_call s
+@@ -32787,7 +32787,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,
@@ -5537,7 +5537,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32795,7 +32795,7 @@ static const struct ndr_interface_call s
+@@ -32796,7 +32796,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,
@@ -5546,7 +5546,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32804,7 +32804,7 @@ static const struct ndr_interface_call s
+@@ -32805,7 +32805,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,
@@ -5555,7 +5555,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32813,7 +32813,7 @@ static const struct ndr_interface_call s
+@@ -32814,7 +32814,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,
@@ -5564,7 +5564,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32822,7 +32822,7 @@ static const struct ndr_interface_call s
+@@ -32823,7 +32823,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,
@@ -5573,7 +5573,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32831,7 +32831,7 @@ static const struct ndr_interface_call s
+@@ -32832,7 +32832,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,
@@ -5582,7 +5582,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32840,7 +32840,7 @@ static const struct ndr_interface_call s
+@@ -32841,7 +32841,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,
@@ -5591,7 +5591,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32849,7 +32849,7 @@ static const struct ndr_interface_call s
+@@ -32850,7 +32850,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,
@@ -5600,7 +5600,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32858,7 +32858,7 @@ static const struct ndr_interface_call s
+@@ -32859,7 +32859,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,
@@ -5609,7 +5609,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32867,7 +32867,7 @@ static const struct ndr_interface_call s
+@@ -32868,7 +32868,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,
@@ -5618,7 +5618,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32876,7 +32876,7 @@ static const struct ndr_interface_call s
+@@ -32877,7 +32877,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,
@@ -5627,7 +5627,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32885,7 +32885,7 @@ static const struct ndr_interface_call s
+@@ -32886,7 +32886,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,
@@ -5636,7 +5636,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32894,7 +32894,7 @@ static const struct ndr_interface_call s
+@@ -32895,7 +32895,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,
@@ -5645,7 +5645,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32903,7 +32903,7 @@ static const struct ndr_interface_call s
+@@ -32904,7 +32904,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,
@@ -5654,7 +5654,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32912,7 +32912,7 @@ static const struct ndr_interface_call s
+@@ -32913,7 +32913,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,
@@ -5663,7 +5663,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32921,7 +32921,7 @@ static const struct ndr_interface_call s
+@@ -32922,7 +32922,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,
@@ -5672,7 +5672,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32930,7 +32930,7 @@ static const struct ndr_interface_call s
+@@ -32931,7 +32931,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,
@@ -5681,7 +5681,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32939,7 +32939,7 @@ static const struct ndr_interface_call s
+@@ -32940,7 +32940,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,
@@ -5690,7 +5690,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32948,7 +32948,7 @@ static const struct ndr_interface_call s
+@@ -32949,7 +32949,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,
@@ -5699,7 +5699,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32957,7 +32957,7 @@ static const struct ndr_interface_call s
+@@ -32958,7 +32958,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,
@@ -5708,7 +5708,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32966,7 +32966,7 @@ static const struct ndr_interface_call s
+@@ -32967,7 +32967,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,
@@ -5717,7 +5717,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32975,7 +32975,7 @@ static const struct ndr_interface_call s
+@@ -32976,7 +32976,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,
@@ -5726,7 +5726,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32984,7 +32984,7 @@ static const struct ndr_interface_call s
+@@ -32985,7 +32985,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,
@@ -5735,7 +5735,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -32993,7 +32993,7 @@ static const struct ndr_interface_call s
+@@ -32994,7 +32994,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,
@@ -5744,7 +5744,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33002,7 +33002,7 @@ static const struct ndr_interface_call s
+@@ -33003,7 +33003,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,
@@ -5753,7 +5753,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33011,7 +33011,7 @@ static const struct ndr_interface_call s
+@@ -33012,7 +33012,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,
@@ -5762,7 +5762,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33020,7 +33020,7 @@ static const struct ndr_interface_call s
+@@ -33021,7 +33021,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,
@@ -5771,7 +5771,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33029,7 +33029,7 @@ static const struct ndr_interface_call s
+@@ -33030,7 +33030,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,
@@ -5780,7 +5780,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33038,7 +33038,7 @@ static const struct ndr_interface_call s
+@@ -33039,7 +33039,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,
@@ -5789,7 +5789,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33047,7 +33047,7 @@ static const struct ndr_interface_call s
+@@ -33048,7 +33048,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,
@@ -5798,7 +5798,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33056,7 +33056,7 @@ static const struct ndr_interface_call s
+@@ -33057,7 +33057,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,
@@ -5807,7 +5807,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33065,7 +33065,7 @@ static const struct ndr_interface_call s
+@@ -33066,7 +33066,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,
@@ -5816,7 +5816,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33074,7 +33074,7 @@ static const struct ndr_interface_call s
+@@ -33075,7 +33075,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,
@@ -5825,7 +5825,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33083,7 +33083,7 @@ static const struct ndr_interface_call s
+@@ -33084,7 +33084,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,
@@ -5834,7 +5834,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33092,7 +33092,7 @@ static const struct ndr_interface_call s
+@@ -33093,7 +33093,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,
@@ -5843,7 +5843,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33101,7 +33101,7 @@ static const struct ndr_interface_call s
+@@ -33102,7 +33102,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,
@@ -5852,7 +5852,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33110,7 +33110,7 @@ static const struct ndr_interface_call s
+@@ -33111,7 +33111,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,
@@ -5861,7 +5861,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33119,7 +33119,7 @@ static const struct ndr_interface_call s
+@@ -33120,7 +33120,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,
@@ -5870,7 +5870,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33128,7 +33128,7 @@ static const struct ndr_interface_call s
+@@ -33129,7 +33129,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,
@@ -5879,7 +5879,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33137,7 +33137,7 @@ static const struct ndr_interface_call s
+@@ -33138,7 +33138,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,
@@ -5888,7 +5888,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33146,7 +33146,7 @@ static const struct ndr_interface_call s
+@@ -33147,7 +33147,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,
@@ -5897,7 +5897,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33155,7 +33155,7 @@ static const struct ndr_interface_call s
+@@ -33156,7 +33156,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,
@@ -5906,7 +5906,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33164,7 +33164,7 @@ static const struct ndr_interface_call s
+@@ -33165,7 +33165,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,
@@ -5915,7 +5915,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33173,7 +33173,7 @@ static const struct ndr_interface_call s
+@@ -33174,7 +33174,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,
@@ -5924,7 +5924,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33182,7 +33182,7 @@ static const struct ndr_interface_call s
+@@ -33183,7 +33183,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,
@@ -5933,7 +5933,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33191,7 +33191,7 @@ static const struct ndr_interface_call s
+@@ -33192,7 +33192,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,
@@ -5942,7 +5942,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33200,7 +33200,7 @@ static const struct ndr_interface_call s
+@@ -33201,7 +33201,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,
@@ -5951,7 +5951,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33209,7 +33209,7 @@ static const struct ndr_interface_call s
+@@ -33210,7 +33210,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,
@@ -5960,7 +5960,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33218,7 +33218,7 @@ static const struct ndr_interface_call s
+@@ -33219,7 +33219,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,
@@ -5969,7 +5969,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33227,7 +33227,7 @@ static const struct ndr_interface_call s
+@@ -33228,7 +33228,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,
@@ -5978,7 +5978,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33236,7 +33236,7 @@ static const struct ndr_interface_call s
+@@ -33237,7 +33237,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,
@@ -5987,7 +5987,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33245,7 +33245,7 @@ static const struct ndr_interface_call s
+@@ -33246,7 +33246,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,
@@ -5996,7 +5996,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33254,7 +33254,7 @@ static const struct ndr_interface_call s
+@@ -33255,7 +33255,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,
@@ -6005,7 +6005,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33263,7 +33263,7 @@ static const struct ndr_interface_call s
+@@ -33264,7 +33264,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,
@@ -6014,7 +6014,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33272,7 +33272,7 @@ static const struct ndr_interface_call s
+@@ -33273,7 +33273,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,
@@ -6023,7 +6023,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33281,7 +33281,7 @@ static const struct ndr_interface_call s
+@@ -33282,7 +33282,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,
@@ -6032,7 +6032,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33290,7 +33290,7 @@ static const struct ndr_interface_call s
+@@ -33291,7 +33291,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,
@@ -6041,7 +6041,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33299,7 +33299,7 @@ static const struct ndr_interface_call s
+@@ -33300,7 +33300,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,
@@ -6050,7 +6050,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33308,7 +33308,7 @@ static const struct ndr_interface_call s
+@@ -33309,7 +33309,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,
@@ -6059,7 +6059,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33317,7 +33317,7 @@ static const struct ndr_interface_call s
+@@ -33318,7 +33318,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,
@@ -6068,7 +6068,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33326,7 +33326,7 @@ static const struct ndr_interface_call s
+@@ -33327,7 +33327,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,
@@ -6077,7 +6077,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33335,7 +33335,7 @@ static const struct ndr_interface_call s
+@@ -33336,7 +33336,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,
@@ -6086,7 +6086,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33344,7 +33344,7 @@ static const struct ndr_interface_call s
+@@ -33345,7 +33345,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,
@@ -6095,7 +6095,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33353,7 +33353,7 @@ static const struct ndr_interface_call s
+@@ -33354,7 +33354,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,
@@ -6104,7 +6104,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33362,7 +33362,7 @@ static const struct ndr_interface_call s
+@@ -33363,7 +33363,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,
@@ -6113,7 +6113,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33371,7 +33371,7 @@ static const struct ndr_interface_call s
+@@ -33372,7 +33372,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,
@@ -6122,7 +6122,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33380,7 +33380,7 @@ static const struct ndr_interface_call s
+@@ -33381,7 +33381,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,
@@ -6131,7 +6131,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33389,7 +33389,7 @@ static const struct ndr_interface_call s
+@@ -33390,7 +33390,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,
@@ -6140,7 +6140,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33398,7 +33398,7 @@ static const struct ndr_interface_call s
+@@ -33399,7 +33399,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,
@@ -6149,7 +6149,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33407,7 +33407,7 @@ static const struct ndr_interface_call s
+@@ -33408,7 +33408,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,
@@ -6158,7 +6158,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33416,7 +33416,7 @@ static const struct ndr_interface_call s
+@@ -33417,7 +33417,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,
@@ -6167,7 +6167,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33425,7 +33425,7 @@ static const struct ndr_interface_call s
+@@ -33426,7 +33426,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,
@@ -6176,7 +6176,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33434,7 +33434,7 @@ static const struct ndr_interface_call s
+@@ -33435,7 +33435,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,
@@ -6185,7 +6185,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33443,7 +33443,7 @@ static const struct ndr_interface_call s
+@@ -33444,7 +33444,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,
@@ -6194,7 +6194,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33452,7 +33452,7 @@ static const struct ndr_interface_call s
+@@ -33453,7 +33453,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,
@@ -6203,7 +6203,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33461,7 +33461,7 @@ static const struct ndr_interface_call s
+@@ -33462,7 +33462,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,
@@ -6212,7 +6212,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33470,7 +33470,7 @@ static const struct ndr_interface_call s
+@@ -33471,7 +33471,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,
@@ -6221,7 +6221,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33479,7 +33479,7 @@ static const struct ndr_interface_call s
+@@ -33480,7 +33480,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,
@@ -6230,7 +6230,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33488,7 +33488,7 @@ static const struct ndr_interface_call s
+@@ -33489,7 +33489,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,
@@ -6239,7 +6239,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33497,7 +33497,7 @@ static const struct ndr_interface_call s
+@@ -33498,7 +33498,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,
@@ -6248,7 +6248,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33506,7 +33506,7 @@ static const struct ndr_interface_call s
+@@ -33507,7 +33507,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,
@@ -6257,7 +6257,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33515,7 +33515,7 @@ static const struct ndr_interface_call s
+@@ -33516,7 +33516,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,
@@ -6266,7 +6266,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33524,7 +33524,7 @@ static const struct ndr_interface_call s
+@@ -33525,7 +33525,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,
@@ -6275,7 +6275,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33533,7 +33533,7 @@ static const struct ndr_interface_call s
+@@ -33534,7 +33534,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,
@@ -6284,7 +6284,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33542,7 +33542,7 @@ static const struct ndr_interface_call s
+@@ -33543,7 +33543,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,
@@ -6293,7 +6293,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33551,7 +33551,7 @@ static const struct ndr_interface_call s
+@@ -33552,7 +33552,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,
@@ -6302,7 +6302,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33560,7 +33560,7 @@ static const struct ndr_interface_call s
+@@ -33561,7 +33561,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,
@@ -6311,7 +6311,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33569,7 +33569,7 @@ static const struct ndr_interface_call s
+@@ -33570,7 +33570,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,
@@ -6320,7 +6320,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33578,7 +33578,7 @@ static const struct ndr_interface_call s
+@@ -33579,7 +33579,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,
@@ -6329,7 +6329,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33587,7 +33587,7 @@ static const struct ndr_interface_call s
+@@ -33588,7 +33588,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,
@@ -6338,7 +6338,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33596,7 +33596,7 @@ static const struct ndr_interface_call s
+@@ -33597,7 +33597,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,
@@ -6347,7 +6347,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33605,7 +33605,7 @@ static const struct ndr_interface_call s
+@@ -33606,7 +33606,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,
@@ -6356,7 +6356,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33614,7 +33614,7 @@ static const struct ndr_interface_call s
+@@ -33615,7 +33615,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,
@@ -6365,7 +6365,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33623,7 +33623,7 @@ static const struct ndr_interface_call s
+@@ -33624,7 +33624,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,
@@ -6374,7 +6374,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33632,7 +33632,7 @@ static const struct ndr_interface_call s
+@@ -33633,7 +33633,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,
@@ -6383,7 +6383,7 @@
  		{ 0, NULL },
  		{ 0, NULL },
  	},
-@@ -33641,7 +33641,7 @@ static const struct ndr_interface_call s
+@@ -33642,7 +33642,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,