[packages] samba36: update to v3.6.4 (CVE-2012-1182)

SVN-Revision: 31246

diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 6875d2b89a707bfdcd30e06774c7dd532f87d163..4854f09e803e3a63089e9272fd38d5f1d47c20c5 100644 (file)
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
-PKG_VERSION:=3.6.3
-PKG_RELEASE:=2
+PKG_VERSION:=3.6.4
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL_SUBDIR:=/
 PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba$(PKG_SOURCE_URL_SUBDIR)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=98ac9db9f4b6ebfc3f013aa193ffb0d1
+PKG_MD5SUM:=d8e070e2a3b12f202f347e4427469bc2
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/samba36/patches/330-librpc_default_print.patch b/net/samba36/patches/330-librpc_default_print.patch
index 23743794f04ef9dcd67b3db801fba1ec8047fc92..f17b1e2396eca7c5e1451ccc06c6aec49aab7a51 100644 (file)
--- a/net/samba36/patches/330-librpc_default_print.patch
+++ b/net/samba36/patches/330-librpc_default_print.patch
@@ -10,7 +10,7 @@
 +}
 --- a/source3/librpc/gen_ndr/ndr_atsvc.c
 +++ b/source3/librpc/gen_ndr/ndr_atsvc.c
-@@ -841,7 +841,7 @@ static const struct ndr_interface_call a
+@@ -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,
@@ -19,7 +19,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -850,7 +850,7 @@ static const struct ndr_interface_call a
+@@ -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,
@@ -28,7 +28,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -859,7 +859,7 @@ static const struct ndr_interface_call a
+@@ -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,
@@ -37,7 +37,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -868,7 +868,7 @@ static const struct ndr_interface_call a
+@@ -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,
@@ -185,7 +185,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_backupkey.c
 +++ b/source3/librpc/gen_ndr/ndr_backupkey.c
-@@ -722,7 +722,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -196,7 +196,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_browser.c
 +++ b/source3/librpc/gen_ndr/ndr_browser.c
-@@ -920,7 +920,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -205,7 +205,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -929,7 +929,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -214,7 +214,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -938,7 +938,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -223,7 +223,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -947,7 +947,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -232,7 +232,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -956,7 +956,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -241,7 +241,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -965,7 +965,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -250,7 +250,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -974,7 +974,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -259,7 +259,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -983,7 +983,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -268,7 +268,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -992,7 +992,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -277,7 +277,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1001,7 +1001,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -286,7 +286,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1010,7 +1010,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -295,7 +295,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1019,7 +1019,7 @@ static const struct ndr_interface_call b
+@@ -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,
@@ -407,7 +407,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1424,7 +1424,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -416,7 +416,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1433,7 +1433,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -425,7 +425,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1442,7 +1442,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -434,7 +434,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1580,7 +1580,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -443,7 +443,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1691,7 +1691,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -452,7 +452,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1778,7 +1778,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -461,7 +461,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1865,7 +1865,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -470,7 +470,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2021,7 +2021,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -479,7 +479,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2303,7 +2303,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -488,7 +488,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3022,7 +3022,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -497,7 +497,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3031,7 +3031,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -506,7 +506,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3040,7 +3040,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -515,7 +515,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3049,7 +3049,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -524,7 +524,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3225,7 +3225,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -533,7 +533,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3234,7 +3234,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -542,7 +542,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3363,7 +3363,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -551,7 +551,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3653,7 +3653,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -560,7 +560,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3662,7 +3662,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -571,7 +571,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_dfs.c
 +++ b/source3/librpc/gen_ndr/ndr_dfs.c
-@@ -5654,7 +5654,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -580,7 +580,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5663,7 +5663,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -589,7 +589,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5672,7 +5672,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -598,7 +598,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5681,7 +5681,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -607,7 +607,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5690,7 +5690,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -616,7 +616,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5699,7 +5699,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -625,7 +625,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5708,7 +5708,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -634,7 +634,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5717,7 +5717,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -643,7 +643,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5726,7 +5726,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -652,7 +652,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5735,7 +5735,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -661,7 +661,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5744,7 +5744,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -670,7 +670,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5753,7 +5753,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -679,7 +679,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5762,7 +5762,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -688,7 +688,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5771,7 +5771,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -697,7 +697,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5780,7 +5780,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -706,7 +706,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5789,7 +5789,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -715,7 +715,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5798,7 +5798,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -724,7 +724,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5807,7 +5807,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -733,7 +733,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5816,7 +5816,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -742,7 +742,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5825,7 +5825,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -751,7 +751,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5834,7 +5834,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -760,7 +760,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5843,7 +5843,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -769,7 +769,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5852,7 +5852,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -780,7 +780,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_dfsblobs.c
 +++ b/source3/librpc/gen_ndr/ndr_dfsblobs.c
-@@ -1393,7 +1393,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -791,7 +791,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_dns.c
 +++ b/source3/librpc/gen_ndr/ndr_dns.c
-@@ -847,7 +847,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -824,7 +824,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_drsblobs.c
 +++ b/source3/librpc/gen_ndr/ndr_drsblobs.c
-@@ -5208,7 +5208,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -833,7 +833,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5217,7 +5217,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -842,7 +842,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5226,7 +5226,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -851,7 +851,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5235,7 +5235,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -860,7 +860,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5244,7 +5244,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -869,7 +869,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5253,7 +5253,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -878,7 +878,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5262,7 +5262,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -887,7 +887,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5271,7 +5271,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -896,7 +896,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5280,7 +5280,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -905,7 +905,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5289,7 +5289,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -914,7 +914,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5298,7 +5298,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -923,7 +923,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5307,7 +5307,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -932,7 +932,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5316,7 +5316,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -941,7 +941,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5325,7 +5325,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -950,7 +950,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5334,7 +5334,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -961,7 +961,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_drsuapi.c
 +++ b/source3/librpc/gen_ndr/ndr_drsuapi.c
-@@ -16171,7 +16171,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -970,7 +970,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16180,7 +16180,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -979,7 +979,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16189,7 +16189,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -988,7 +988,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16198,7 +16198,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -997,7 +997,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16207,7 +16207,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1006,7 +1006,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16216,7 +16216,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1015,7 +1015,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16225,7 +16225,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1024,7 +1024,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16234,7 +16234,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1033,7 +1033,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16243,7 +16243,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1042,7 +1042,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16252,7 +16252,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1051,7 +1051,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16261,7 +16261,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1060,7 +1060,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16270,7 +16270,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1069,7 +1069,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16279,7 +16279,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1078,7 +1078,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16288,7 +16288,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1087,7 +1087,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16297,7 +16297,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1096,7 +1096,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16306,7 +16306,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1105,7 +1105,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16315,7 +16315,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1114,7 +1114,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16324,7 +16324,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1123,7 +1123,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16333,7 +16333,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1132,7 +1132,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16342,7 +16342,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1141,7 +1141,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16351,7 +16351,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1150,7 +1150,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16360,7 +16360,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1159,7 +1159,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16369,7 +16369,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1168,7 +1168,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16378,7 +16378,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1177,7 +1177,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -16387,7 +16387,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1343,7 +1343,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_dssetup.c
 +++ b/source3/librpc/gen_ndr/ndr_dssetup.c
-@@ -983,7 +983,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1352,7 +1352,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -992,7 +992,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1361,7 +1361,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1001,7 +1001,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1370,7 +1370,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1010,7 +1010,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1379,7 +1379,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1019,7 +1019,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1388,7 +1388,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1028,7 +1028,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1397,7 +1397,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1037,7 +1037,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1406,7 +1406,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1046,7 +1046,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1415,7 +1415,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1055,7 +1055,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1424,7 +1424,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1064,7 +1064,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1433,7 +1433,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1073,7 +1073,7 @@ static const struct ndr_interface_call d
+@@ -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,
@@ -1444,7 +1444,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_echo.c
 +++ b/source3/librpc/gen_ndr/ndr_echo.c
-@@ -1440,7 +1440,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1453,7 +1453,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1449,7 +1449,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1462,7 +1462,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1458,7 +1458,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1471,7 +1471,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1467,7 +1467,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1480,7 +1480,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1476,7 +1476,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1489,7 +1489,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1485,7 +1485,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1498,7 +1498,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1494,7 +1494,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1507,7 +1507,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1503,7 +1503,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1516,7 +1516,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1512,7 +1512,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1525,7 +1525,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1521,7 +1521,7 @@ static const struct ndr_interface_call r
+@@ -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,
@@ -1536,7 +1536,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_efs.c
 +++ b/source3/librpc/gen_ndr/ndr_efs.c
-@@ -1288,7 +1288,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1545,7 +1545,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1297,7 +1297,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1554,7 +1554,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1306,7 +1306,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1563,7 +1563,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1315,7 +1315,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1572,7 +1572,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1324,7 +1324,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1581,7 +1581,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1333,7 +1333,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1590,7 +1590,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1342,7 +1342,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1599,7 +1599,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1351,7 +1351,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1608,7 +1608,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1360,7 +1360,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1617,7 +1617,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1369,7 +1369,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1626,7 +1626,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1378,7 +1378,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1635,7 +1635,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1387,7 +1387,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1644,7 +1644,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1396,7 +1396,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1653,7 +1653,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1405,7 +1405,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1664,7 +1664,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_epmapper.c
 +++ b/source3/librpc/gen_ndr/ndr_epmapper.c
-@@ -2738,7 +2738,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1673,7 +1673,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2747,7 +2747,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1682,7 +1682,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2756,7 +2756,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1691,7 +1691,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2765,7 +2765,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1700,7 +1700,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2774,7 +2774,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1709,7 +1709,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2783,7 +2783,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1718,7 +1718,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2792,7 +2792,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1727,7 +1727,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2801,7 +2801,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1738,7 +1738,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_eventlog.c
 +++ b/source3/librpc/gen_ndr/ndr_eventlog.c
-@@ -2956,7 +2956,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1747,7 +1747,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2965,7 +2965,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1756,7 +1756,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2974,7 +2974,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1765,7 +1765,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2983,7 +2983,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1774,7 +1774,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2992,7 +2992,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1783,7 +1783,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3001,7 +3001,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1792,7 +1792,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3010,7 +3010,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1801,7 +1801,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3019,7 +3019,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1810,7 +1810,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3028,7 +3028,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1819,7 +1819,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3037,7 +3037,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1828,7 +1828,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3046,7 +3046,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1837,7 +1837,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3055,7 +3055,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1846,7 +1846,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3064,7 +3064,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1855,7 +1855,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3073,7 +3073,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1864,7 +1864,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3082,7 +3082,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1873,7 +1873,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3091,7 +3091,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1882,7 +1882,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3100,7 +3100,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1891,7 +1891,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3109,7 +3109,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1900,7 +1900,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3118,7 +3118,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1909,7 +1909,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3127,7 +3127,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1918,7 +1918,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3136,7 +3136,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1927,7 +1927,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3145,7 +3145,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1936,7 +1936,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3154,7 +3154,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1945,7 +1945,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3163,7 +3163,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1954,7 +1954,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3172,7 +3172,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1965,7 +1965,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_eventlog6.c
 +++ b/source3/librpc/gen_ndr/ndr_eventlog6.c
-@@ -5288,7 +5288,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1974,7 +1974,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5297,7 +5297,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1983,7 +1983,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5306,7 +5306,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -1992,7 +1992,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5315,7 +5315,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2001,7 +2001,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5324,7 +5324,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2010,7 +2010,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5333,7 +5333,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2019,7 +2019,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5342,7 +5342,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2028,7 +2028,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5351,7 +5351,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2037,7 +2037,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5360,7 +5360,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2046,7 +2046,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5369,7 +5369,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2055,7 +2055,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5378,7 +5378,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2064,7 +2064,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5387,7 +5387,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2073,7 +2073,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5396,7 +5396,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2082,7 +2082,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5405,7 +5405,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2091,7 +2091,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5414,7 +5414,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2100,7 +2100,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5423,7 +5423,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2109,7 +2109,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5432,7 +5432,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2118,7 +2118,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5441,7 +5441,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2127,7 +2127,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5450,7 +5450,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2136,7 +2136,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5459,7 +5459,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2145,7 +2145,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5468,7 +5468,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2154,7 +2154,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5477,7 +5477,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2163,7 +2163,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5486,7 +5486,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2172,7 +2172,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5495,7 +5495,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2181,7 +2181,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5504,7 +5504,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2190,7 +2190,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5513,7 +5513,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2199,7 +2199,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5522,7 +5522,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2208,7 +2208,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5531,7 +5531,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2217,7 +2217,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5540,7 +5540,7 @@ static const struct ndr_interface_call e
+@@ -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,
@@ -2228,7 +2228,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_frsapi.c
 +++ b/source3/librpc/gen_ndr/ndr_frsapi.c
-@@ -967,7 +967,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2237,7 +2237,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -976,7 +976,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2246,7 +2246,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -985,7 +985,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2255,7 +2255,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -994,7 +994,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2264,7 +2264,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1003,7 +1003,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2273,7 +2273,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1012,7 +1012,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2282,7 +2282,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1021,7 +1021,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2291,7 +2291,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1030,7 +1030,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2300,7 +2300,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1039,7 +1039,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2309,7 +2309,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1048,7 +1048,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2318,7 +2318,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1057,7 +1057,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2329,7 +2329,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_frsrpc.c
 +++ b/source3/librpc/gen_ndr/ndr_frsrpc.c
-@@ -2733,7 +2733,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2338,7 +2338,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2742,7 +2742,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2347,7 +2347,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2751,7 +2751,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2356,7 +2356,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2760,7 +2760,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2365,7 +2365,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2769,7 +2769,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2374,7 +2374,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2778,7 +2778,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2383,7 +2383,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2787,7 +2787,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2392,7 +2392,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2796,7 +2796,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2401,7 +2401,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2805,7 +2805,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2410,7 +2410,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2814,7 +2814,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2419,7 +2419,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2823,7 +2823,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2430,7 +2430,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_frstrans.c
 +++ b/source3/librpc/gen_ndr/ndr_frstrans.c
-@@ -2303,7 +2303,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2439,7 +2439,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2312,7 +2312,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2448,7 +2448,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2321,7 +2321,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2457,7 +2457,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2330,7 +2330,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2466,7 +2466,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2339,7 +2339,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2475,7 +2475,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2348,7 +2348,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2484,7 +2484,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2357,7 +2357,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2493,7 +2493,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2366,7 +2366,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2502,7 +2502,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2375,7 +2375,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2511,7 +2511,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2384,7 +2384,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2520,7 +2520,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2393,7 +2393,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2529,7 +2529,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2402,7 +2402,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2538,7 +2538,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2411,7 +2411,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2547,7 +2547,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2420,7 +2420,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2556,7 +2556,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2429,7 +2429,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2565,7 +2565,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2438,7 +2438,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2574,7 +2574,7 @@
                { 0, NULL },
                { 1, frstrans_RawGetFileDataAsync_out_pipes },
        },
-@@ -2447,7 +2447,7 @@ static const struct ndr_interface_call f
+@@ -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,
@@ -2625,7 +2625,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_krb5pac.c
 +++ b/source3/librpc/gen_ndr/ndr_krb5pac.c
-@@ -994,7 +994,7 @@ static const struct ndr_interface_call k
+@@ -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,
@@ -2634,7 +2634,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1003,7 +1003,7 @@ static const struct ndr_interface_call k
+@@ -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,
@@ -2643,7 +2643,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1012,7 +1012,7 @@ static const struct ndr_interface_call k
+@@ -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,
@@ -2652,7 +2652,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1021,7 +1021,7 @@ static const struct ndr_interface_call k
+@@ -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,
@@ -2661,7 +2661,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -1030,7 +1030,7 @@ static const struct ndr_interface_call k
+@@ -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,
@@ -2672,7 +2672,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_lsa.c
 +++ b/source3/librpc/gen_ndr/ndr_lsa.c
-@@ -13479,7 +13479,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2681,7 +2681,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13488,7 +13488,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2690,7 +2690,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13497,7 +13497,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2699,7 +2699,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13506,7 +13506,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2708,7 +2708,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13515,7 +13515,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2717,7 +2717,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13524,7 +13524,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2726,7 +2726,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13533,7 +13533,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2735,7 +2735,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13542,7 +13542,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2744,7 +2744,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13551,7 +13551,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2753,7 +2753,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13560,7 +13560,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2762,7 +2762,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13569,7 +13569,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2771,7 +2771,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13578,7 +13578,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2780,7 +2780,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13587,7 +13587,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2789,7 +2789,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13596,7 +13596,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2798,7 +2798,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13605,7 +13605,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2807,7 +2807,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13614,7 +13614,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2816,7 +2816,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13623,7 +13623,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2825,7 +2825,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13632,7 +13632,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2834,7 +2834,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13641,7 +13641,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2843,7 +2843,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13650,7 +13650,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2852,7 +2852,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13659,7 +13659,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2861,7 +2861,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13668,7 +13668,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2870,7 +2870,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13677,7 +13677,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2879,7 +2879,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13686,7 +13686,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2888,7 +2888,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13695,7 +13695,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2897,7 +2897,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13704,7 +13704,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2906,7 +2906,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13713,7 +13713,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2915,7 +2915,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13722,7 +13722,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2924,7 +2924,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13731,7 +13731,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2933,7 +2933,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13740,7 +13740,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2942,7 +2942,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13749,7 +13749,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2951,7 +2951,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13758,7 +13758,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2960,7 +2960,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13767,7 +13767,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2969,7 +2969,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13776,7 +13776,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2978,7 +2978,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13785,7 +13785,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2987,7 +2987,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13794,7 +13794,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -2996,7 +2996,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13803,7 +13803,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3005,7 +3005,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13812,7 +13812,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3014,7 +3014,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13821,7 +13821,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3023,7 +3023,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13830,7 +13830,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3032,7 +3032,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13839,7 +13839,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3041,7 +3041,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13848,7 +13848,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3050,7 +3050,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13857,7 +13857,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3059,7 +3059,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13866,7 +13866,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3068,7 +3068,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13875,7 +13875,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3077,7 +3077,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13884,7 +13884,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3086,7 +3086,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13893,7 +13893,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3095,7 +3095,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13902,7 +13902,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3104,7 +3104,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13911,7 +13911,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3113,7 +3113,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13920,7 +13920,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3122,7 +3122,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13929,7 +13929,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3131,7 +3131,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13938,7 +13938,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3140,7 +3140,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13947,7 +13947,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3149,7 +3149,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13956,7 +13956,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3158,7 +3158,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13965,7 +13965,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3167,7 +3167,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13974,7 +13974,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3176,7 +3176,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13983,7 +13983,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3185,7 +3185,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13992,7 +13992,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3194,7 +3194,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14001,7 +14001,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3203,7 +3203,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14010,7 +14010,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3212,7 +3212,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14019,7 +14019,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3221,7 +3221,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14028,7 +14028,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3230,7 +3230,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14037,7 +14037,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3239,7 +3239,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14046,7 +14046,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3248,7 +3248,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14055,7 +14055,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3257,7 +3257,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14064,7 +14064,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3266,7 +3266,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14073,7 +14073,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3275,7 +3275,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14082,7 +14082,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3284,7 +3284,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14091,7 +14091,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3293,7 +3293,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14100,7 +14100,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3302,7 +3302,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14109,7 +14109,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3311,7 +3311,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14118,7 +14118,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3320,7 +3320,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14127,7 +14127,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3329,7 +3329,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14136,7 +14136,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3338,7 +3338,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14145,7 +14145,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3347,7 +3347,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14154,7 +14154,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3356,7 +3356,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14163,7 +14163,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3365,7 +3365,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14172,7 +14172,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3374,7 +3374,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14181,7 +14181,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3383,7 +3383,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14190,7 +14190,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3392,7 +3392,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14199,7 +14199,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3401,7 +3401,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -14208,7 +14208,7 @@ static const struct ndr_interface_call l
+@@ -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,
@@ -3412,7 +3412,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_mgmt.c
 +++ b/source3/librpc/gen_ndr/ndr_mgmt.c
-@@ -506,7 +506,7 @@ static const struct ndr_interface_call m
+@@ -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,
@@ -3421,7 +3421,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -515,7 +515,7 @@ static const struct ndr_interface_call m
+@@ -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,
@@ -3430,7 +3430,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -524,7 +524,7 @@ static const struct ndr_interface_call m
+@@ -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,
@@ -3439,7 +3439,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -533,7 +533,7 @@ static const struct ndr_interface_call m
+@@ -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,
@@ -3448,7 +3448,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -542,7 +542,7 @@ static const struct ndr_interface_call m
+@@ -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,
@@ -3506,7 +3506,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_nbt.c
 +++ b/source3/librpc/gen_ndr/ndr_nbt.c
-@@ -3641,7 +3641,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3517,7 +3517,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_netlogon.c
 +++ b/source3/librpc/gen_ndr/ndr_netlogon.c
-@@ -17264,7 +17264,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3526,7 +3526,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17273,7 +17273,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3535,7 +3535,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17282,7 +17282,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3544,7 +3544,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17291,7 +17291,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3553,7 +3553,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17300,7 +17300,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3562,7 +3562,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17309,7 +17309,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3571,7 +3571,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17318,7 +17318,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3580,7 +3580,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17327,7 +17327,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3589,7 +3589,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17336,7 +17336,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3598,7 +3598,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17345,7 +17345,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3607,7 +3607,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17354,7 +17354,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3616,7 +3616,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17363,7 +17363,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3625,7 +3625,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17372,7 +17372,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3634,7 +3634,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17381,7 +17381,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3643,7 +3643,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17390,7 +17390,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3652,7 +3652,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17399,7 +17399,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3661,7 +3661,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17408,7 +17408,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3670,7 +3670,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17417,7 +17417,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3679,7 +3679,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17426,7 +17426,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3688,7 +3688,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17435,7 +17435,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3697,7 +3697,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17444,7 +17444,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3706,7 +3706,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17453,7 +17453,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3715,7 +3715,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17462,7 +17462,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3724,7 +3724,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17471,7 +17471,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3733,7 +3733,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17480,7 +17480,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3742,7 +3742,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17489,7 +17489,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3751,7 +3751,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17498,7 +17498,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3760,7 +3760,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17507,7 +17507,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3769,7 +3769,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17516,7 +17516,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3778,7 +3778,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17525,7 +17525,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3787,7 +3787,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17534,7 +17534,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3796,7 +3796,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17543,7 +17543,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3805,7 +3805,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17552,7 +17552,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3814,7 +3814,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17561,7 +17561,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3823,7 +3823,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17570,7 +17570,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3832,7 +3832,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17579,7 +17579,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3841,7 +3841,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17588,7 +17588,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3850,7 +3850,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17597,7 +17597,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3859,7 +3859,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17606,7 +17606,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3868,7 +3868,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17615,7 +17615,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3877,7 +3877,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17624,7 +17624,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3886,7 +3886,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17633,7 +17633,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3895,7 +3895,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17642,7 +17642,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3904,7 +3904,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17651,7 +17651,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3913,7 +3913,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17660,7 +17660,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3922,7 +3922,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17669,7 +17669,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3931,7 +3931,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17678,7 +17678,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3940,7 +3940,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17687,7 +17687,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3949,7 +3949,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -17696,7 +17696,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3960,7 +3960,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_ntlmssp.c
 +++ b/source3/librpc/gen_ndr/ndr_ntlmssp.c
-@@ -2378,7 +2378,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3969,7 +3969,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2387,7 +2387,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3978,7 +3978,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2396,7 +2396,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3987,7 +3987,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2405,7 +2405,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -3996,7 +3996,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2414,7 +2414,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4036,7 +4036,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_ntsvcs.c
 +++ b/source3/librpc/gen_ndr/ndr_ntsvcs.c
-@@ -3428,7 +3428,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4045,7 +4045,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3437,7 +3437,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4054,7 +4054,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3446,7 +3446,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4063,7 +4063,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3455,7 +3455,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4072,7 +4072,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3464,7 +3464,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4081,7 +4081,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3473,7 +3473,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4090,7 +4090,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3482,7 +3482,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4099,7 +4099,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3491,7 +3491,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4108,7 +4108,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3500,7 +3500,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4117,7 +4117,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3509,7 +3509,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4126,7 +4126,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3518,7 +3518,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4135,7 +4135,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3527,7 +3527,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4144,7 +4144,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3536,7 +3536,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4153,7 +4153,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3545,7 +3545,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4162,7 +4162,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3554,7 +3554,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4171,7 +4171,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3563,7 +3563,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4180,7 +4180,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3572,7 +3572,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4189,7 +4189,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3581,7 +3581,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4198,7 +4198,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3590,7 +3590,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4207,7 +4207,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3599,7 +3599,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4216,7 +4216,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3608,7 +3608,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4225,7 +4225,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3617,7 +3617,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4234,7 +4234,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3626,7 +3626,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4243,7 +4243,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3635,7 +3635,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4252,7 +4252,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3644,7 +3644,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4261,7 +4261,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3653,7 +3653,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4270,7 +4270,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3662,7 +3662,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4279,7 +4279,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3671,7 +3671,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4288,7 +4288,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3680,7 +3680,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4297,7 +4297,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3689,7 +3689,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4306,7 +4306,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3698,7 +3698,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4315,7 +4315,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3707,7 +3707,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4324,7 +4324,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3716,7 +3716,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4333,7 +4333,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3725,7 +3725,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4342,7 +4342,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3734,7 +3734,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4351,7 +4351,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3743,7 +3743,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4360,7 +4360,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3752,7 +3752,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4369,7 +4369,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3761,7 +3761,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4378,7 +4378,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3770,7 +3770,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4387,7 +4387,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3779,7 +3779,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4396,7 +4396,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3788,7 +3788,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4405,7 +4405,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3797,7 +3797,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4414,7 +4414,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3806,7 +3806,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4423,7 +4423,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3815,7 +3815,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4432,7 +4432,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3824,7 +3824,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4441,7 +4441,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3833,7 +3833,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4450,7 +4450,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3842,7 +3842,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4459,7 +4459,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3851,7 +3851,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4468,7 +4468,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3860,7 +3860,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4477,7 +4477,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3869,7 +3869,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4486,7 +4486,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3878,7 +3878,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4495,7 +4495,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3887,7 +3887,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4504,7 +4504,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3896,7 +3896,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4513,7 +4513,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3905,7 +3905,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4522,7 +4522,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3914,7 +3914,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4531,7 +4531,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3923,7 +3923,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4540,7 +4540,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3932,7 +3932,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4549,7 +4549,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3941,7 +3941,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4558,7 +4558,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3950,7 +3950,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4567,7 +4567,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3959,7 +3959,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4576,7 +4576,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3968,7 +3968,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4585,7 +4585,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3977,7 +3977,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4594,7 +4594,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3986,7 +3986,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4603,7 +4603,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3995,7 +3995,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4612,7 +4612,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4004,7 +4004,7 @@ static const struct ndr_interface_call n
+@@ -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,
@@ -4623,7 +4623,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_oxidresolver.c
 +++ b/source3/librpc/gen_ndr/ndr_oxidresolver.c
-@@ -753,7 +753,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -4632,7 +4632,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -762,7 +762,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -4641,7 +4641,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -771,7 +771,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -4650,7 +4650,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -780,7 +780,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -4659,7 +4659,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -789,7 +789,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -4668,7 +4668,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -798,7 +798,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -4690,7 +4690,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_preg.c
 +++ b/source3/librpc/gen_ndr/ndr_preg.c
-@@ -188,7 +188,7 @@ static const struct ndr_interface_call p
+@@ -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,
@@ -4701,7 +4701,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_remact.c
 +++ b/source3/librpc/gen_ndr/ndr_remact.c
-@@ -361,7 +361,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -4777,7 +4777,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_samr.c
 +++ b/source3/librpc/gen_ndr/ndr_samr.c
-@@ -12616,7 +12616,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4786,7 +4786,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12625,7 +12625,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4795,7 +4795,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12634,7 +12634,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4804,7 +4804,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12643,7 +12643,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4813,7 +4813,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12652,7 +12652,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4822,7 +4822,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12661,7 +12661,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4831,7 +4831,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12670,7 +12670,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4840,7 +4840,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12679,7 +12679,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4849,7 +4849,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12688,7 +12688,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4858,7 +4858,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12697,7 +12697,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4867,7 +4867,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12706,7 +12706,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4876,7 +4876,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12715,7 +12715,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4885,7 +4885,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12724,7 +12724,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4894,7 +4894,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12733,7 +12733,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4903,7 +4903,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12742,7 +12742,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4912,7 +4912,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12751,7 +12751,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4921,7 +4921,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12760,7 +12760,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4930,7 +4930,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12769,7 +12769,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4939,7 +4939,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12778,7 +12778,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4948,7 +4948,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12787,7 +12787,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4957,7 +4957,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12796,7 +12796,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4966,7 +4966,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12805,7 +12805,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4975,7 +4975,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12814,7 +12814,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4984,7 +4984,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12823,7 +12823,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -4993,7 +4993,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12832,7 +12832,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5002,7 +5002,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12841,7 +12841,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5011,7 +5011,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12850,7 +12850,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5020,7 +5020,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12859,7 +12859,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5029,7 +5029,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12868,7 +12868,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5038,7 +5038,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12877,7 +12877,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5047,7 +5047,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12886,7 +12886,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5056,7 +5056,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12895,7 +12895,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5065,7 +5065,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12904,7 +12904,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5074,7 +5074,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12913,7 +12913,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5083,7 +5083,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12922,7 +12922,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5092,7 +5092,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12931,7 +12931,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5101,7 +5101,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12940,7 +12940,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5110,7 +5110,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12949,7 +12949,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5119,7 +5119,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12958,7 +12958,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5128,7 +5128,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12967,7 +12967,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5137,7 +5137,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12976,7 +12976,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5146,7 +5146,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12985,7 +12985,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5155,7 +5155,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -12994,7 +12994,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5164,7 +5164,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13003,7 +13003,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5173,7 +5173,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13012,7 +13012,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5182,7 +5182,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13021,7 +13021,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5191,7 +5191,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13030,7 +13030,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5200,7 +5200,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13039,7 +13039,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5209,7 +5209,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13048,7 +13048,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5218,7 +5218,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13057,7 +13057,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5227,7 +5227,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13066,7 +13066,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5236,7 +5236,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13075,7 +13075,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5245,7 +5245,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13084,7 +13084,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5254,7 +5254,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13093,7 +13093,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5263,7 +5263,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13102,7 +13102,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5272,7 +5272,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13111,7 +13111,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5281,7 +5281,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13120,7 +13120,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5290,7 +5290,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13129,7 +13129,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5299,7 +5299,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13138,7 +13138,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5308,7 +5308,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13147,7 +13147,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5317,7 +5317,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13156,7 +13156,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5326,7 +5326,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13165,7 +13165,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5335,7 +5335,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13174,7 +13174,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5344,7 +5344,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13183,7 +13183,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5353,7 +5353,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13192,7 +13192,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5362,7 +5362,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13201,7 +13201,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5371,7 +5371,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13210,7 +13210,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5380,7 +5380,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -13219,7 +13219,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5402,7 +5402,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_spoolss.c
 +++ b/source3/librpc/gen_ndr/ndr_spoolss.c
-@@ -31821,7 +31821,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5411,7 +5411,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31830,7 +31830,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5420,7 +5420,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31839,7 +31839,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5429,7 +5429,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31848,7 +31848,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5438,7 +5438,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31857,7 +31857,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5447,7 +5447,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31866,7 +31866,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5456,7 +5456,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31875,7 +31875,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5465,7 +5465,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31884,7 +31884,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5474,7 +5474,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31893,7 +31893,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5483,7 +5483,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31902,7 +31902,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5492,7 +5492,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31911,7 +31911,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5501,7 +5501,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31920,7 +31920,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5510,7 +5510,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31929,7 +31929,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5519,7 +5519,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31938,7 +31938,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5528,7 +5528,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31947,7 +31947,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5537,7 +5537,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31956,7 +31956,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5546,7 +5546,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31965,7 +31965,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5555,7 +5555,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31974,7 +31974,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5564,7 +5564,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31983,7 +31983,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5573,7 +5573,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -31992,7 +31992,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5582,7 +5582,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32001,7 +32001,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5591,7 +5591,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32010,7 +32010,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5600,7 +5600,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32019,7 +32019,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5609,7 +5609,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32028,7 +32028,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5618,7 +5618,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32037,7 +32037,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5627,7 +5627,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32046,7 +32046,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5636,7 +5636,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32055,7 +32055,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5645,7 +5645,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32064,7 +32064,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5654,7 +5654,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32073,7 +32073,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5663,7 +5663,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32082,7 +32082,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5672,7 +5672,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32091,7 +32091,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5681,7 +5681,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32100,7 +32100,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5690,7 +5690,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32109,7 +32109,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5699,7 +5699,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32118,7 +32118,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5708,7 +5708,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32127,7 +32127,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5717,7 +5717,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32136,7 +32136,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5726,7 +5726,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32145,7 +32145,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5735,7 +5735,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32154,7 +32154,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5744,7 +5744,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32163,7 +32163,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5753,7 +5753,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32172,7 +32172,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5762,7 +5762,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32181,7 +32181,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5771,7 +5771,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32190,7 +32190,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5780,7 +5780,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32199,7 +32199,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5789,7 +5789,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32208,7 +32208,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5798,7 +5798,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32217,7 +32217,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5807,7 +5807,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32226,7 +32226,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5816,7 +5816,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32235,7 +32235,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5825,7 +5825,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32244,7 +32244,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5834,7 +5834,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32253,7 +32253,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5843,7 +5843,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32262,7 +32262,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5852,7 +5852,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32271,7 +32271,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5861,7 +5861,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32280,7 +32280,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5870,7 +5870,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32289,7 +32289,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5879,7 +5879,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32298,7 +32298,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5888,7 +5888,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32307,7 +32307,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5897,7 +5897,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32316,7 +32316,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5906,7 +5906,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32325,7 +32325,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5915,7 +5915,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32334,7 +32334,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5924,7 +5924,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32343,7 +32343,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5933,7 +5933,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32352,7 +32352,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5942,7 +5942,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32361,7 +32361,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5951,7 +5951,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32370,7 +32370,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5960,7 +5960,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32379,7 +32379,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5969,7 +5969,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32388,7 +32388,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5978,7 +5978,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32397,7 +32397,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5987,7 +5987,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32406,7 +32406,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -5996,7 +5996,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32415,7 +32415,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6005,7 +6005,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32424,7 +32424,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6014,7 +6014,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32433,7 +32433,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6023,7 +6023,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32442,7 +32442,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6032,7 +6032,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32451,7 +32451,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6041,7 +6041,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32460,7 +32460,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6050,7 +6050,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32469,7 +32469,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6059,7 +6059,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32478,7 +32478,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6068,7 +6068,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32487,7 +32487,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6077,7 +6077,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32496,7 +32496,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6086,7 +6086,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32505,7 +32505,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6095,7 +6095,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32514,7 +32514,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6104,7 +6104,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32523,7 +32523,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6113,7 +6113,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32532,7 +32532,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6122,7 +6122,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32541,7 +32541,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6131,7 +6131,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32550,7 +32550,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6140,7 +6140,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32559,7 +32559,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6149,7 +6149,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32568,7 +32568,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6158,7 +6158,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32577,7 +32577,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6167,7 +6167,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32586,7 +32586,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6176,7 +6176,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32595,7 +32595,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6185,7 +6185,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32604,7 +32604,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6194,7 +6194,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32613,7 +32613,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6203,7 +6203,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32622,7 +32622,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6212,7 +6212,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32631,7 +32631,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6221,7 +6221,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32640,7 +32640,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6230,7 +6230,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32649,7 +32649,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6239,7 +6239,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32658,7 +32658,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6248,7 +6248,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32667,7 +32667,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6257,7 +6257,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32676,7 +32676,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6266,7 +6266,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32685,7 +32685,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6275,7 +6275,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32694,7 +32694,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6284,7 +6284,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32703,7 +32703,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6293,7 +6293,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32712,7 +32712,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6302,7 +6302,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32721,7 +32721,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6311,7 +6311,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32730,7 +32730,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6320,7 +6320,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32739,7 +32739,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6329,7 +6329,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32748,7 +32748,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6338,7 +6338,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32757,7 +32757,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6347,7 +6347,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32766,7 +32766,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6356,7 +6356,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32775,7 +32775,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6365,7 +6365,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32784,7 +32784,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6374,7 +6374,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32793,7 +32793,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6383,7 +6383,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -32802,7 +32802,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6394,7 +6394,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_srvsvc.c
 +++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
-@@ -19585,7 +19585,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6403,7 +6403,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19594,7 +19594,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6412,7 +6412,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19603,7 +19603,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6421,7 +6421,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19612,7 +19612,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6430,7 +6430,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19621,7 +19621,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6439,7 +6439,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19630,7 +19630,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6448,7 +6448,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19639,7 +19639,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6457,7 +6457,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19648,7 +19648,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6466,7 +6466,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19657,7 +19657,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6475,7 +6475,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19666,7 +19666,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6484,7 +6484,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19675,7 +19675,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6493,7 +6493,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19684,7 +19684,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6502,7 +6502,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19693,7 +19693,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6511,7 +6511,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19702,7 +19702,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6520,7 +6520,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19711,7 +19711,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6529,7 +6529,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19720,7 +19720,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6538,7 +6538,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19729,7 +19729,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6547,7 +6547,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19738,7 +19738,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6556,7 +6556,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19747,7 +19747,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6565,7 +6565,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19756,7 +19756,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6574,7 +6574,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19765,7 +19765,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6583,7 +6583,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19774,7 +19774,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6592,7 +6592,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19783,7 +19783,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6601,7 +6601,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19792,7 +19792,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6610,7 +6610,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19801,7 +19801,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6619,7 +6619,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19810,7 +19810,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6628,7 +6628,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19819,7 +19819,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6637,7 +6637,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19828,7 +19828,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6646,7 +6646,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19837,7 +19837,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6655,7 +6655,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19846,7 +19846,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6664,7 +6664,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19855,7 +19855,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6673,7 +6673,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19864,7 +19864,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6682,7 +6682,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19873,7 +19873,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6691,7 +6691,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19882,7 +19882,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6700,7 +6700,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19891,7 +19891,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6709,7 +6709,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19900,7 +19900,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6718,7 +6718,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19909,7 +19909,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6727,7 +6727,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19918,7 +19918,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6736,7 +6736,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19927,7 +19927,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6745,7 +6745,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19936,7 +19936,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6754,7 +6754,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19945,7 +19945,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6763,7 +6763,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19954,7 +19954,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6772,7 +6772,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19963,7 +19963,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6781,7 +6781,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19972,7 +19972,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6790,7 +6790,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19981,7 +19981,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6799,7 +6799,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19990,7 +19990,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6808,7 +6808,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -19999,7 +19999,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6817,7 +6817,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -20008,7 +20008,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6826,7 +6826,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -20017,7 +20017,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6835,7 +6835,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -20026,7 +20026,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6844,7 +6844,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -20035,7 +20035,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6853,7 +6853,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -20044,7 +20044,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6862,7 +6862,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -20053,7 +20053,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6871,7 +6871,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -20062,7 +20062,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6882,7 +6882,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_svcctl.c
 +++ b/source3/librpc/gen_ndr/ndr_svcctl.c
-@@ -6935,7 +6935,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6891,7 +6891,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6944,7 +6944,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6900,7 +6900,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6953,7 +6953,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6909,7 +6909,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6962,7 +6962,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6918,7 +6918,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6971,7 +6971,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6927,7 +6927,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6980,7 +6980,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6936,7 +6936,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6989,7 +6989,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6945,7 +6945,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6998,7 +6998,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6954,7 +6954,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7007,7 +7007,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6963,7 +6963,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7016,7 +7016,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6972,7 +6972,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7025,7 +7025,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6981,7 +6981,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7034,7 +7034,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6990,7 +6990,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7043,7 +7043,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -6999,7 +6999,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7052,7 +7052,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7008,7 +7008,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7061,7 +7061,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7017,7 +7017,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7070,7 +7070,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7026,7 +7026,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7079,7 +7079,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7035,7 +7035,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7088,7 +7088,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7044,7 +7044,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7097,7 +7097,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7053,7 +7053,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7106,7 +7106,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7062,7 +7062,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7115,7 +7115,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7071,7 +7071,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7124,7 +7124,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7080,7 +7080,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7133,7 +7133,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7089,7 +7089,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7142,7 +7142,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7098,7 +7098,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7151,7 +7151,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7107,7 +7107,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7160,7 +7160,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7116,7 +7116,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7169,7 +7169,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7125,7 +7125,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7178,7 +7178,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7134,7 +7134,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7187,7 +7187,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7143,7 +7143,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7196,7 +7196,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7152,7 +7152,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7205,7 +7205,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7161,7 +7161,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7214,7 +7214,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7170,7 +7170,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7223,7 +7223,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7179,7 +7179,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7232,7 +7232,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7188,7 +7188,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7241,7 +7241,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7197,7 +7197,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7250,7 +7250,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7206,7 +7206,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7259,7 +7259,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7215,7 +7215,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7268,7 +7268,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7224,7 +7224,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7277,7 +7277,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7233,7 +7233,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7286,7 +7286,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7242,7 +7242,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7295,7 +7295,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7251,7 +7251,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7304,7 +7304,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7260,7 +7260,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7313,7 +7313,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7269,7 +7269,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7322,7 +7322,7 @@ static const struct ndr_interface_call s
+@@ -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,
@@ -7291,7 +7291,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_unixinfo.c
 +++ b/source3/librpc/gen_ndr/ndr_unixinfo.c
-@@ -460,7 +460,7 @@ static const struct ndr_interface_call u
+@@ -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,
@@ -7300,7 +7300,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -469,7 +469,7 @@ static const struct ndr_interface_call u
+@@ -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,
@@ -7309,7 +7309,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -478,7 +478,7 @@ static const struct ndr_interface_call u
+@@ -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,
@@ -7318,7 +7318,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -487,7 +487,7 @@ static const struct ndr_interface_call u
+@@ -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,
@@ -7327,7 +7327,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -496,7 +496,7 @@ static const struct ndr_interface_call u
+@@ -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,
@@ -7367,7 +7367,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_wbint.c
 +++ b/source3/librpc/gen_ndr/ndr_wbint.c
-@@ -2620,7 +2620,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7376,7 +7376,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2629,7 +2629,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7385,7 +7385,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2638,7 +2638,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7394,7 +7394,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2647,7 +2647,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7403,7 +7403,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2656,7 +2656,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7412,7 +7412,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2665,7 +2665,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7421,7 +7421,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2674,7 +2674,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7430,7 +7430,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2683,7 +2683,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7439,7 +7439,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2692,7 +2692,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7448,7 +7448,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2701,7 +2701,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7457,7 +7457,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2710,7 +2710,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7466,7 +7466,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2719,7 +2719,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7475,7 +7475,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2728,7 +2728,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7484,7 +7484,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2737,7 +2737,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7493,7 +7493,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2746,7 +2746,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7502,7 +7502,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2755,7 +2755,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7511,7 +7511,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2764,7 +2764,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7520,7 +7520,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2773,7 +2773,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7529,7 +7529,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2782,7 +2782,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7538,7 +7538,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2791,7 +2791,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7547,7 +7547,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2800,7 +2800,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7556,7 +7556,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2809,7 +2809,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7565,7 +7565,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -2818,7 +2818,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7576,7 +7576,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_winreg.c
 +++ b/source3/librpc/gen_ndr/ndr_winreg.c
-@@ -4794,7 +4794,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7585,7 +7585,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4803,7 +4803,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7594,7 +7594,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4812,7 +4812,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7603,7 +7603,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4821,7 +4821,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7612,7 +7612,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4830,7 +4830,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7621,7 +7621,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4839,7 +4839,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7630,7 +7630,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4848,7 +4848,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7639,7 +7639,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4857,7 +4857,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7648,7 +7648,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4866,7 +4866,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7657,7 +7657,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4875,7 +4875,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7666,7 +7666,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4884,7 +4884,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7675,7 +7675,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4893,7 +4893,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7684,7 +7684,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4902,7 +4902,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7693,7 +7693,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4911,7 +4911,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7702,7 +7702,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4920,7 +4920,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7711,7 +7711,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4929,7 +4929,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7720,7 +7720,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4938,7 +4938,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7729,7 +7729,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4947,7 +4947,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7738,7 +7738,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4956,7 +4956,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7747,7 +7747,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4965,7 +4965,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7756,7 +7756,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4974,7 +4974,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7765,7 +7765,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4983,7 +4983,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7774,7 +7774,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4992,7 +4992,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7783,7 +7783,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5001,7 +5001,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7792,7 +7792,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5010,7 +5010,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7801,7 +7801,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5019,7 +5019,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7810,7 +7810,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5028,7 +5028,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7819,7 +7819,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5037,7 +5037,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7828,7 +7828,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5046,7 +5046,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7837,7 +7837,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5055,7 +5055,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7846,7 +7846,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5064,7 +5064,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7855,7 +7855,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5073,7 +5073,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7864,7 +7864,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5082,7 +5082,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7873,7 +7873,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5091,7 +5091,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7882,7 +7882,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5100,7 +5100,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7891,7 +7891,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5109,7 +5109,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7902,7 +7902,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_wkssvc.c
 +++ b/source3/librpc/gen_ndr/ndr_wkssvc.c
-@@ -10585,7 +10585,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7911,7 +7911,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10594,7 +10594,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7920,7 +7920,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10603,7 +10603,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7929,7 +7929,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10612,7 +10612,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7938,7 +7938,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10621,7 +10621,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7947,7 +7947,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10630,7 +10630,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7956,7 +7956,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10639,7 +10639,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7965,7 +7965,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10648,7 +10648,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7974,7 +7974,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10657,7 +10657,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7983,7 +7983,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10666,7 +10666,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -7992,7 +7992,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10675,7 +10675,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8001,7 +8001,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10684,7 +10684,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8010,7 +8010,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10693,7 +10693,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8019,7 +8019,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10702,7 +10702,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8028,7 +8028,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10711,7 +10711,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8037,7 +8037,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10720,7 +10720,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8046,7 +8046,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10729,7 +10729,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8055,7 +8055,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10738,7 +10738,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8064,7 +8064,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10747,7 +10747,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8073,7 +8073,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10756,7 +10756,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8082,7 +8082,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10765,7 +10765,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8091,7 +8091,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10774,7 +10774,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8100,7 +8100,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10783,7 +10783,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8109,7 +8109,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10792,7 +10792,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8118,7 +8118,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10801,7 +10801,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8127,7 +8127,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10810,7 +10810,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8136,7 +8136,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10819,7 +10819,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8145,7 +8145,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10828,7 +10828,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8154,7 +8154,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10837,7 +10837,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8163,7 +8163,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10846,7 +10846,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8172,7 +8172,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -10855,7 +10855,7 @@ static const struct ndr_interface_call w
+@@ -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,
@@ -8183,7 +8183,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_wmi.c
 +++ b/source3/librpc/gen_ndr/ndr_wmi.c
-@@ -131,7 +131,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8192,7 +8192,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3696,7 +3696,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8201,7 +8201,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3705,7 +3705,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8210,7 +8210,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3714,7 +3714,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8219,7 +8219,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3723,7 +3723,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8228,7 +8228,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3732,7 +3732,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8237,7 +8237,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3741,7 +3741,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8246,7 +8246,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3750,7 +3750,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8255,7 +8255,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3759,7 +3759,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8264,7 +8264,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3768,7 +3768,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8273,7 +8273,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3777,7 +3777,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8282,7 +8282,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3786,7 +3786,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8291,7 +8291,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3795,7 +3795,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8300,7 +8300,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3804,7 +3804,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8309,7 +8309,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3813,7 +3813,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8318,7 +8318,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3822,7 +3822,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8327,7 +8327,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3831,7 +3831,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8336,7 +8336,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3840,7 +3840,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8345,7 +8345,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3849,7 +3849,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8354,7 +8354,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3858,7 +3858,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8363,7 +8363,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3867,7 +3867,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8372,7 +8372,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3876,7 +3876,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8381,7 +8381,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3885,7 +3885,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8390,7 +8390,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -3894,7 +3894,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8399,7 +8399,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4422,7 +4422,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8408,7 +8408,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4431,7 +4431,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8417,7 +8417,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4440,7 +4440,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8426,7 +8426,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4449,7 +4449,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8435,7 +8435,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -4458,7 +4458,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8444,7 +8444,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5131,7 +5131,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8453,7 +8453,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5140,7 +5140,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8462,7 +8462,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5149,7 +5149,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8471,7 +8471,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5158,7 +5158,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8480,7 +8480,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5167,7 +5167,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8489,7 +8489,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5176,7 +5176,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8498,7 +8498,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5185,7 +5185,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8507,7 +8507,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5194,7 +5194,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8516,7 +8516,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5203,7 +5203,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8525,7 +8525,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5919,7 +5919,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8534,7 +8534,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5928,7 +5928,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8543,7 +8543,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5937,7 +5937,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8552,7 +8552,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -5946,7 +5946,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8561,7 +8561,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6179,7 +6179,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8570,7 +8570,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6433,7 +6433,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8579,7 +8579,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6442,7 +6442,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8588,7 +8588,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6874,7 +6874,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8597,7 +8597,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6883,7 +6883,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8606,7 +8606,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6892,7 +6892,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8615,7 +8615,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -6901,7 +6901,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8624,7 +8624,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7163,7 +7163,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8633,7 +8633,7 @@
                { 0, NULL },
                { 0, NULL },
        },
-@@ -7172,7 +7172,7 @@ static const struct ndr_interface_call I
+@@ -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,
@@ -8808,7 +8808,7 @@
        },
 --- a/source3/librpc/gen_ndr/ndr_xattr.c
 +++ b/source3/librpc/gen_ndr/ndr_xattr.c
-@@ -1091,7 +1091,7 @@ static const struct ndr_interface_call x
+@@ -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,