Add new script for building IDL files in librpc/idl, generating both

Samba 3 and Samba 4 output.

106 files changed, 274 insertions, 125 deletions

diff --git a/.gitignore b/.gitignore
index 4985738891..69dabe8851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,28 +74,28 @@ source3/include/version.h
 source3/lib/netapi/examples/Makefile
 source3/lib/netapi/tests/Makefile
 source3/library-versions
-source3/librpc/gen_ndr/cli_krb5pac.*
+librpc/gen_ndr/cli_krb5pac.*
 source3/librpc/gen_ndr/cli_libnetapi.c
 source3/librpc/gen_ndr/cli_libnetapi.h
 source3/librpc/gen_ndr/cli_messaging.*
-source3/librpc/gen_ndr/cli_misc.*
-source3/librpc/gen_ndr/cli_nbt.c
-source3/librpc/gen_ndr/cli_nbt.h
+librpc/gen_ndr/cli_misc.*
+librpc/gen_ndr/cli_nbt.c
+librpc/gen_ndr/cli_nbt.h
 source3/librpc/gen_ndr/cli_notify.*
-source3/librpc/gen_ndr/cli_security.*
-source3/librpc/gen_ndr/cli_xattr.*
-source3/librpc/gen_ndr/srv_drsuapi.c
-source3/librpc/gen_ndr/srv_drsuapi.h
-source3/librpc/gen_ndr/srv_krb5pac.*
+librpc/gen_ndr/cli_security.*
+librpc/gen_ndr/cli_xattr.*
+librpc/gen_ndr/srv_drsuapi.c
+librpc/gen_ndr/srv_drsuapi.h
+librpc/gen_ndr/srv_krb5pac.*
 source3/librpc/gen_ndr/srv_libnetapi.c
 source3/librpc/gen_ndr/srv_libnetapi.h
 source3/librpc/gen_ndr/srv_messaging.*
-source3/librpc/gen_ndr/srv_misc.*
-source3/librpc/gen_ndr/srv_nbt.c
-source3/librpc/gen_ndr/srv_nbt.h
+librpc/gen_ndr/srv_misc.*
+librpc/gen_ndr/srv_nbt.c
+librpc/gen_ndr/srv_nbt.h
 source3/librpc/gen_ndr/srv_notify.*
-source3/librpc/gen_ndr/srv_security.*
-source3/librpc/gen_ndr/srv_xattr.*
+librpc/gen_ndr/srv_security.*
+librpc/gen_ndr/srv_xattr.*
 source3/Makefile
 source3/nsswitch/*.so
 source3/pkgconfig/*.pc
@@ -309,8 +309,8 @@ tags
 packaging/RHEL-CTDB/samba.spec
 packaging/RHEL/samba.spec
 packaging/RHEL/makerpms.sh
-source3/librpc/gen_ndr/cli_drsblobs.c
-source3/librpc/gen_ndr/cli_drsblobs.h
-source3/librpc/gen_ndr/srv_drsblobs.c
-source3/librpc/gen_ndr/srv_drsblobs.h
+librpc/gen_ndr/cli_drsblobs.c
+librpc/gen_ndr/cli_drsblobs.h
+librpc/gen_ndr/srv_drsblobs.c
+librpc/gen_ndr/srv_drsblobs.h
 source3/setup
diff --git a/librpc/gen_ndr/cli_dfs.c b/librpc/gen_ndr/cli_dfs.c
index 81ec14694a..d2c9b4f03f 100644
--- a/librpc/gen_ndr/cli_dfs.c
+++ b/librpc/gen_ndr/cli_dfs.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_dfs.h"
+#include "../librpc/gen_ndr/cli_dfs.h"
 
 NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_dfs.h b/librpc/gen_ndr/cli_dfs.h
index 0c862099bf..9e40a5695b 100644
--- a/librpc/gen_ndr/cli_dfs.h
+++ b/librpc/gen_ndr/cli_dfs.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_dfs.h"
+#include "../librpc/gen_ndr/ndr_dfs.h"
 #ifndef __CLI_NETDFS__
 #define __CLI_NETDFS__
 NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_drsuapi.c b/librpc/gen_ndr/cli_drsuapi.c
index 57d7a25d9c..4063a67c43 100644
--- a/librpc/gen_ndr/cli_drsuapi.c
+++ b/librpc/gen_ndr/cli_drsuapi.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_drsuapi.h"
+#include "../librpc/gen_ndr/cli_drsuapi.h"
 
 NTSTATUS rpccli_drsuapi_DsBind(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_drsuapi.h b/librpc/gen_ndr/cli_drsuapi.h
index ab7375f4ca..65bc26a60d 100644
--- a/librpc/gen_ndr/cli_drsuapi.h
+++ b/librpc/gen_ndr/cli_drsuapi.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "../librpc/gen_ndr/ndr_drsuapi.h"
 #ifndef __CLI_DRSUAPI__
 #define __CLI_DRSUAPI__
 NTSTATUS rpccli_drsuapi_DsBind(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_dssetup.c b/librpc/gen_ndr/cli_dssetup.c
index 5526f8d59b..39abe34d4d 100644
--- a/librpc/gen_ndr/cli_dssetup.c
+++ b/librpc/gen_ndr/cli_dssetup.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_dssetup.h"
+#include "../librpc/gen_ndr/cli_dssetup.h"
 
 NTSTATUS rpccli_dssetup_DsRoleGetPrimaryDomainInformation(struct rpc_pipe_client *cli,
 							  TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_dssetup.h b/librpc/gen_ndr/cli_dssetup.h
index e2dca43360..e6847c3e06 100644
--- a/librpc/gen_ndr/cli_dssetup.h
+++ b/librpc/gen_ndr/cli_dssetup.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_dssetup.h"
+#include "../librpc/gen_ndr/ndr_dssetup.h"
 #ifndef __CLI_DSSETUP__
 #define __CLI_DSSETUP__
 NTSTATUS rpccli_dssetup_DsRoleGetPrimaryDomainInformation(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index a775825f5f..f59a191883 100644
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_echo.h"
+#include "../librpc/gen_ndr/cli_echo.h"
 
 NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_echo.h b/librpc/gen_ndr/cli_echo.h
index 9da13e97f6..46dd830a4e 100644
--- a/librpc/gen_ndr/cli_echo.h
+++ b/librpc/gen_ndr/cli_echo.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_echo.h"
+#include "../librpc/gen_ndr/ndr_echo.h"
 #ifndef __CLI_RPCECHO__
 #define __CLI_RPCECHO__
 NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 19673ab659..6ef5f9aae5 100644
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_epmapper.h"
+#include "../librpc/gen_ndr/cli_epmapper.h"
 
 NTSTATUS rpccli_epm_Insert(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_epmapper.h b/librpc/gen_ndr/cli_epmapper.h
index 44884fad7e..cc1d3a9267 100644
--- a/librpc/gen_ndr/cli_epmapper.h
+++ b/librpc/gen_ndr/cli_epmapper.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "../librpc/gen_ndr/ndr_epmapper.h"
 #ifndef __CLI_EPMAPPER__
 #define __CLI_EPMAPPER__
 NTSTATUS rpccli_epm_Insert(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index 02d8fb2e65..cf441413a7 100644
--- a/librpc/gen_ndr/cli_eventlog.c
+++ b/librpc/gen_ndr/cli_eventlog.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_eventlog.h"
+#include "../librpc/gen_ndr/cli_eventlog.h"
 
 NTSTATUS rpccli_eventlog_ClearEventLogW(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_eventlog.h b/librpc/gen_ndr/cli_eventlog.h
index 0594a06f59..a1360cbc16 100644
--- a/librpc/gen_ndr/cli_eventlog.h
+++ b/librpc/gen_ndr/cli_eventlog.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_eventlog.h"
+#include "../librpc/gen_ndr/ndr_eventlog.h"
 #ifndef __CLI_EVENTLOG__
 #define __CLI_EVENTLOG__
 NTSTATUS rpccli_eventlog_ClearEventLogW(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_initshutdown.c b/librpc/gen_ndr/cli_initshutdown.c
index bc8ca5b5f1..40d7bdf40e 100644
--- a/librpc/gen_ndr/cli_initshutdown.c
+++ b/librpc/gen_ndr/cli_initshutdown.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_initshutdown.h"
+#include "../librpc/gen_ndr/cli_initshutdown.h"
 
 NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_initshutdown.h b/librpc/gen_ndr/cli_initshutdown.h
index e2eb9daabe..9a12c5e6fb 100644
--- a/librpc/gen_ndr/cli_initshutdown.h
+++ b/librpc/gen_ndr/cli_initshutdown.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_initshutdown.h"
 #ifndef __CLI_INITSHUTDOWN__
 #define __CLI_INITSHUTDOWN__
 NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_lsa.c b/librpc/gen_ndr/cli_lsa.c
index e7775b1bfe..306206fcaf 100644
--- a/librpc/gen_ndr/cli_lsa.c
+++ b/librpc/gen_ndr/cli_lsa.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 NTSTATUS rpccli_lsa_Close(struct rpc_pipe_client *cli,
 			  TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_lsa.h b/librpc/gen_ndr/cli_lsa.h
index 554182c6db..8dbd7330b4 100644
--- a/librpc/gen_ndr/cli_lsa.h
+++ b/librpc/gen_ndr/cli_lsa.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 #ifndef __CLI_LSARPC__
 #define __CLI_LSARPC__
 NTSTATUS rpccli_lsa_Close(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_netlogon.c b/librpc/gen_ndr/cli_netlogon.c
index 1ce4e67c56..39eaf7bfe9 100644
--- a/librpc/gen_ndr/cli_netlogon.c
+++ b/librpc/gen_ndr/cli_netlogon.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_netlogon.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
 
 NTSTATUS rpccli_netr_LogonUasLogon(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_netlogon.h b/librpc/gen_ndr/cli_netlogon.h
index 3fbc00e9da..873f519b70 100644
--- a/librpc/gen_ndr/cli_netlogon.h
+++ b/librpc/gen_ndr/cli_netlogon.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 #ifndef __CLI_NETLOGON__
 #define __CLI_NETLOGON__
 NTSTATUS rpccli_netr_LogonUasLogon(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_ntsvcs.c b/librpc/gen_ndr/cli_ntsvcs.c
index 0f97970e0b..0736a027f9 100644
--- a/librpc/gen_ndr/cli_ntsvcs.c
+++ b/librpc/gen_ndr/cli_ntsvcs.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_ntsvcs.h"
+#include "../librpc/gen_ndr/cli_ntsvcs.h"
 
 NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_ntsvcs.h b/librpc/gen_ndr/cli_ntsvcs.h
index fc4a9f4a71..c97ced8bf9 100644
--- a/librpc/gen_ndr/cli_ntsvcs.h
+++ b/librpc/gen_ndr/cli_ntsvcs.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_ntsvcs.h"
+#include "../librpc/gen_ndr/ndr_ntsvcs.h"
 #ifndef __CLI_NTSVCS__
 #define __CLI_NTSVCS__
 NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_samr.c b/librpc/gen_ndr/cli_samr.c
index 7edb790286..9099d0b35d 100644
--- a/librpc/gen_ndr/cli_samr.c
+++ b/librpc/gen_ndr/cli_samr.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 NTSTATUS rpccli_samr_Connect(struct rpc_pipe_client *cli,
 			     TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_samr.h b/librpc/gen_ndr/cli_samr.h
index b57d63334e..7bfe71b280 100644
--- a/librpc/gen_ndr/cli_samr.h
+++ b/librpc/gen_ndr/cli_samr.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/ndr_samr.h"
 #ifndef __CLI_SAMR__
 #define __CLI_SAMR__
 NTSTATUS rpccli_samr_Connect(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_srvsvc.c b/librpc/gen_ndr/cli_srvsvc.c
index eb81652a1d..1428d3d888 100644
--- a/librpc/gen_ndr/cli_srvsvc.c
+++ b/librpc/gen_ndr/cli_srvsvc.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_srvsvc.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 NTSTATUS rpccli_srvsvc_NetCharDevEnum(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_srvsvc.h b/librpc/gen_ndr/cli_srvsvc.h
index 44b50e7d19..f57bf5d378 100644
--- a/librpc/gen_ndr/cli_srvsvc.h
+++ b/librpc/gen_ndr/cli_srvsvc.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_srvsvc.h"
 #ifndef __CLI_SRVSVC__
 #define __CLI_SRVSVC__
 NTSTATUS rpccli_srvsvc_NetCharDevEnum(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_svcctl.c b/librpc/gen_ndr/cli_svcctl.c
index 9f11a40d7e..3288e4a1ec 100644
--- a/librpc/gen_ndr/cli_svcctl.c
+++ b/librpc/gen_ndr/cli_svcctl.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_svcctl.h"
+#include "../librpc/gen_ndr/cli_svcctl.h"
 
 NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_svcctl.h b/librpc/gen_ndr/cli_svcctl.h
index 78c9bf40d8..fbd15b32a5 100644
--- a/librpc/gen_ndr/cli_svcctl.h
+++ b/librpc/gen_ndr/cli_svcctl.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_svcctl.h"
+#include "../librpc/gen_ndr/ndr_svcctl.h"
 #ifndef __CLI_SVCCTL__
 #define __CLI_SVCCTL__
 NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_winreg.c b/librpc/gen_ndr/cli_winreg.c
index 17b7281c72..58eff22966 100644
--- a/librpc/gen_ndr/cli_winreg.c
+++ b/librpc/gen_ndr/cli_winreg.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_winreg.h"
+#include "../librpc/gen_ndr/cli_winreg.h"
 
 NTSTATUS rpccli_winreg_OpenHKCR(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_winreg.h b/librpc/gen_ndr/cli_winreg.h
index fb27bce9d2..a5a5fa2e48 100644
--- a/librpc/gen_ndr/cli_winreg.h
+++ b/librpc/gen_ndr/cli_winreg.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_winreg.h"
+#include "../librpc/gen_ndr/ndr_winreg.h"
 #ifndef __CLI_WINREG__
 #define __CLI_WINREG__
 NTSTATUS rpccli_winreg_OpenHKCR(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/cli_wkssvc.c b/librpc/gen_ndr/cli_wkssvc.c
index b82e95311f..628f7f973f 100644
--- a/librpc/gen_ndr/cli_wkssvc.c
+++ b/librpc/gen_ndr/cli_wkssvc.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/cli_wkssvc.h"
+#include "../librpc/gen_ndr/cli_wkssvc.h"
 
 NTSTATUS rpccli_wkssvc_NetWkstaGetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/cli_wkssvc.h b/librpc/gen_ndr/cli_wkssvc.h
index 0d360abfeb..2427099f0e 100644
--- a/librpc/gen_ndr/cli_wkssvc.h
+++ b/librpc/gen_ndr/cli_wkssvc.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_wkssvc.h"
+#include "../librpc/gen_ndr/ndr_wkssvc.h"
 #ifndef __CLI_WKSSVC__
 #define __CLI_WKSSVC__
 NTSTATUS rpccli_wkssvc_NetWkstaGetInfo(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/ndr_dfs.c b/librpc/gen_ndr/ndr_dfs.c
index 75a0d4b755..6e36cb31ec 100644
--- a/librpc/gen_ndr/ndr_dfs.c
+++ b/librpc/gen_ndr/ndr_dfs.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_dfs.h"
+#include "../librpc/gen_ndr/ndr_dfs.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 static enum ndr_err_code ndr_push_dfs_ManagerVersion(struct ndr_push *ndr, int ndr_flags, enum dfs_ManagerVersion r)
diff --git a/librpc/gen_ndr/ndr_dfs.h b/librpc/gen_ndr/ndr_dfs.h
index a7c66f9693..fd0ebf58de 100644
--- a/librpc/gen_ndr/ndr_dfs.h
+++ b/librpc/gen_ndr/ndr_dfs.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/dfs.h"
+#include "../librpc/gen_ndr/dfs.h"
 
 #ifndef _HEADER_NDR_netdfs
 #define _HEADER_NDR_netdfs
diff --git a/librpc/gen_ndr/ndr_drsblobs.c b/librpc/gen_ndr/ndr_drsblobs.c
index d965e40bd2..c868c39ecd 100644
--- a/librpc/gen_ndr/ndr_drsblobs.c
+++ b/librpc/gen_ndr/ndr_drsblobs.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "../librpc/gen_ndr/ndr_drsblobs.h"
 
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_misc.h"
diff --git a/librpc/gen_ndr/ndr_drsblobs.h b/librpc/gen_ndr/ndr_drsblobs.h
index 8a5298874a..09c4b7ff61 100644
--- a/librpc/gen_ndr/ndr_drsblobs.h
+++ b/librpc/gen_ndr/ndr_drsblobs.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/drsblobs.h"
+#include "../librpc/gen_ndr/drsblobs.h"
 
 #ifndef _HEADER_NDR_drsblobs
 #define _HEADER_NDR_drsblobs
diff --git a/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index c2a4aee180..3ef5b8024d 100644
--- a/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "../librpc/gen_ndr/ndr_drsuapi.h"
 
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
diff --git a/librpc/gen_ndr/ndr_drsuapi.h b/librpc/gen_ndr/ndr_drsuapi.h
index 4b5ead467f..168854b337 100644
--- a/librpc/gen_ndr/ndr_drsuapi.h
+++ b/librpc/gen_ndr/ndr_drsuapi.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/drsuapi.h"
+#include "../librpc/gen_ndr/drsuapi.h"
 
 #ifndef _HEADER_NDR_drsuapi
 #define _HEADER_NDR_drsuapi
diff --git a/librpc/gen_ndr/ndr_dssetup.c b/librpc/gen_ndr/ndr_dssetup.c
index 0c02784db8..7ce80ddab2 100644
--- a/librpc/gen_ndr/ndr_dssetup.c
+++ b/librpc/gen_ndr/ndr_dssetup.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_dssetup.h"
+#include "../librpc/gen_ndr/ndr_dssetup.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 static enum ndr_err_code ndr_push_dssetup_DsRole(struct ndr_push *ndr, int ndr_flags, enum dssetup_DsRole r)
diff --git a/librpc/gen_ndr/ndr_dssetup.h b/librpc/gen_ndr/ndr_dssetup.h
index 103ad116a3..f3ebe856b7 100644
--- a/librpc/gen_ndr/ndr_dssetup.h
+++ b/librpc/gen_ndr/ndr_dssetup.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/dssetup.h"
+#include "../librpc/gen_ndr/dssetup.h"
 
 #ifndef _HEADER_NDR_dssetup
 #define _HEADER_NDR_dssetup
diff --git a/librpc/gen_ndr/ndr_echo.c b/librpc/gen_ndr/ndr_echo.c
index 99556e1bff..e555c2f7f9 100644
--- a/librpc/gen_ndr/ndr_echo.c
+++ b/librpc/gen_ndr/ndr_echo.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_echo.h"
+#include "../librpc/gen_ndr/ndr_echo.h"
 
 _PUBLIC_ enum ndr_err_code ndr_push_echo_info1(struct ndr_push *ndr, int ndr_flags, const struct echo_info1 *r)
 {
diff --git a/librpc/gen_ndr/ndr_echo.h b/librpc/gen_ndr/ndr_echo.h
index c1c7716573..0668649755 100644
--- a/librpc/gen_ndr/ndr_echo.h
+++ b/librpc/gen_ndr/ndr_echo.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/echo.h"
+#include "../librpc/gen_ndr/echo.h"
 
 #ifndef _HEADER_NDR_rpcecho
 #define _HEADER_NDR_rpcecho
diff --git a/librpc/gen_ndr/ndr_epmapper.c b/librpc/gen_ndr/ndr_epmapper.c
index 0f1005dda7..e06bf7f3aa 100644
--- a/librpc/gen_ndr/ndr_epmapper.c
+++ b/librpc/gen_ndr/ndr_epmapper.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "../librpc/gen_ndr/ndr_epmapper.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 static enum ndr_err_code ndr_push_epm_protocol(struct ndr_push *ndr, int ndr_flags, enum epm_protocol r)
diff --git a/librpc/gen_ndr/ndr_epmapper.h b/librpc/gen_ndr/ndr_epmapper.h
index 0fac75e0af..797c68d93e 100644
--- a/librpc/gen_ndr/ndr_epmapper.h
+++ b/librpc/gen_ndr/ndr_epmapper.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/epmapper.h"
+#include "../librpc/gen_ndr/epmapper.h"
 
 #ifndef _HEADER_NDR_epmapper
 #define _HEADER_NDR_epmapper
diff --git a/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eventlog.c
index 12fa9fcec4..fdef52f6af 100644
--- a/librpc/gen_ndr/ndr_eventlog.c
+++ b/librpc/gen_ndr/ndr_eventlog.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_eventlog.h"
+#include "../librpc/gen_ndr/ndr_eventlog.h"
 
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/librpc/gen_ndr/ndr_eventlog.h b/librpc/gen_ndr/ndr_eventlog.h
index 6002f35a7d..c705290aef 100644
--- a/librpc/gen_ndr/ndr_eventlog.h
+++ b/librpc/gen_ndr/ndr_eventlog.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/eventlog.h"
+#include "../librpc/gen_ndr/eventlog.h"
 
 #ifndef _HEADER_NDR_eventlog
 #define _HEADER_NDR_eventlog
diff --git a/librpc/gen_ndr/ndr_initshutdown.c b/librpc/gen_ndr/ndr_initshutdown.c
index 62a19af3a2..718f79cf6a 100644
--- a/librpc/gen_ndr/ndr_initshutdown.c
+++ b/librpc/gen_ndr/ndr_initshutdown.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_initshutdown.h"
 
 #include "librpc/gen_ndr/ndr_lsa.h"
 static enum ndr_err_code ndr_push_initshutdown_Init(struct ndr_push *ndr, int flags, const struct initshutdown_Init *r)
diff --git a/librpc/gen_ndr/ndr_initshutdown.h b/librpc/gen_ndr/ndr_initshutdown.h
index 2cb5a530b0..c3f2f70280 100644
--- a/librpc/gen_ndr/ndr_initshutdown.h
+++ b/librpc/gen_ndr/ndr_initshutdown.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/initshutdown.h"
+#include "../librpc/gen_ndr/initshutdown.h"
 
 #ifndef _HEADER_NDR_initshutdown
 #define _HEADER_NDR_initshutdown
diff --git a/librpc/gen_ndr/ndr_krb5pac.c b/librpc/gen_ndr/ndr_krb5pac.c
index 125fb7eb77..06abe91fc3 100644
--- a/librpc/gen_ndr/ndr_krb5pac.c
+++ b/librpc/gen_ndr/ndr_krb5pac.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "../librpc/gen_ndr/ndr_krb5pac.h"
 
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
diff --git a/librpc/gen_ndr/ndr_krb5pac.h b/librpc/gen_ndr/ndr_krb5pac.h
index bf09e3fad5..8ab6b6a0fa 100644
--- a/librpc/gen_ndr/ndr_krb5pac.h
+++ b/librpc/gen_ndr/ndr_krb5pac.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/krb5pac.h"
+#include "../librpc/gen_ndr/krb5pac.h"
 
 #ifndef _HEADER_NDR_krb5pac
 #define _HEADER_NDR_krb5pac
diff --git a/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c
index 926903865e..9169adfe81 100644
--- a/librpc/gen_ndr/ndr_lsa.c
+++ b/librpc/gen_ndr/ndr_lsa.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/librpc/gen_ndr/ndr_lsa.h b/librpc/gen_ndr/ndr_lsa.h
index 2f623c2ba9..90817b5436 100644
--- a/librpc/gen_ndr/ndr_lsa.h
+++ b/librpc/gen_ndr/ndr_lsa.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/lsa.h"
+#include "../librpc/gen_ndr/lsa.h"
 
 #ifndef _HEADER_NDR_lsarpc
 #define _HEADER_NDR_lsarpc
diff --git a/librpc/gen_ndr/ndr_misc.c b/librpc/gen_ndr/ndr_misc.c
index 971cbdac24..dbe5cdd60e 100644
--- a/librpc/gen_ndr/ndr_misc.c
+++ b/librpc/gen_ndr/ndr_misc.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_misc.h"
+#include "../librpc/gen_ndr/ndr_misc.h"
 
 _PUBLIC_ enum ndr_err_code ndr_push_GUID(struct ndr_push *ndr, int ndr_flags, const struct GUID *r)
 {
diff --git a/librpc/gen_ndr/ndr_misc.h b/librpc/gen_ndr/ndr_misc.h
index b907af0605..101aa8ad84 100644
--- a/librpc/gen_ndr/ndr_misc.h
+++ b/librpc/gen_ndr/ndr_misc.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/misc.h"
+#include "../librpc/gen_ndr/misc.h"
 
 #ifndef _HEADER_NDR_misc
 #define _HEADER_NDR_misc
diff --git a/librpc/gen_ndr/ndr_named_pipe_auth.c b/librpc/gen_ndr/ndr_named_pipe_auth.c
index 69412bf427..2377964570 100644
--- a/librpc/gen_ndr/ndr_named_pipe_auth.c
+++ b/librpc/gen_ndr/ndr_named_pipe_auth.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_named_pipe_auth.h"
+#include "../librpc/gen_ndr/ndr_named_pipe_auth.h"
 
 #include "librpc/gen_ndr/ndr_netlogon.h"
 static enum ndr_err_code ndr_push_named_pipe_auth_req_info(struct ndr_push *ndr, int ndr_flags, const union named_pipe_auth_req_info *r)
diff --git a/librpc/gen_ndr/ndr_named_pipe_auth.h b/librpc/gen_ndr/ndr_named_pipe_auth.h
index fbef9d5f1c..2a4f689ab9 100644
--- a/librpc/gen_ndr/ndr_named_pipe_auth.h
+++ b/librpc/gen_ndr/ndr_named_pipe_auth.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/named_pipe_auth.h"
+#include "../librpc/gen_ndr/named_pipe_auth.h"
 
 #ifndef _HEADER_NDR_named_pipe_auth
 #define _HEADER_NDR_named_pipe_auth
diff --git a/librpc/gen_ndr/ndr_nbt.c b/librpc/gen_ndr/ndr_nbt.c
index c02b539da5..435bebe091 100644
--- a/librpc/gen_ndr/ndr_nbt.c
+++ b/librpc/gen_ndr/ndr_nbt.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "../librpc/gen_ndr/ndr_nbt.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/librpc/gen_ndr/ndr_nbt.h b/librpc/gen_ndr/ndr_nbt.h
index 1a0ca0c302..c7eb8f78a0 100644
--- a/librpc/gen_ndr/ndr_nbt.h
+++ b/librpc/gen_ndr/ndr_nbt.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/nbt.h"
+#include "../librpc/gen_ndr/nbt.h"
 
 #ifndef _HEADER_NDR_nbt
 #define _HEADER_NDR_nbt
diff --git a/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c
index 81f8ddcab9..42bd09cedc 100644
--- a/librpc/gen_ndr/ndr_netlogon.c
+++ b/librpc/gen_ndr/ndr_netlogon.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
@@ -6267,7 +6267,6 @@ static enum ndr_err_code ndr_push_netr_ChangeLogObject(struct ndr_push *ndr, int
 		int level = ndr_push_get_switch_value(ndr, r);
 		switch (level) {
 			case NETR_CHANGELOG_SID_INCLUDED:
-				NDR_CHECK(ndr_push_dom_sid(ndr, NDR_BUFFERS, &r->object_sid));
 			break;
 
 			case NETR_CHANGELOG_NAME_INCLUDED:
@@ -6308,7 +6307,6 @@ static enum ndr_err_code ndr_pull_netr_ChangeLogObject(struct ndr_pull *ndr, int
 	if (ndr_flags & NDR_BUFFERS) {
 		switch (level) {
 			case NETR_CHANGELOG_SID_INCLUDED:
-				NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_BUFFERS, &r->object_sid));
 			break;
 
 			case NETR_CHANGELOG_NAME_INCLUDED:
diff --git a/librpc/gen_ndr/ndr_netlogon.h b/librpc/gen_ndr/ndr_netlogon.h
index 5858906c1c..aab691e504 100644
--- a/librpc/gen_ndr/ndr_netlogon.h
+++ b/librpc/gen_ndr/ndr_netlogon.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/netlogon.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 #ifndef _HEADER_NDR_netlogon
 #define _HEADER_NDR_netlogon
diff --git a/librpc/gen_ndr/ndr_ntsvcs.c b/librpc/gen_ndr/ndr_ntsvcs.c
index ced6fb7767..ef2ecc1d7d 100644
--- a/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/librpc/gen_ndr/ndr_ntsvcs.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_ntsvcs.h"
+#include "../librpc/gen_ndr/ndr_ntsvcs.h"
 
 #include "librpc/gen_ndr/ndr_winreg.h"
 static enum ndr_err_code ndr_push_PNP_HwProfInfo(struct ndr_push *ndr, int ndr_flags, const struct PNP_HwProfInfo *r)
diff --git a/librpc/gen_ndr/ndr_ntsvcs.h b/librpc/gen_ndr/ndr_ntsvcs.h
index 0e3b6b91c4..b70c383678 100644
--- a/librpc/gen_ndr/ndr_ntsvcs.h
+++ b/librpc/gen_ndr/ndr_ntsvcs.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/ntsvcs.h"
+#include "../librpc/gen_ndr/ntsvcs.h"
 
 #ifndef _HEADER_NDR_ntsvcs
 #define _HEADER_NDR_ntsvcs
diff --git a/librpc/gen_ndr/ndr_samr.c b/librpc/gen_ndr/ndr_samr.c
index 83db0faaef..83b091608e 100644
--- a/librpc/gen_ndr/ndr_samr.c
+++ b/librpc/gen_ndr/ndr_samr.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/ndr_samr.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
diff --git a/librpc/gen_ndr/ndr_samr.h b/librpc/gen_ndr/ndr_samr.h
index 64c60ee704..038fcf6ede 100644
--- a/librpc/gen_ndr/ndr_samr.h
+++ b/librpc/gen_ndr/ndr_samr.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/samr.h"
+#include "../librpc/gen_ndr/samr.h"
 
 #ifndef _HEADER_NDR_samr
 #define _HEADER_NDR_samr
diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c
index b4d221ac90..27aef3e06a 100644
--- a/librpc/gen_ndr/ndr_security.c
+++ b/librpc/gen_ndr/ndr_security.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 _PUBLIC_ enum ndr_err_code ndr_push_security_ace_flags(struct ndr_push *ndr, int ndr_flags, uint8_t r)
diff --git a/librpc/gen_ndr/ndr_security.h b/librpc/gen_ndr/ndr_security.h
index 41c66aa65b..8cf7bf3eea 100644
--- a/librpc/gen_ndr/ndr_security.h
+++ b/librpc/gen_ndr/ndr_security.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/security.h"
+#include "../librpc/gen_ndr/security.h"
 
 #ifndef _HEADER_NDR_security
 #define _HEADER_NDR_security
diff --git a/librpc/gen_ndr/ndr_srvsvc.c b/librpc/gen_ndr/ndr_srvsvc.c
index 125542d14a..31d2fe2deb 100644
--- a/librpc/gen_ndr/ndr_srvsvc.c
+++ b/librpc/gen_ndr/ndr_srvsvc.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_srvsvc.h"
 
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
diff --git a/librpc/gen_ndr/ndr_srvsvc.h b/librpc/gen_ndr/ndr_srvsvc.h
index 126680cad0..eba3ec990c 100644
--- a/librpc/gen_ndr/ndr_srvsvc.h
+++ b/librpc/gen_ndr/ndr_srvsvc.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/srvsvc.h"
+#include "../librpc/gen_ndr/srvsvc.h"
 
 #ifndef _HEADER_NDR_srvsvc
 #define _HEADER_NDR_srvsvc
diff --git a/librpc/gen_ndr/ndr_svcctl.c b/librpc/gen_ndr/ndr_svcctl.c
index 2bccde9ba0..95da357715 100644
--- a/librpc/gen_ndr/ndr_svcctl.c
+++ b/librpc/gen_ndr/ndr_svcctl.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_svcctl.h"
+#include "../librpc/gen_ndr/ndr_svcctl.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/librpc/gen_ndr/ndr_svcctl.h b/librpc/gen_ndr/ndr_svcctl.h
index 8d7739a7db..06b807bc7d 100644
--- a/librpc/gen_ndr/ndr_svcctl.h
+++ b/librpc/gen_ndr/ndr_svcctl.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/svcctl.h"
+#include "../librpc/gen_ndr/svcctl.h"
 
 #ifndef _HEADER_NDR_svcctl
 #define _HEADER_NDR_svcctl
diff --git a/librpc/gen_ndr/ndr_winreg.c b/librpc/gen_ndr/ndr_winreg.c
index 791d11103d..d37cf8fcde 100644
--- a/librpc/gen_ndr/ndr_winreg.c
+++ b/librpc/gen_ndr/ndr_winreg.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_winreg.h"
+#include "../librpc/gen_ndr/ndr_winreg.h"
 
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/librpc/gen_ndr/ndr_winreg.h b/librpc/gen_ndr/ndr_winreg.h
index 8dea3ae273..bc6cad1bcb 100644
--- a/librpc/gen_ndr/ndr_winreg.h
+++ b/librpc/gen_ndr/ndr_winreg.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/winreg.h"
+#include "../librpc/gen_ndr/winreg.h"
 
 #ifndef _HEADER_NDR_winreg
 #define _HEADER_NDR_winreg
diff --git a/librpc/gen_ndr/ndr_wkssvc.c b/librpc/gen_ndr/ndr_wkssvc.c
index e494f08be0..050aced7f5 100644
--- a/librpc/gen_ndr/ndr_wkssvc.c
+++ b/librpc/gen_ndr/ndr_wkssvc.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_wkssvc.h"
+#include "../librpc/gen_ndr/ndr_wkssvc.h"
 
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
diff --git a/librpc/gen_ndr/ndr_wkssvc.h b/librpc/gen_ndr/ndr_wkssvc.h
index 0fa4d3f8d4..fa533c60eb 100644
--- a/librpc/gen_ndr/ndr_wkssvc.h
+++ b/librpc/gen_ndr/ndr_wkssvc.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/wkssvc.h"
+#include "../librpc/gen_ndr/wkssvc.h"
 
 #ifndef _HEADER_NDR_wkssvc
 #define _HEADER_NDR_wkssvc
diff --git a/librpc/gen_ndr/ndr_xattr.c b/librpc/gen_ndr/ndr_xattr.c
index 75781d763d..d217a00228 100644
--- a/librpc/gen_ndr/ndr_xattr.c
+++ b/librpc/gen_ndr/ndr_xattr.c
@@ -1,7 +1,7 @@
 /* parser auto-generated by pidl */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "../librpc/gen_ndr/ndr_xattr.h"
 
 #include "librpc/gen_ndr/ndr_security.h"
 static enum ndr_err_code ndr_push_xattr_DosInfo1(struct ndr_push *ndr, int ndr_flags, const struct xattr_DosInfo1 *r)
diff --git a/librpc/gen_ndr/ndr_xattr.h b/librpc/gen_ndr/ndr_xattr.h
index c565e8513a..610d4b3296 100644
--- a/librpc/gen_ndr/ndr_xattr.h
+++ b/librpc/gen_ndr/ndr_xattr.h
@@ -1,7 +1,7 @@
 /* header auto-generated by pidl */
 
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/xattr.h"
+#include "../librpc/gen_ndr/xattr.h"
 
 #ifndef _HEADER_NDR_xattr
 #define _HEADER_NDR_xattr
diff --git a/librpc/gen_ndr/srv_dfs.c b/librpc/gen_ndr/srv_dfs.c
index d58272084a..666874fd64 100644
--- a/librpc/gen_ndr/srv_dfs.c
+++ b/librpc/gen_ndr/srv_dfs.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_dfs.h"
+#include "../librpc/gen_ndr/srv_dfs.h"
 
 static bool api_dfs_GetManagerVersion(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_dfs.h b/librpc/gen_ndr/srv_dfs.h
index e4d7a99c73..fe9234b21d 100644
--- a/librpc/gen_ndr/srv_dfs.h
+++ b/librpc/gen_ndr/srv_dfs.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_dfs.h"
+#include "../librpc/gen_ndr/ndr_dfs.h"
 #ifndef __SRV_NETDFS__
 #define __SRV_NETDFS__
 void _dfs_GetManagerVersion(pipes_struct *p, struct dfs_GetManagerVersion *r);
diff --git a/librpc/gen_ndr/srv_dssetup.c b/librpc/gen_ndr/srv_dssetup.c
index 62123b826c..3c07ad1247 100644
--- a/librpc/gen_ndr/srv_dssetup.c
+++ b/librpc/gen_ndr/srv_dssetup.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_dssetup.h"
+#include "../librpc/gen_ndr/srv_dssetup.h"
 
 static bool api_dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_dssetup.h b/librpc/gen_ndr/srv_dssetup.h
index 3233899eac..4122678274 100644
--- a/librpc/gen_ndr/srv_dssetup.h
+++ b/librpc/gen_ndr/srv_dssetup.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_dssetup.h"
+#include "../librpc/gen_ndr/ndr_dssetup.h"
 #ifndef __SRV_DSSETUP__
 #define __SRV_DSSETUP__
 WERROR _dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p, struct dssetup_DsRoleGetPrimaryDomainInformation *r);
diff --git a/librpc/gen_ndr/srv_echo.c b/librpc/gen_ndr/srv_echo.c
index 970398dc71..6436079299 100644
--- a/librpc/gen_ndr/srv_echo.c
+++ b/librpc/gen_ndr/srv_echo.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_echo.h"
+#include "../librpc/gen_ndr/srv_echo.h"
 
 static bool api_echo_AddOne(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_echo.h b/librpc/gen_ndr/srv_echo.h
index c3b0336652..cb6dd6ac46 100644
--- a/librpc/gen_ndr/srv_echo.h
+++ b/librpc/gen_ndr/srv_echo.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_echo.h"
+#include "../librpc/gen_ndr/ndr_echo.h"
 #ifndef __SRV_RPCECHO__
 #define __SRV_RPCECHO__
 void _echo_AddOne(pipes_struct *p, struct echo_AddOne *r);
diff --git a/librpc/gen_ndr/srv_epmapper.c b/librpc/gen_ndr/srv_epmapper.c
index a31d89b8e8..68e4a41393 100644
--- a/librpc/gen_ndr/srv_epmapper.c
+++ b/librpc/gen_ndr/srv_epmapper.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_epmapper.h"
+#include "../librpc/gen_ndr/srv_epmapper.h"
 
 static bool api_epm_Insert(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_epmapper.h b/librpc/gen_ndr/srv_epmapper.h
index e0d0105b78..137d908240 100644
--- a/librpc/gen_ndr/srv_epmapper.h
+++ b/librpc/gen_ndr/srv_epmapper.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "../librpc/gen_ndr/ndr_epmapper.h"
 #ifndef __SRV_EPMAPPER__
 #define __SRV_EPMAPPER__
 uint32 _epm_Insert(pipes_struct *p, struct epm_Insert *r);
diff --git a/librpc/gen_ndr/srv_eventlog.c b/librpc/gen_ndr/srv_eventlog.c
index b9a4a2e9ed..950daa5dd1 100644
--- a/librpc/gen_ndr/srv_eventlog.c
+++ b/librpc/gen_ndr/srv_eventlog.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_eventlog.h"
+#include "../librpc/gen_ndr/srv_eventlog.h"
 
 static bool api_eventlog_ClearEventLogW(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_eventlog.h b/librpc/gen_ndr/srv_eventlog.h
index 6957c66beb..3293bba507 100644
--- a/librpc/gen_ndr/srv_eventlog.h
+++ b/librpc/gen_ndr/srv_eventlog.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_eventlog.h"
+#include "../librpc/gen_ndr/ndr_eventlog.h"
 #ifndef __SRV_EVENTLOG__
 #define __SRV_EVENTLOG__
 NTSTATUS _eventlog_ClearEventLogW(pipes_struct *p, struct eventlog_ClearEventLogW *r);
diff --git a/librpc/gen_ndr/srv_initshutdown.c b/librpc/gen_ndr/srv_initshutdown.c
index 51098074ac..dbbfaaa41a 100644
--- a/librpc/gen_ndr/srv_initshutdown.c
+++ b/librpc/gen_ndr/srv_initshutdown.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_initshutdown.h"
+#include "../librpc/gen_ndr/srv_initshutdown.h"
 
 static bool api_initshutdown_Init(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_initshutdown.h b/librpc/gen_ndr/srv_initshutdown.h
index be3ea25271..d638131c53 100644
--- a/librpc/gen_ndr/srv_initshutdown.h
+++ b/librpc/gen_ndr/srv_initshutdown.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_initshutdown.h"
 #ifndef __SRV_INITSHUTDOWN__
 #define __SRV_INITSHUTDOWN__
 WERROR _initshutdown_Init(pipes_struct *p, struct initshutdown_Init *r);
diff --git a/librpc/gen_ndr/srv_lsa.c b/librpc/gen_ndr/srv_lsa.c
index c30f276800..9d29f61e09 100644
--- a/librpc/gen_ndr/srv_lsa.c
+++ b/librpc/gen_ndr/srv_lsa.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_lsa.h"
+#include "../librpc/gen_ndr/srv_lsa.h"
 
 static bool api_lsa_Close(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_lsa.h b/librpc/gen_ndr/srv_lsa.h
index 223ee5e970..63ea35f8e9 100644
--- a/librpc/gen_ndr/srv_lsa.h
+++ b/librpc/gen_ndr/srv_lsa.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 #ifndef __SRV_LSARPC__
 #define __SRV_LSARPC__
 NTSTATUS _lsa_Close(pipes_struct *p, struct lsa_Close *r);
diff --git a/librpc/gen_ndr/srv_netlogon.c b/librpc/gen_ndr/srv_netlogon.c
index 8cb461e94d..40ae09ebc2 100644
--- a/librpc/gen_ndr/srv_netlogon.c
+++ b/librpc/gen_ndr/srv_netlogon.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_netlogon.h"
+#include "../librpc/gen_ndr/srv_netlogon.h"
 
 static bool api_netr_LogonUasLogon(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_netlogon.h b/librpc/gen_ndr/srv_netlogon.h
index cd68d12f1e..d561706355 100644
--- a/librpc/gen_ndr/srv_netlogon.h
+++ b/librpc/gen_ndr/srv_netlogon.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 #ifndef __SRV_NETLOGON__
 #define __SRV_NETLOGON__
 WERROR _netr_LogonUasLogon(pipes_struct *p, struct netr_LogonUasLogon *r);
diff --git a/librpc/gen_ndr/srv_ntsvcs.c b/librpc/gen_ndr/srv_ntsvcs.c
index 288f3ed5d7..38fb0bba39 100644
--- a/librpc/gen_ndr/srv_ntsvcs.c
+++ b/librpc/gen_ndr/srv_ntsvcs.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_ntsvcs.h"
+#include "../librpc/gen_ndr/srv_ntsvcs.h"
 
 static bool api_PNP_Disconnect(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_ntsvcs.h b/librpc/gen_ndr/srv_ntsvcs.h
index c3969b11da..16f91cde67 100644
--- a/librpc/gen_ndr/srv_ntsvcs.h
+++ b/librpc/gen_ndr/srv_ntsvcs.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_ntsvcs.h"
+#include "../librpc/gen_ndr/ndr_ntsvcs.h"
 #ifndef __SRV_NTSVCS__
 #define __SRV_NTSVCS__
 WERROR _PNP_Disconnect(pipes_struct *p, struct PNP_Disconnect *r);
diff --git a/librpc/gen_ndr/srv_samr.c b/librpc/gen_ndr/srv_samr.c
index f4facd2914..598ec2aabf 100644
--- a/librpc/gen_ndr/srv_samr.c
+++ b/librpc/gen_ndr/srv_samr.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_samr.h"
+#include "../librpc/gen_ndr/srv_samr.h"
 
 static bool api_samr_Connect(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_samr.h b/librpc/gen_ndr/srv_samr.h
index 7d5cdd745d..1a697f6b3b 100644
--- a/librpc/gen_ndr/srv_samr.h
+++ b/librpc/gen_ndr/srv_samr.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/ndr_samr.h"
 #ifndef __SRV_SAMR__
 #define __SRV_SAMR__
 NTSTATUS _samr_Connect(pipes_struct *p, struct samr_Connect *r);
diff --git a/librpc/gen_ndr/srv_srvsvc.c b/librpc/gen_ndr/srv_srvsvc.c
index 59f51ba774..465d9ca31d 100644
--- a/librpc/gen_ndr/srv_srvsvc.c
+++ b/librpc/gen_ndr/srv_srvsvc.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_srvsvc.h"
+#include "../librpc/gen_ndr/srv_srvsvc.h"
 
 static bool api_srvsvc_NetCharDevEnum(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_srvsvc.h b/librpc/gen_ndr/srv_srvsvc.h
index 1e1ebb1904..c71e715a22 100644
--- a/librpc/gen_ndr/srv_srvsvc.h
+++ b/librpc/gen_ndr/srv_srvsvc.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_srvsvc.h"
 #ifndef __SRV_SRVSVC__
 #define __SRV_SRVSVC__
 WERROR _srvsvc_NetCharDevEnum(pipes_struct *p, struct srvsvc_NetCharDevEnum *r);
diff --git a/librpc/gen_ndr/srv_svcctl.c b/librpc/gen_ndr/srv_svcctl.c
index 5b30bf00f7..46e2b03d3c 100644
--- a/librpc/gen_ndr/srv_svcctl.c
+++ b/librpc/gen_ndr/srv_svcctl.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_svcctl.h"
+#include "../librpc/gen_ndr/srv_svcctl.h"
 
 static bool api_svcctl_CloseServiceHandle(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_svcctl.h b/librpc/gen_ndr/srv_svcctl.h
index ca63ebe970..80a9ccb01f 100644
--- a/librpc/gen_ndr/srv_svcctl.h
+++ b/librpc/gen_ndr/srv_svcctl.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_svcctl.h"
+#include "../librpc/gen_ndr/ndr_svcctl.h"
 #ifndef __SRV_SVCCTL__
 #define __SRV_SVCCTL__
 WERROR _svcctl_CloseServiceHandle(pipes_struct *p, struct svcctl_CloseServiceHandle *r);
diff --git a/librpc/gen_ndr/srv_winreg.c b/librpc/gen_ndr/srv_winreg.c
index ac70b41219..a97391480e 100644
--- a/librpc/gen_ndr/srv_winreg.c
+++ b/librpc/gen_ndr/srv_winreg.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_winreg.h"
+#include "../librpc/gen_ndr/srv_winreg.h"
 
 static bool api_winreg_OpenHKCR(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_winreg.h b/librpc/gen_ndr/srv_winreg.h
index decfb2589d..cedbef3e88 100644
--- a/librpc/gen_ndr/srv_winreg.h
+++ b/librpc/gen_ndr/srv_winreg.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_winreg.h"
+#include "../librpc/gen_ndr/ndr_winreg.h"
 #ifndef __SRV_WINREG__
 #define __SRV_WINREG__
 WERROR _winreg_OpenHKCR(pipes_struct *p, struct winreg_OpenHKCR *r);
diff --git a/librpc/gen_ndr/srv_wkssvc.c b/librpc/gen_ndr/srv_wkssvc.c
index 61a5be081f..d74c8bc970 100644
--- a/librpc/gen_ndr/srv_wkssvc.c
+++ b/librpc/gen_ndr/srv_wkssvc.c
@@ -4,7 +4,7 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/srv_wkssvc.h"
+#include "../librpc/gen_ndr/srv_wkssvc.h"
 
 static bool api_wkssvc_NetWkstaGetInfo(pipes_struct *p)
 {
diff --git a/librpc/gen_ndr/srv_wkssvc.h b/librpc/gen_ndr/srv_wkssvc.h
index f1d0b94c26..b1bda66134 100644
--- a/librpc/gen_ndr/srv_wkssvc.h
+++ b/librpc/gen_ndr/srv_wkssvc.h
@@ -1,4 +1,4 @@
-#include "librpc/gen_ndr/ndr_wkssvc.h"
+#include "../librpc/gen_ndr/ndr_wkssvc.h"
 #ifndef __SRV_WKSSVC__
 #define __SRV_WKSSVC__
 WERROR _wkssvc_NetWkstaGetInfo(pipes_struct *p, struct wkssvc_NetWkstaGetInfo *r);
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1571e2baa7..d33a719f36 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1228,7 +1228,7 @@ modules:: SHOWFLAGS $(MODULES)
 ## Perl IDL Compiler
 samba3-idl::
 	@PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
-	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh ../librpc/idl/lsa.idl \
+	 srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/lsa.idl \
 	 	../librpc/idl/dfs.idl ../librpc/idl/echo.idl ../librpc/idl/winreg.idl \
 		../librpc/idl/initshutdown.idl ../librpc/idl/srvsvc.idl ../librpc/idl/svcctl.idl \
 		../librpc/idl/eventlog.idl ../librpc/idl/wkssvc.idl ../librpc/idl/netlogon.idl \
@@ -1245,7 +1245,7 @@ samba3-idl::
 
 NDR_TABLES = librpc/gen_ndr/tables.c
 
-ndr-tables:: librpc/gen_ndr/*.h
+ndr-tables:: librpc/gen_ndr/*.h ../librpc/gen_ndr/*.h
 	@echo "Generating $(NDR_TABLES)"
 	@$(PERL) ../librpc/tables.pl $^ > $(NDR_TABLES)
 
diff --git a/source3/librpc/gen_ndr/tables.c b/source3/librpc/gen_ndr/tables.c
new file mode 100644
index 0000000000..09071f96d6
--- /dev/null
+++ b/source3/librpc/gen_ndr/tables.c
@@ -0,0 +1,151 @@
+
+/* Automatically generated by tables.pl. DO NOT EDIT */
+
+#include "includes.h"
+#include "librpc/ndr/libndr.h"
+#include "librpc/ndr/ndr_table.h"
+#include "../librpc/gen_ndr/ndr_dfs_c.h"
+#include "../librpc/gen_ndr/ndr_dfs.h"
+#include "../librpc/gen_ndr/ndr_drsblobs_c.h"
+#include "../librpc/gen_ndr/ndr_drsblobs.h"
+#include "../librpc/gen_ndr/ndr_drsuapi_c.h"
+#include "../librpc/gen_ndr/ndr_drsuapi.h"
+#include "../librpc/gen_ndr/ndr_dssetup_c.h"
+#include "../librpc/gen_ndr/ndr_dssetup.h"
+#include "../librpc/gen_ndr/ndr_echo_c.h"
+#include "../librpc/gen_ndr/ndr_echo.h"
+#include "../librpc/gen_ndr/ndr_epmapper_c.h"
+#include "../librpc/gen_ndr/ndr_epmapper.h"
+#include "../librpc/gen_ndr/ndr_eventlog_c.h"
+#include "../librpc/gen_ndr/ndr_eventlog.h"
+#include "../librpc/gen_ndr/ndr_initshutdown_c.h"
+#include "../librpc/gen_ndr/ndr_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_krb5pac_c.h"
+#include "../librpc/gen_ndr/ndr_krb5pac.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/gen_ndr/ndr_netlogon_c.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_ntsvcs_c.h"
+#include "../librpc/gen_ndr/ndr_ntsvcs.h"
+#include "../librpc/gen_ndr/ndr_samr_c.h"
+#include "../librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/ndr_srvsvc_c.h"
+#include "../librpc/gen_ndr/ndr_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_svcctl_c.h"
+#include "../librpc/gen_ndr/ndr_svcctl.h"
+#include "../librpc/gen_ndr/ndr_winreg_c.h"
+#include "../librpc/gen_ndr/ndr_winreg.h"
+#include "../librpc/gen_ndr/ndr_wkssvc_c.h"
+#include "../librpc/gen_ndr/ndr_wkssvc.h"
+
+NTSTATUS ndr_table_register_builtin_tables(void)
+{
+	NTSTATUS status;
+
+	status = ndr_table_register(&ndr_table_netdfs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_netdfs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_drsblobs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_drsblobs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_drsuapi);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_drsuapi);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_dssetup);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_dssetup);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_rpcecho);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_rpcecho);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_epmapper);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_epmapper);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_eventlog);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_eventlog);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_initshutdown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_initshutdown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_krb5pac);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_krb5pac);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_lsarpc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_lsarpc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_netlogon);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_netlogon);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ntsvcs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ntsvcs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_samr);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_samr);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_srvsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_srvsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_svcctl);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_svcctl);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_winreg);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_winreg);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_wkssvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_wkssvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+
+	
+	return NT_STATUS_OK;
+}
diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c
index 4a34c1c998..e290b851f3 100644
--- a/source4/lib/ldb/ldb_wrap.c
+++ b/source4/lib/ldb/ldb_wrap.c
@@ -2684,7 +2684,7 @@ SWIGINTERN ldb_dn *new_ldb_dn(ldb *ldb_ctx,char const *str){
                we do it this way... */
             talloc_steal(NULL, ret);
 
-            if (ret == NULL)
+            if (ret == NULL || !ldb_dn_validate(ret))
                 SWIG_exception(SWIG_ValueError, 
                                 "unable to parse dn string");
 fail: