diff options
122 files changed, 391 insertions, 493 deletions
diff --git a/.gitignore b/.gitignore index 4985738891..e2f7500781 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,41 @@ 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 +librpc/gen_ndr/*wzcsvc* +librpc/gen_ndr/*w32time* +librpc/gen_ndr/*wmi* +librpc/gen_ndr/*trkwks* +librpc/gen_ndr/*spoolss* +librpc/gen_ndr/*rot* +librpc/gen_ndr/*remact* +librpc/gen_ndr/*oxidresolver* +librpc/gen_ndr/*msgsvc* +librpc/gen_ndr/*mgmt* +librpc/gen_ndr/*keysvc* +librpc/gen_ndr/*protected_storage* +librpc/gen_ndr/*dnsserver* +librpc/gen_ndr/*scerpc* +librpc/gen_ndr/*policyagent* +librpc/gen_ndr/*scerpc* +librpc/gen_ndr/*orpc* +librpc/gen_ndr/*efs* +librpc/gen_ndr/*dsbackup* +librpc/gen_ndr/*frsrpc* +librpc/gen_ndr/*dcom* +librpc/gen_ndr/*frsapi* +librpc/gen_ndr/*dbgidl* +librpc/gen_ndr/*browser* +librpc/gen_ndr/*atsvc* +librpc/gen_ndr/*audiosrv* +librpc/gen_ndr/*unixinfo* +librpc/gen_ndr/py_* +librpc/gen_ndr/*_c.c +librpc/gen_ndr/*_c.h +librpc/gen_ndr/*_s.c +librpc/gen_ndr/cli_named_pipe_auth.[ch] +librpc/gen_ndr/srv_named_pipe_auth.[ch] diff --git a/librpc/build_idl.sh b/librpc/build_idl.sh new file mode 100755 index 0000000000..ac0fab4801 --- /dev/null +++ b/librpc/build_idl.sh @@ -0,0 +1,55 @@ +#!/bin/sh + +if [ "$1" = "--full" ]; then + FULL=1 + shift 1 +else + FULL=0 +fi + +ARGS="--outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python --dcom-proxy --com-header $PIDL_ARGS --" +IDL_FILES="$*" + +oldpwd=`pwd` +cd ${srcdir} + +[ -d $PIDL_OUTPUTDIR ] || mkdir -p $PIDL_OUTPUTDIR || exit 1 + +PIDL="$PIDL $ARGS" + +if [ $FULL = 1 ]; then + echo "Rebuilding all idl files" + $PIDL $IDL_FILES || exit 1 + exit 0 +fi + +## +## Find newer files rather than rebuild all of them +## + +list="" +for f in ${IDL_FILES}; do + basename=`basename $f .idl` + ndr="$PIDL_OUTPUTDIR/py_$basename.c" + + if [ -f $ndr ]; then + if [ "x`find $f -newer $ndr -print`" = "x$f" ]; then + list="$list $f" + fi + else + list="$list $f" + fi +done + +## +## generate the ndr stubs +## + +if [ "x$list" != x ]; then + # echo "${PIDL} ${list}" + $PIDL $list || exit 1 +fi + +cd ${oldpwd} + +exit 0 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/librpc/idl/dcom.idl b/librpc/idl/dcom.idl index 977c7ed86a..18d0d61c41 100644 --- a/librpc/idl/dcom.idl +++ b/librpc/idl/dcom.idl @@ -111,7 +111,6 @@ interface IRemUnknown : IUnknown [ uuid("00000140-0000-0000-c000-000000000046"), - pointer_default(unique), object ] interface IClassActivator : IUnknown { @@ -119,7 +118,7 @@ interface IRemUnknown : IUnknown [in] uint32 context, [in] uint32 locale, [in] GUID iid, - [out, iid_is(iid)] MInterfacePointer data); + [out, iid_is(iid)] MInterfacePointer *data); } [ @@ -151,7 +150,6 @@ interface IRemUnknown : IUnknown System.Activator class */ [ uuid("000001a0-0000-0000-c000-000000000046"), - pointer_default(unique), object ] interface ISystemActivator : IClassActivator @@ -159,8 +157,8 @@ interface IRemUnknown : IUnknown WERROR ISystemActivatorRemoteCreateInstance([in] hyper unknown1, /* OXID ? */ [in] MInterfacePointer iface1, [in] hyper unknown2, - [out] uint32 unknown3, - [out] MInterfacePointer iface2); + [out] uint32 *unknown3, + [out] MInterfacePointer *iface2); } @@ -272,7 +270,6 @@ interface IRemUnknown2 : IRemUnknown [ object, - pointer_default(unique), uuid("0000000C-0000-0000-C000-000000000046"), helpstring("Stream") ] @@ -282,13 +279,13 @@ interface IStream : IUnknown [out, size_is(num_requested), length_is(num_read)] uint8 pv[], [in] uint32 num_requested, [in, unique] uint32 *num_readx, - [out] uint32 num_read + [out] uint32 *num_read ); WERROR Write( [in,size_is(num_requested),unique] uint8 *data, [in] uint32 num_requested, - [out] uint32 num_written); + [out] uint32 *num_written); } [ diff --git a/librpc/idl/oxidresolver.idl b/librpc/idl/oxidresolver.idl index 95c8a1c5f0..67cb4301c0 100644 --- a/librpc/idl/oxidresolver.idl +++ b/librpc/idl/oxidresolver.idl @@ -90,5 +90,7 @@ interface IOXIDResolver [idempotent] WERROR ServerAlive2 ( [out,ref] COMINFO *info, [out,ref] DUALSTRINGARRAY *dualstring, - [out] uint8 unknown2[3]); + [out,ref] uint8 *unknown2, + [out,ref] uint8 *unknown3, + [out,ref] uint8 *unknown4); } diff --git a/librpc/idl/remact.idl b/librpc/idl/remact.idl index 2165ecfc81..14fd6cedcf 100644 --- a/librpc/idl/remact.idl +++ b/librpc/idl/remact.idl @@ -23,7 +23,7 @@ interface IRemoteActivation const uint32 MODE_GET_CLASS_OBJECT = 0xffffffff; WERROR RemoteActivation ( - [in] ORPCTHIS this, + [in] ORPCTHIS this_object, [out,ref] ORPCTHAT *that, [in] GUID Clsid, [in] [string,charset(UTF16)] uint16 *pwszObjectName, diff --git a/source4/librpc/idl/scerpc.idl b/librpc/idl/scerpc.idl index 2c3c4f865f..2c3c4f865f 100644 --- a/source4/librpc/idl/scerpc.idl +++ b/librpc/idl/scerpc.idl diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm index 4109ce9962..9a7a037b54 100644 --- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm +++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm @@ -12,7 +12,7 @@ use Exporter; @EXPORT_OK = qw(ParseFunction $res $res_hdr ParseOutputArgument); use strict; -use Parse::Pidl qw(fatal warning); +use Parse::Pidl qw(fatal warning error); use Parse::Pidl::Util qw(has_property ParseExpr); use Parse::Pidl::Samba4 qw(DeclLong); use Parse::Pidl::Samba4::Header qw(GenerateFunctionInEnv); @@ -76,7 +76,11 @@ sub ParseOutputArgument($$$) my ($self, $fn, $e) = @_; my $level = 0; - fatal($e->{ORIGINAL}, "[out] argument is not a pointer or array") if ($e->{LEVELS}[0]->{TYPE} ne "POINTER" and $e->{LEVELS}[0]->{TYPE} ne "ARRAY"); + if ($e->{LEVELS}[0]->{TYPE} ne "POINTER" and $e->{LEVELS}[0]->{TYPE} ne "ARRAY") { + $self->pidl("return NT_STATUS_NOT_SUPPORTED;"); + error($e->{ORIGINAL}, "[out] argument is not a pointer or array"); + return; + } if ($e->{LEVELS}[0]->{TYPE} eq "POINTER") { $level = 1; diff --git a/pidl/lib/Parse/Pidl/Samba4.pm b/pidl/lib/Parse/Pidl/Samba4.pm index 5bdb91ee25..20c518dceb 100644 --- a/pidl/lib/Parse/Pidl/Samba4.pm +++ b/pidl/lib/Parse/Pidl/Samba4.pm @@ -12,7 +12,7 @@ require Exporter; use Parse::Pidl::Util qw(has_property is_constant); use Parse::Pidl::NDR qw(GetNextLevel); use Parse::Pidl::Typelist qw(mapTypeName scalar_is_reference); -use Parse::Pidl qw(fatal); +use Parse::Pidl qw(fatal error); use strict; use vars qw($VERSION); @@ -69,7 +69,7 @@ sub NumStars($;$) $n++; } - fatal($e->{ORIGINAL}, "Too few pointers $n < $d") if ($n < $d); + error($e->{ORIGINAL}, "Too few pointers $n < $d") if ($n < $d); $n -= $d; diff --git a/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm b/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm index 996689b4b6..de7d4547a5 100644 --- a/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm +++ b/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm @@ -127,6 +127,7 @@ sub Parse($$) { my ($idl,$ndr_header) = @_; my $res = ""; + my $has_obj = 0; $res .= "#include \"librpc/gen_ndr/orpc.h\"\n" . "#include \"$ndr_header\"\n\n"; @@ -135,6 +136,7 @@ sub Parse($$) { if ($_->{TYPE} eq "INTERFACE" && has_property($_, "object")) { $res .="struct $_->{NAME};\n"; + $has_obj = 1; } } @@ -142,14 +144,17 @@ sub Parse($$) { if ($_->{TYPE} eq "INTERFACE" && has_property($_, "object")) { $res.=ParseInterface($_); + $has_obj = 1; } if ($_->{TYPE} eq "COCLASS") { $res.=ParseCoClass($_); + $has_obj = 1; } } - return $res; + return $res if ($has_obj); + return undef; } 1; diff --git a/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm b/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm index ca9f37a053..27e1e5d424 100644 --- a/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm +++ b/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm @@ -201,6 +201,7 @@ sub Parse($$) { my ($pidl,$comh_filename) = @_; my $res = ""; + my $has_obj = 0; $res .= "#include \"includes.h\"\n" . "#include \"lib/com/dcom/dcom.h\"\n" . @@ -213,9 +214,12 @@ sub Parse($$) next unless has_property($_, "object"); $res .= ParseInterface($_); + + $has_obj = 1; } - return $res; + return $res if ($has_obj); + return undef; } 1; diff --git a/pidl/lib/Parse/Pidl/Samba4/SWIG.pm b/pidl/lib/Parse/Pidl/Samba4/SWIG.pm deleted file mode 100644 index 14424cf260..0000000000 --- a/pidl/lib/Parse/Pidl/Samba4/SWIG.pm +++ /dev/null @@ -1,177 +0,0 @@ -################################################### -# Samba4 parser generator for swig wrappers -# Copyright tpot@samba.org 2004,2005 -# Copyright jelmer@samba.org 2006 -# released under the GNU GPL - -package Parse::Pidl::Samba4::SWIG; - -use vars qw($VERSION); -use Parse::Pidl::Samba4 qw(DeclLong); -use Parse::Pidl::Typelist qw(mapTypeName); -use Parse::Pidl::Util qw(has_property); -$VERSION = '0.01'; - -use strict; - -my $ret = ""; -my $tabs = ""; - -sub pidl($) -{ - my $p = shift; - $ret .= $tabs. $p . "\n"; -} - -sub indent() { $tabs.=" "; } -sub deindent() { $tabs = substr($tabs,0,-2); } - -sub IgnoreInterface($$) -{ - my ($basename,$if) = @_; - - foreach (@{$if->{TYPES}}) { - next unless (has_property($_, "public")); - pidl "\%types($_->{NAME});"; - } -} - -sub GenerateResultTypemap($) -{ - my $name = shift; - pidl "%typemap(in,numinputs=0) $name*result ($name tmp) {"; - indent; - pidl "\$1 = &tmp;"; - deindent; - pidl "}"; - pidl ""; - pidl "%typemap(argout) $name*result {"; - indent; - pidl "\$result = SWIG_NewPointerObj(*\$1, \$1_descriptor, 0);"; - deindent; - pidl "}"; -} - -sub ParseInterface($$) -{ - my ($basename,$if) = @_; - - pidl "\%inline {"; - pidl "typedef struct $if->{NAME} { struct dcerpc_pipe *pipe; } $if->{NAME};"; - pidl "}"; - pidl ""; - pidl "%talloctype($if->{NAME});"; - pidl ""; - pidl "\%extend $if->{NAME} {"; - indent(); - pidl "$if->{NAME} () {"; - indent; - pidl "return talloc(NULL, struct $if->{NAME});"; - deindent; - pidl "}"; - pidl ""; - pidl "NTSTATUS connect (const char *binding, struct cli_credentials *cred, struct event_context *event)"; - pidl "{"; - indent; - pidl "return dcerpc_pipe_connect(\$self, &\$self->pipe, binding, &ndr_table_$if->{NAME}, cred, event);"; - deindent; - pidl "}"; - pidl ""; - - foreach my $fn (@{$if->{FUNCTIONS}}) { - pidl "/* $fn->{NAME} */"; - my $args = ""; - foreach (@{$fn->{ELEMENTS}}) { - $args .= DeclLong($_) . ", "; - } - my $name = $fn->{NAME}; - $name =~ s/^$if->{NAME}_//g; - $name =~ s/^$basename\_//g; - $args .= "TALLOC_CTX *mem_ctx, " . mapTypeName($fn->{RETURN_TYPE}) . " *result"; - pidl "NTSTATUS $name($args)"; - pidl "{"; - indent; - pidl "struct $fn->{NAME} r;"; - pidl "NTSTATUS status;"; - pidl ""; - pidl "/* Fill r structure */"; - - foreach (@{$fn->{ELEMENTS}}) { - if (grep(/in/, @{$_->{DIRECTION}})) { - pidl "r.in.$_->{NAME} = $_->{NAME};"; - } - } - - pidl ""; - pidl "status = dcerpc_$fn->{NAME}(\$self->pipe, mem_ctx, &r);"; - pidl "if (NT_STATUS_IS_ERR(status)) {"; - indent; pidl "return status;"; deindent; - pidl "}"; - pidl ""; - pidl "/* Set out arguments */"; - foreach (@{$fn->{ELEMENTS}}) { - next unless (grep(/out/, @{$_->{DIRECTION}})); - - pidl ("/* FIXME: $_->{NAME} [out] argument is not a pointer */") if ($_->{LEVELS}[0]->{TYPE} ne "POINTER"); - - pidl "*$_->{NAME} = *r.out.$_->{NAME};"; - } - - if (defined($fn->{RETURN_TYPE})) { - pidl "*result = r.out.result;"; - } - pidl "return NT_STATUS_OK;"; - deindent; - pidl "}"; - pidl ""; - } - - deindent(); - pidl "};"; - pidl ""; - - foreach (@{$if->{TYPES}}) { - pidl "/* $_->{NAME} */"; - } - - pidl ""; -} - -sub Parse($$$$) -{ - my($ndr,$basename,$header,$gen_header) = @_; - - $ret = ""; - - pidl "/* This file is autogenerated by pidl. DO NOT EDIT */"; - - pidl "\%module $basename"; - - pidl ""; - - pidl "\%{"; - pidl "#include \"includes.h\""; - pidl "#include \"$header\""; - pidl "#include \"$gen_header\""; - pidl "%}"; - pidl "\%import \"../rpc/dcerpc.i\""; - pidl "\%import \"../../libcli/util/errors.i\""; - pidl "\%import \"../../lib/talloc/talloc.i\""; - pidl ""; - foreach (@$ndr) { - IgnoreInterface($basename, $_) if ($_->{TYPE} eq "INTERFACE"); - } - pidl ""; - - pidl ""; - - foreach (@$ndr) { - ParseInterface($basename, $_) if ($_->{TYPE} eq "INTERFACE"); - } - #FIXME: Foreach ref pointer, set NONNULL - #FIXME: Foreach unique/full pointer, set MAYBENULL - #FIXME: Foreach [out] parameter, set OUTPARAM - return $ret; -} - -1; @@ -17,7 +17,7 @@ pidl - An IDL compiler written in Perl pidl --help -pidl [--outputdir[=OUTNAME]] [--includedir DIR...] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--python[=OUTPUT]] [--swig[=OUTPUT]] [--ndr-parser[=OUTPUT]] [--client] [--server] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [--samba3-ndr-server[=OUTPUT]] [--typelib=[OUTPUT]] [<idlfile>.idl]... +pidl [--outputdir[=OUTNAME]] [--includedir DIR...] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--python[=OUTPUT]] [--ndr-parser[=OUTPUT]] [--client] [--server] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [--samba3-ndr-server[=OUTPUT]] [--typelib=[OUTPUT]] [<idlfile>.idl]... =head1 DESCRIPTION @@ -477,7 +477,6 @@ my($opt_server); my($opt_ndr_parser); my($opt_tdr_parser); my($opt_ws_parser); -my($opt_swig); my($opt_python); my($opt_quiet) = 0; my($opt_outputdir) = '.'; @@ -521,7 +520,6 @@ Samba 4 output: --client[=OUTFILE] create a C NDR client [ndr_BASENAME_c.c] --tdr-parser[=OUTFILE] create a C TDR parser [tdr_BASENAME.c] --python[=OUTFILE] create python wrapper file [py_BASENAME.c] - --swig[=OUTFILE] create swig wrapper file [BASENAME.i] --server[=OUTFILE] create server boilerplate [ndr_BASENAME_s.c] --template print a template for a pipe --dcom-proxy[=OUTFILE] create DCOM proxy [ndr_BASENAME_p.c] @@ -567,7 +565,6 @@ my $result = GetOptions ( 'ws-parser:s' => \$opt_ws_parser, 'python' => \$opt_python, 'diff' => \$opt_diff, - 'swig:s' => \$opt_swig, 'dcom-proxy:s' => \$opt_dcom_proxy, 'com-header:s' => \$opt_com_header, 'quiet' => \$opt_quiet, @@ -666,7 +663,6 @@ sub process_file($) defined($opt_samba3_header) or defined($opt_samba3_parser) or defined($opt_samba3_server) or - defined($opt_swig) or defined($opt_samba3_ndr_client) or defined($opt_samba3_ndr_server)) { require Parse::Pidl::NDR; @@ -698,13 +694,6 @@ sub process_file($) FileSave($c_header, $hdrd); } - if (defined($opt_swig)) { - require Parse::Pidl::Samba4::SWIG; - my($filename) = ($opt_swig or "$outputdir/$basename.i"); - my $code = Parse::Pidl::Samba4::SWIG::Parse($ndr, $basename, "$outputdir/ndr_$basename\_c.h", $gen_header); - FileSave($filename, $code); - } - if (defined($opt_python)) { require Parse::Pidl::Samba4::Python; my $generator = new Parse::Pidl::Samba4::Python(); diff --git a/source3/Makefile.in b/source3/Makefile.in index 1571e2baa7..0a2893a4e8 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -208,7 +208,7 @@ BIN_PROGS = @EXTRA_BIN_PROGS@ \ EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \ - bin/log2pcap@EXEEXT@ bin/sharesec@EXEEXT@ bin/ndrdump@EXEEXT@ \ + bin/log2pcap@EXEEXT@ bin/sharesec@EXEEXT@ \ bin/vlp@EXEEXT@ bin/smbiconv@EXEEXT@ PAM_MODULES = @PAM_MODULES@ @@ -994,15 +994,6 @@ REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \ @libreplacedir@/test/main.o \ $(LIBREPLACE_OBJ) -NDRDUMP_OBJ = ../librpc/tools/ndrdump.o \ - $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \ - $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ - $(LIBNDR_DRSUAPI_OBJ) $(COMPRESSION_OBJ) \ - ../librpc/gen_ndr/ndr_svcctl.o \ - librpc/gen_ndr/tables.o ../librpc/ndr/ndr_table.o \ - ../librpc/ndr/ndr_krb5pac.o \ - ../librpc/gen_ndr/ndr_krb5pac.o ../lib/util/asn1.o - DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ @@ -1228,26 +1219,10 @@ 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 \ - ../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 \ - ../librpc/idl/epmapper.idl \ - ../librpc/idl/xattr.idl ../librpc/idl/misc.idl ../librpc/idl/samr.idl \ - ../librpc/idl/security.idl ../librpc/idl/dssetup.idl ../librpc/idl/krb5pac.idl \ - ../librpc/idl/ntsvcs.idl ../librpc/idl/drsuapi.idl \ - ../librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl \ - ../librpc/idl/named_pipe_auth.idl + srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/*.idl @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \ srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh \ librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl - @$(MAKE) ndr-tables - -NDR_TABLES = librpc/gen_ndr/tables.c - -ndr-tables:: librpc/gen_ndr/*.h - @echo "Generating $(NDR_TABLES)" - @$(PERL) ../librpc/tables.pl $^ > $(NDR_TABLES) ##################################################################### @@ -1575,11 +1550,6 @@ bin/locktest2@EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLO $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) -bin/ndrdump@EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ - @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ - $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) - bin/debug2html@EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \ diff --git a/source3/samba4.mk b/source3/samba4.mk index 18f7541333..8962d6b5de 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -36,6 +36,8 @@ SAMBA4_CFLAGS = -I.. -I$(samba4srcdir) -I$(samba4srcdir)/include \ # overrides are not specified first. ifeq ($(MAKE_VERSION),3.81) %.o: CFLAGS+=$(FLAGS) +../librpc/gen_ndr/%_c.o: CFLAGS=$(SAMBA4_CFLAGS) +../librpc/gen_ndr/py_%.o: CFLAGS=$(SAMBA4_CFLAGS) $(samba4srcdir)/%.o: CFLAGS=$(SAMBA4_CFLAGS) $(samba4srcdir)/%.ho: CFLAGS=$(SAMBA4_CFLAGS) $(heimdalsrcdir)/%.o: CFLAGS=-I$(heimdalbuildsrcdir) $(SAMBA4_CFLAGS) -I$(srcdir) @@ -45,6 +47,8 @@ $(heimdalsrcdir)/%.o: CFLAGS=-I$(heimdalbuildsrcdir) $(SAMBA4_CFLAGS) -I$(srcdir $(heimdalsrcdir)/%.ho: CFLAGS=-I$(heimdalbuildsrcdir) $(SAMBA4_CFLAGS) -I$(srcdir) $(samba4srcdir)/%.o: CFLAGS=$(SAMBA4_CFLAGS) $(samba4srcdir)/%.ho: CFLAGS=$(SAMBA4_CFLAGS) +../librpc/gen_ndr/%_c.o: CFLAGS=$(SAMBA4_CFLAGS) +../librpc/gen_ndr/py_%.o: CFLAGS=$(SAMBA4_CFLAGS) %.o: CFLAGS+=$(FLAGS) endif 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: diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 902312542a..475d14ec4d 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -8,7 +8,7 @@ dcerpcsrcdir = $(librpcsrcdir)/rpc PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \ LIBSAMBA-HOSTCONFIG -LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr_string.o) ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o ../librpc/ndr/ndr.o $(gen_ndrsrcdir)/ndr_misc.o ../librpc/ndr/ndr_misc.o +LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr_string.o) ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o ../librpc/ndr/ndr.o ../librpc/gen_ndr/ndr_misc.o ../librpc/ndr/ndr_misc.o PC_FILES += ../librpc/ndr.pc LIBNDR_VERSION = 0.0.1 @@ -18,7 +18,7 @@ LIBNDR_SOVERSION = 0 ################################################ PUBLIC_HEADERS += ../librpc/ndr/libndr.h -PUBLIC_HEADERS += $(gen_ndrsrcdir)/misc.h $(gen_ndrsrcdir)/ndr_misc.h +PUBLIC_HEADERS += ../librpc/gen_ndr/misc.h ../librpc/gen_ndr/ndr_misc.h ################################# # Start BINARY ndrdump @@ -52,27 +52,27 @@ NDR_COMPRESSION_OBJ_FILES = ../librpc/ndr/ndr_compression.o [SUBSYSTEM::NDR_SECURITY] PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY -NDR_SECURITY_OBJ_FILES = $(gen_ndrsrcdir)/ndr_security.o \ +NDR_SECURITY_OBJ_FILES = ../librpc/gen_ndr/ndr_security.o \ ../librpc/ndr/ndr_sec_helper.o \ $(gen_ndrsrcdir)/ndr_server_id.o -PUBLIC_HEADERS += $(addprefix $(gen_ndrsrcdir)/, security.h) +PUBLIC_HEADERS += ../librpc/gen_ndr/security.h) [SUBSYSTEM::NDR_AUDIOSRV] PUBLIC_DEPENDENCIES = LIBNDR -NDR_AUDIOSRV_OBJ_FILES = $(gen_ndrsrcdir)/ndr_audiosrv.o +NDR_AUDIOSRV_OBJ_FILES = ../librpc/gen_ndr/ndr_audiosrv.o [SUBSYSTEM::NDR_NAMED_PIPE_AUTH] PUBLIC_DEPENDENCIES = LIBNDR -NDR_NAMED_PIPE_AUTH_OBJ_FILES = $(gen_ndrsrcdir)/ndr_named_pipe_auth.o +NDR_NAMED_PIPE_AUTH_OBJ_FILES = ../librpc/gen_ndr/ndr_named_pipe_auth.o [SUBSYSTEM::NDR_DNSSERVER] PUBLIC_DEPENDENCIES = LIBNDR -NDR_DNSSERVER_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dnsserver.o +NDR_DNSSERVER_OBJ_FILES = ../librpc/gen_ndr/ndr_dnsserver.o [SUBSYSTEM::NDR_WINSTATION] PUBLIC_DEPENDENCIES = LIBNDR @@ -82,7 +82,7 @@ NDR_WINSTATION_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winstation.o [SUBSYSTEM::NDR_ECHO] PUBLIC_DEPENDENCIES = LIBNDR -NDR_ECHO_OBJ_FILES = $(gen_ndrsrcdir)/ndr_echo.o +NDR_ECHO_OBJ_FILES = ../librpc/gen_ndr/ndr_echo.o [SUBSYSTEM::NDR_IRPC] PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_NBT @@ -92,59 +92,59 @@ NDR_IRPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_irpc.o [SUBSYSTEM::NDR_DCOM] PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_ORPC -NDR_DCOM_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dcom.o +NDR_DCOM_OBJ_FILES = ../librpc/gen_ndr/ndr_dcom.o [SUBSYSTEM::NDR_WMI] PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_DCOM -NDR_WMI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wmi.o ../librpc/ndr/ndr_wmi.o +NDR_WMI_OBJ_FILES = ../librpc/gen_ndr/ndr_wmi.o ../librpc/ndr/ndr_wmi.o [SUBSYSTEM::NDR_DSBACKUP] PUBLIC_DEPENDENCIES = LIBNDR -NDR_DSBACKUP_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dsbackup.o +NDR_DSBACKUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dsbackup.o [SUBSYSTEM::NDR_EFS] PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY -NDR_EFS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_efs.o +NDR_EFS_OBJ_FILES = ../librpc/gen_ndr/ndr_efs.o [SUBSYSTEM::NDR_ROT] PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC -NDR_ROT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_rot.o +NDR_ROT_OBJ_FILES = ../librpc/gen_ndr/ndr_rot.o [SUBSYSTEM::NDR_LSA] PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY -NDR_LSA_OBJ_FILES = $(gen_ndrsrcdir)/ndr_lsa.o +NDR_LSA_OBJ_FILES = ../librpc/gen_ndr/ndr_lsa.o -PUBLIC_HEADERS += $(gen_ndrsrcdir)/lsa.h +PUBLIC_HEADERS += ../librpc/gen_ndr/lsa.h [SUBSYSTEM::NDR_DFS] PUBLIC_DEPENDENCIES = LIBNDR -NDR_DFS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dfs.o +NDR_DFS_OBJ_FILES = ../librpc/gen_ndr/ndr_dfs.o [SUBSYSTEM::NDR_FRSRPC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_FRSRPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_frsrpc.o +NDR_FRSRPC_OBJ_FILES = ../librpc/gen_ndr/ndr_frsrpc.o [SUBSYSTEM::NDR_FRSAPI] PUBLIC_DEPENDENCIES = LIBNDR -NDR_FRSAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_frsapi.o +NDR_FRSAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_frsapi.o [SUBSYSTEM::NDR_DRSUAPI] PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_SAMR ASN1_UTIL -NDR_DRSUAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_drsuapi.o ../librpc/ndr/ndr_drsuapi.o +NDR_DRSUAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_drsuapi.o ../librpc/ndr/ndr_drsuapi.o [SUBSYSTEM::NDR_DRSBLOBS] PUBLIC_DEPENDENCIES = LIBNDR NDR_DRSUAPI -NDR_DRSBLOBS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_drsblobs.o ../librpc/ndr/ndr_drsblobs.o +NDR_DRSBLOBS_OBJ_FILES = ../librpc/gen_ndr/ndr_drsblobs.o ../librpc/ndr/ndr_drsblobs.o [SUBSYSTEM::NDR_SASL_HELPERS] PUBLIC_DEPENDENCIES = LIBNDR @@ -154,17 +154,17 @@ NDR_SASL_HELPERS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_sasl_helpers.o [SUBSYSTEM::NDR_POLICYAGENT] PUBLIC_DEPENDENCIES = LIBNDR -NDR_POLICYAGENT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_policyagent.o +NDR_POLICYAGENT_OBJ_FILES = ../librpc/gen_ndr/ndr_policyagent.o [SUBSYSTEM::NDR_UNIXINFO] PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY -NDR_UNIXINFO_OBJ_FILES = $(gen_ndrsrcdir)/ndr_unixinfo.o +NDR_UNIXINFO_OBJ_FILES = ../librpc/gen_ndr/ndr_unixinfo.o [SUBSYSTEM::NDR_SAMR] PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA NDR_SECURITY -NDR_SAMR_OBJ_FILES = $(gen_ndrsrcdir)/ndr_samr.o +NDR_SAMR_OBJ_FILES = ../librpc/gen_ndr/ndr_samr.o PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/ndr_samr_c.h) @@ -176,7 +176,7 @@ NDR_NFS4ACL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_nfs4acl.o [SUBSYSTEM::NDR_SPOOLSS] PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY -NDR_SPOOLSS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_spoolss.o +NDR_SPOOLSS_OBJ_FILES = ../librpc/gen_ndr/ndr_spoolss.o [SUBSYSTEM::NDR_SPOOLSS_BUF] @@ -187,51 +187,51 @@ $(eval $(call proto_header_template,$(ndrsrcdir)/ndr_spoolss_buf.h,$(NDR_SPOOLSS [SUBSYSTEM::NDR_WKSSVC] PUBLIC_DEPENDENCIES = LIBNDR NDR_SRVSVC NDR_SECURITY -NDR_WKSSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wkssvc.o +NDR_WKSSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wkssvc.o [SUBSYSTEM::NDR_SRVSVC] PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL NDR_SECURITY -NDR_SRVSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_srvsvc.o +NDR_SRVSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_srvsvc.o [SUBSYSTEM::NDR_SVCCTL] PUBLIC_DEPENDENCIES = LIBNDR -NDR_SVCCTL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_svcctl.o +NDR_SVCCTL_OBJ_FILES = ../librpc/gen_ndr/ndr_svcctl.o PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h) [SUBSYSTEM::NDR_ATSVC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_ATSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_atsvc.o +NDR_ATSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_atsvc.o -PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h) +PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr, atsvc.h ndr_atsvc.h) [SUBSYSTEM::NDR_EVENTLOG] PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA -NDR_EVENTLOG_OBJ_FILES = $(gen_ndrsrcdir)/ndr_eventlog.o +NDR_EVENTLOG_OBJ_FILES = ../librpc/gen_ndr/ndr_eventlog.o [SUBSYSTEM::NDR_EPMAPPER] PUBLIC_DEPENDENCIES = LIBNDR -NDR_EPMAPPER_OBJ_FILES = $(gen_ndrsrcdir)/ndr_epmapper.o +NDR_EPMAPPER_OBJ_FILES = ../librpc/gen_ndr/ndr_epmapper.o [SUBSYSTEM::NDR_DBGIDL] PUBLIC_DEPENDENCIES = LIBNDR -NDR_DBGIDL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dbgidl.o +NDR_DBGIDL_OBJ_FILES = ../librpc/gen_ndr/ndr_dbgidl.o [SUBSYSTEM::NDR_DSSETUP] PUBLIC_DEPENDENCIES = LIBNDR -NDR_DSSETUP_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dssetup.o +NDR_DSSETUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dssetup.o [SUBSYSTEM::NDR_MSGSVC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_MSGSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_msgsvc.o +NDR_MSGSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_msgsvc.o [SUBSYSTEM::NDR_WINS] PUBLIC_DEPENDENCIES = LIBNDR @@ -241,89 +241,89 @@ NDR_WINS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wins.o [SUBSYSTEM::NDR_WINREG] PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN NDR_SECURITY -NDR_WINREG_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winreg.o +NDR_WINREG_OBJ_FILES = ../librpc/gen_ndr/ndr_winreg.o [SUBSYSTEM::NDR_INITSHUTDOWN] PUBLIC_DEPENDENCIES = LIBNDR -NDR_INITSHUTDOWN_OBJ_FILES = $(gen_ndrsrcdir)/ndr_initshutdown.o +NDR_INITSHUTDOWN_OBJ_FILES = ../librpc/gen_ndr/ndr_initshutdown.o [SUBSYSTEM::NDR_MGMT] PUBLIC_DEPENDENCIES = LIBNDR -NDR_MGMT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_mgmt.o +NDR_MGMT_OBJ_FILES = ../librpc/gen_ndr/ndr_mgmt.o [SUBSYSTEM::NDR_PROTECTED_STORAGE] PUBLIC_DEPENDENCIES = LIBNDR -NDR_PROTECTED_STORAGE_OBJ_FILES = $(gen_ndrsrcdir)/ndr_protected_storage.o +NDR_PROTECTED_STORAGE_OBJ_FILES = ../librpc/gen_ndr/ndr_protected_storage.o [SUBSYSTEM::NDR_ORPC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_ORPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_orpc.o ../librpc/ndr/ndr_orpc.o +NDR_ORPC_OBJ_FILES = ../librpc/gen_ndr/ndr_orpc.o ../librpc/ndr/ndr_orpc.o [SUBSYSTEM::NDR_OXIDRESOLVER] PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC -NDR_OXIDRESOLVER_OBJ_FILES = $(gen_ndrsrcdir)/ndr_oxidresolver.o +NDR_OXIDRESOLVER_OBJ_FILES = ../librpc/gen_ndr/ndr_oxidresolver.o [SUBSYSTEM::NDR_REMACT] PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC -NDR_REMACT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_remact.o +NDR_REMACT_OBJ_FILES = ../librpc/gen_ndr/ndr_remact.o [SUBSYSTEM::NDR_WZCSVC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_WZCSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wzcsvc.o +NDR_WZCSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wzcsvc.o [SUBSYSTEM::NDR_BROWSER] PUBLIC_DEPENDENCIES = LIBNDR -NDR_BROWSER_OBJ_FILES = $(gen_ndrsrcdir)/ndr_browser.o +NDR_BROWSER_OBJ_FILES = ../librpc/gen_ndr/ndr_browser.o [SUBSYSTEM::NDR_W32TIME] PUBLIC_DEPENDENCIES = LIBNDR -NDR_W32TIME_OBJ_FILES = $(gen_ndrsrcdir)/ndr_w32time.o +NDR_W32TIME_OBJ_FILES = ../librpc/gen_ndr/ndr_w32time.o [SUBSYSTEM::NDR_SCERPC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_SCERPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_scerpc.o +NDR_SCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_scerpc.o [SUBSYSTEM::NDR_NTSVCS] PUBLIC_DEPENDENCIES = LIBNDR -NDR_NTSVCS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_ntsvcs.o +NDR_NTSVCS_OBJ_FILES = ../librpc/gen_ndr/ndr_ntsvcs.o [SUBSYSTEM::NDR_NETLOGON] PUBLIC_DEPENDENCIES = LIBNDR NDR_SAMR NDR_LSA NDR_SECURITY -NDR_NETLOGON_OBJ_FILES = $(gen_ndrsrcdir)/ndr_netlogon.o ../librpc/ndr/ndr_netlogon.o +NDR_NETLOGON_OBJ_FILES = ../librpc/gen_ndr/ndr_netlogon.o ../librpc/ndr/ndr_netlogon.o -PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/netlogon.h) +PUBLIC_HEADERS += ../librpc/gen_ndr/netlogon.h [SUBSYSTEM::NDR_TRKWKS] PUBLIC_DEPENDENCIES = LIBNDR -NDR_TRKWKS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_trkwks.o +NDR_TRKWKS_OBJ_FILES = ../librpc/gen_ndr/ndr_trkwks.o [SUBSYSTEM::NDR_KEYSVC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_KEYSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_keysvc.o +NDR_KEYSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_keysvc.o [SUBSYSTEM::NDR_KRB5PAC] PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON NDR_SECURITY -NDR_KRB5PAC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_krb5pac.o ../librpc/ndr/ndr_krb5pac.o +NDR_KRB5PAC_OBJ_FILES = ../librpc/gen_ndr/ndr_krb5pac.o ../librpc/ndr/ndr_krb5pac.o [SUBSYSTEM::NDR_XATTR] PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY -NDR_XATTR_OBJ_FILES = $(gen_ndrsrcdir)/ndr_xattr.o +NDR_XATTR_OBJ_FILES = ../librpc/gen_ndr/ndr_xattr.o [SUBSYSTEM::NDR_OPENDB] PUBLIC_DEPENDENCIES = LIBNDR @@ -343,9 +343,9 @@ NDR_SCHANNEL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_schannel.o [SUBSYSTEM::NDR_NBT] PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY NDR_SAMR LIBCLI_NDR_NETLOGON -NDR_NBT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_nbt.o +NDR_NBT_OBJ_FILES = ../librpc/gen_ndr/ndr_nbt.o -PUBLIC_HEADERS += $(gen_ndrsrcdir)/nbt.h +PUBLIC_HEADERS += ../librpc/gen_ndr/nbt.h [SUBSYSTEM::NDR_NTP_SIGND] PUBLIC_DEPENDENCIES = LIBNDR @@ -395,62 +395,62 @@ NDR_TABLE_OBJ_FILES = ../librpc/ndr/ndr_table.o $(gen_ndrsrcdir)/tables.o [SUBSYSTEM::RPC_NDR_ROT] PUBLIC_DEPENDENCIES = NDR_ROT dcerpc -RPC_NDR_ROT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_rot_c.o +RPC_NDR_ROT_OBJ_FILES = ../librpc/gen_ndr/ndr_rot_c.o [SUBSYSTEM::RPC_NDR_AUDIOSRV] PUBLIC_DEPENDENCIES = NDR_AUDIOSRV dcerpc -RPC_NDR_AUDIOSRV_OBJ_FILES = $(gen_ndrsrcdir)/ndr_audiosrv_c.o +RPC_NDR_AUDIOSRV_OBJ_FILES = ../librpc/gen_ndr/ndr_audiosrv_c.o [SUBSYSTEM::RPC_NDR_ECHO] PUBLIC_DEPENDENCIES = dcerpc NDR_ECHO -RPC_NDR_ECHO_OBJ_FILES = $(gen_ndrsrcdir)/ndr_echo_c.o +RPC_NDR_ECHO_OBJ_FILES = ../librpc/gen_ndr/ndr_echo_c.o [SUBSYSTEM::RPC_NDR_DSBACKUP] PUBLIC_DEPENDENCIES = dcerpc NDR_DSBACKUP -RPC_NDR_DSBACKUP_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dsbackup_c.o +RPC_NDR_DSBACKUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dsbackup_c.o [SUBSYSTEM::RPC_NDR_EFS] PUBLIC_DEPENDENCIES = dcerpc NDR_EFS -RPC_NDR_EFS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_efs_c.o +RPC_NDR_EFS_OBJ_FILES = ../librpc/gen_ndr/ndr_efs_c.o [SUBSYSTEM::RPC_NDR_LSA] PUBLIC_DEPENDENCIES = dcerpc NDR_LSA -RPC_NDR_LSA_OBJ_FILES = $(gen_ndrsrcdir)/ndr_lsa_c.o +RPC_NDR_LSA_OBJ_FILES = ../librpc/gen_ndr/ndr_lsa_c.o [SUBSYSTEM::RPC_NDR_DFS] PUBLIC_DEPENDENCIES = dcerpc NDR_DFS -RPC_NDR_DFS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dfs_c.o +RPC_NDR_DFS_OBJ_FILES = ../librpc/gen_ndr/ndr_dfs_c.o [SUBSYSTEM::RPC_NDR_FRSAPI] PUBLIC_DEPENDENCIES = dcerpc NDR_FRSAPI -RPC_NDR_FRSAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_frsapi_c.o +RPC_NDR_FRSAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_frsapi_c.o [SUBSYSTEM::RPC_NDR_DRSUAPI] PUBLIC_DEPENDENCIES = dcerpc NDR_DRSUAPI -RPC_NDR_DRSUAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_drsuapi_c.o +RPC_NDR_DRSUAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_drsuapi_c.o [SUBSYSTEM::RPC_NDR_POLICYAGENT] PUBLIC_DEPENDENCIES = dcerpc NDR_POLICYAGENT -RPC_NDR_POLICYAGENT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_policyagent_c.o +RPC_NDR_POLICYAGENT_OBJ_FILES = ../librpc/gen_ndr/ndr_policyagent_c.o [SUBSYSTEM::RPC_NDR_UNIXINFO] PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO -RPC_NDR_UNIXINFO_OBJ_FILES = $(gen_ndrsrcdir)/ndr_unixinfo_c.o +RPC_NDR_UNIXINFO_OBJ_FILES = ../librpc/gen_ndr/ndr_unixinfo_c.o [SUBSYSTEM::RPC_NDR_BROWSER] PUBLIC_DEPENDENCIES = dcerpc NDR_BROWSER -RPC_NDR_BROWSER_OBJ_FILES = $(gen_ndrsrcdir)/ndr_browser_c.o +RPC_NDR_BROWSER_OBJ_FILES = ../librpc/gen_ndr/ndr_browser_c.o [SUBSYSTEM::RPC_NDR_IRPC] PUBLIC_DEPENDENCIES = dcerpc NDR_IRPC @@ -464,29 +464,29 @@ PC_FILES += $(librpcsrcdir)/dcerpc_samr.pc dcerpc_samr_VERSION = 0.0.1 dcerpc_samr_SOVERSION = 0 -dcerpc_samr_OBJ_FILES = $(gen_ndrsrcdir)/ndr_samr_c.o +dcerpc_samr_OBJ_FILES = ../librpc/gen_ndr/ndr_samr_c.o [SUBSYSTEM::RPC_NDR_SPOOLSS] PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS -RPC_NDR_SPOOLSS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_spoolss_c.o +RPC_NDR_SPOOLSS_OBJ_FILES = ../librpc/gen_ndr/ndr_spoolss_c.o [SUBSYSTEM::RPC_NDR_WKSSVC] PUBLIC_DEPENDENCIES = dcerpc NDR_WKSSVC -RPC_NDR_WKSSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wkssvc_c.o +RPC_NDR_WKSSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wkssvc_c.o [SUBSYSTEM::RPC_NDR_SRVSVC] PUBLIC_DEPENDENCIES = dcerpc NDR_SRVSVC -RPC_NDR_SRVSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_srvsvc_c.o +RPC_NDR_SRVSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_srvsvc_c.o [SUBSYSTEM::RPC_NDR_SVCCTL] PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL -RPC_NDR_SVCCTL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_svcctl_c.o +RPC_NDR_SVCCTL_OBJ_FILES = ../librpc/gen_ndr/ndr_svcctl_c.o -PUBLIC_HEADERS += $(gen_ndrsrcdir)/ndr_svcctl_c.h +PUBLIC_HEADERS += ../librpc/gen_ndr/ndr_svcctl_c.h [LIBRARY::dcerpc_atsvc] PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC @@ -494,35 +494,35 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC dcerpc_atsvc_VERSION = 0.0.1 dcerpc_atsvc_SOVERSION = 0 -dcerpc_atsvc_OBJ_FILES = $(gen_ndrsrcdir)/ndr_atsvc_c.o +dcerpc_atsvc_OBJ_FILES = ../librpc/gen_ndr/ndr_atsvc_c.o PC_FILES += $(librpcsrcdir)/dcerpc_atsvc.pc -PUBLIC_HEADERS += $(gen_ndrsrcdir)/ndr_atsvc_c.h +PUBLIC_HEADERS += ../librpc/gen_ndr/ndr_atsvc_c.h [SUBSYSTEM::RPC_NDR_EVENTLOG] PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG -RPC_NDR_EVENTLOG_OBJ_FILES = $(gen_ndrsrcdir)/ndr_eventlog_c.o +RPC_NDR_EVENTLOG_OBJ_FILES = ../librpc/gen_ndr/ndr_eventlog_c.o [SUBSYSTEM::RPC_NDR_EPMAPPER] PUBLIC_DEPENDENCIES = NDR_EPMAPPER -RPC_NDR_EPMAPPER_OBJ_FILES = $(gen_ndrsrcdir)/ndr_epmapper_c.o +RPC_NDR_EPMAPPER_OBJ_FILES = ../librpc/gen_ndr/ndr_epmapper_c.o [SUBSYSTEM::RPC_NDR_DBGIDL] PUBLIC_DEPENDENCIES = dcerpc NDR_DBGIDL -RPC_NDR_DBGIDL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dbgidl_c.o +RPC_NDR_DBGIDL_OBJ_FILES = ../librpc/gen_ndr/ndr_dbgidl_c.o [SUBSYSTEM::RPC_NDR_DSSETUP] PUBLIC_DEPENDENCIES = dcerpc NDR_DSSETUP -RPC_NDR_DSSETUP_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dssetup_c.o +RPC_NDR_DSSETUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dssetup_c.o [SUBSYSTEM::RPC_NDR_MSGSVC] PUBLIC_DEPENDENCIES = dcerpc NDR_MSGSVC -RPC_NDR_MSGSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_msgsvc_c.o +RPC_NDR_MSGSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_msgsvc_c.o [SUBSYSTEM::RPC_NDR_WINS] PUBLIC_DEPENDENCIES = dcerpc NDR_WINS @@ -532,67 +532,67 @@ RPC_NDR_WINS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wins_c.o [SUBSYSTEM::RPC_NDR_WINREG] PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG -RPC_NDR_WINREG_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winreg_c.o +RPC_NDR_WINREG_OBJ_FILES = ../librpc/gen_ndr/ndr_winreg_c.o [SUBSYSTEM::RPC_NDR_INITSHUTDOWN] PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN -RPC_NDR_INITSHUTDOWN_OBJ_FILES = $(gen_ndrsrcdir)/ndr_initshutdown_c.o +RPC_NDR_INITSHUTDOWN_OBJ_FILES = ../librpc/gen_ndr/ndr_initshutdown_c.o [SUBSYSTEM::RPC_NDR_MGMT] PRIVATE_DEPENDENCIES = NDR_MGMT -RPC_NDR_MGMT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_mgmt_c.o +RPC_NDR_MGMT_OBJ_FILES = ../librpc/gen_ndr/ndr_mgmt_c.o [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE] PUBLIC_DEPENDENCIES = dcerpc NDR_PROTECTED_STORAGE -RPC_NDR_PROTECTED_STORAGE_OBJ_FILES = $(gen_ndrsrcdir)/ndr_protected_storage_c.o +RPC_NDR_PROTECTED_STORAGE_OBJ_FILES = ../librpc/gen_ndr/ndr_protected_storage_c.o [SUBSYSTEM::RPC_NDR_OXIDRESOLVER] PUBLIC_DEPENDENCIES = dcerpc NDR_OXIDRESOLVER -RPC_NDR_OXIDRESOLVER_OBJ_FILES = $(gen_ndrsrcdir)/ndr_oxidresolver_c.o +RPC_NDR_OXIDRESOLVER_OBJ_FILES = ../librpc/gen_ndr/ndr_oxidresolver_c.o [SUBSYSTEM::RPC_NDR_REMACT] PUBLIC_DEPENDENCIES = dcerpc NDR_REMACT -RPC_NDR_REMACT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_remact_c.o +RPC_NDR_REMACT_OBJ_FILES = ../librpc/gen_ndr/ndr_remact_c.o [SUBSYSTEM::RPC_NDR_WZCSVC] PUBLIC_DEPENDENCIES = dcerpc NDR_WZCSVC -RPC_NDR_WZCSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wzcsvc_c.o +RPC_NDR_WZCSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wzcsvc_c.o [SUBSYSTEM::RPC_NDR_W32TIME] PUBLIC_DEPENDENCIES = dcerpc NDR_W32TIME -RPC_NDR_W32TIME_OBJ_FILES = $(gen_ndrsrcdir)/ndr_w32time_c.o +RPC_NDR_W32TIME_OBJ_FILES = ../librpc/gen_ndr/ndr_w32time_c.o [SUBSYSTEM::RPC_NDR_SCERPC] PUBLIC_DEPENDENCIES = dcerpc NDR_SCERPC -RPC_NDR_SCERPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_scerpc_c.o +RPC_NDR_SCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_scerpc_c.o [SUBSYSTEM::RPC_NDR_NTSVCS] PUBLIC_DEPENDENCIES = dcerpc NDR_NTSVCS -RPC_NDR_NTSVCS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_ntsvcs_c.o +RPC_NDR_NTSVCS_OBJ_FILES = ../librpc/gen_ndr/ndr_ntsvcs_c.o [SUBSYSTEM::RPC_NDR_NETLOGON] PUBLIC_DEPENDENCIES = NDR_NETLOGON -RPC_NDR_NETLOGON_OBJ_FILES = $(gen_ndrsrcdir)/ndr_netlogon_c.o +RPC_NDR_NETLOGON_OBJ_FILES = ../librpc/gen_ndr/ndr_netlogon_c.o [SUBSYSTEM::RPC_NDR_TRKWKS] PUBLIC_DEPENDENCIES = dcerpc NDR_TRKWKS -RPC_NDR_TRKWKS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_trkwks_c.o +RPC_NDR_TRKWKS_OBJ_FILES = ../librpc/gen_ndr/ndr_trkwks_c.o [SUBSYSTEM::RPC_NDR_KEYSVC] PUBLIC_DEPENDENCIES = dcerpc NDR_KEYSVC -RPC_NDR_KEYSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_keysvc_c.o +RPC_NDR_KEYSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_keysvc_c.o [SUBSYSTEM::NDR_DCERPC] PUBLIC_DEPENDENCIES = LIBNDR @@ -644,85 +644,85 @@ $(eval $(call python_py_module_template,samba/dcerpc/__init__.py,$(dcerpcsrcdir) LIBRARY_REALNAME = samba/dcerpc/echo.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_ECHO PYTALLOC param swig_credentials python_dcerpc -python_echo_OBJ_FILES = $(gen_ndrsrcdir)/py_echo.o +python_echo_OBJ_FILES = ../librpc/gen_ndr/py_echo.o [PYTHON::python_winreg] LIBRARY_REALNAME = samba/dcerpc/winreg.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_WINREG python_misc PYTALLOC param swig_credentials python_dcerpc_misc python_lsa python_dcerpc -python_winreg_OBJ_FILES = $(gen_ndrsrcdir)/py_winreg.o +python_winreg_OBJ_FILES = ../librpc/gen_ndr/py_winreg.o [PYTHON::python_dcerpc_misc] LIBRARY_REALNAME = samba/dcerpc/misc.$(SHLIBEXT) PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc -python_dcerpc_misc_OBJ_FILES = $(gen_ndrsrcdir)/py_misc.o +python_dcerpc_misc_OBJ_FILES = ../librpc/gen_ndr/py_misc.o [PYTHON::python_initshutdown] LIBRARY_REALNAME = samba/dcerpc/initshutdown.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_INITSHUTDOWN PYTALLOC param swig_credentials python_lsa python_dcerpc_security python_dcerpc -python_initshutdown_OBJ_FILES = $(gen_ndrsrcdir)/py_initshutdown.o +python_initshutdown_OBJ_FILES = ../librpc/gen_ndr/py_initshutdown.o [PYTHON::python_epmapper] LIBRARY_REALNAME = samba/dcerpc/epmapper.$(SHLIBEXT) PRIVATE_DEPENDENCIES = dcerpc PYTALLOC param swig_credentials python_dcerpc_misc python_dcerpc -python_epmapper_OBJ_FILES = $(gen_ndrsrcdir)/py_epmapper.o +python_epmapper_OBJ_FILES = ../librpc/gen_ndr/py_epmapper.o [PYTHON::python_mgmt] LIBRARY_REALNAME = samba/dcerpc/mgmt.$(SHLIBEXT) PRIVATE_DEPENDENCIES = PYTALLOC param swig_credentials dcerpc python_dcerpc_misc python_dcerpc -python_mgmt_OBJ_FILES = $(gen_ndrsrcdir)/py_mgmt.o +python_mgmt_OBJ_FILES = ../librpc/gen_ndr/py_mgmt.o [PYTHON::python_atsvc] LIBRARY_REALNAME = samba/dcerpc/atsvc.$(SHLIBEXT) PRIVATE_DEPENDENCIES = dcerpc_atsvc PYTALLOC param swig_credentials python_dcerpc -python_atsvc_OBJ_FILES = $(gen_ndrsrcdir)/py_atsvc.o +python_atsvc_OBJ_FILES = ../librpc/gen_ndr/py_atsvc.o [PYTHON::python_dcerpc_nbt] LIBRARY_REALNAME = samba/nbt.$(SHLIBEXT) PRIVATE_DEPENDENCIES = NDR_NBT PYTALLOC param swig_credentials python_dcerpc python_dcerpc_misc python_dcerpc_security -python_dcerpc_nbt_OBJ_FILES = $(gen_ndrsrcdir)/py_nbt.o +python_dcerpc_nbt_OBJ_FILES = ../librpc/gen_ndr/py_nbt.o [PYTHON::python_samr] LIBRARY_REALNAME = samba/dcerpc/samr.$(SHLIBEXT) PRIVATE_DEPENDENCIES = dcerpc_samr PYTALLOC python_dcerpc_security python_lsa python_dcerpc_misc swig_credentials param python_dcerpc -python_samr_OBJ_FILES = $(gen_ndrsrcdir)/py_samr.o +python_samr_OBJ_FILES = ../librpc/gen_ndr/py_samr.o [PYTHON::python_svcctl] LIBRARY_REALNAME = samba/dcerpc/svcctl.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_SVCCTL PYTALLOC param swig_credentials python_dcerpc_misc python_dcerpc -python_svcctl_OBJ_FILES = $(gen_ndrsrcdir)/py_svcctl.o +python_svcctl_OBJ_FILES = ../librpc/gen_ndr/py_svcctl.o [PYTHON::python_lsa] LIBRARY_REALNAME = samba/dcerpc/lsa.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_LSA PYTALLOC param swig_credentials python_dcerpc_security python_dcerpc -python_lsa_OBJ_FILES = $(gen_ndrsrcdir)/py_lsa.o +python_lsa_OBJ_FILES = ../librpc/gen_ndr/py_lsa.o [PYTHON::python_wkssvc] LIBRARY_REALNAME = samba/dcerpc/wkssvc.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_WKSSVC PYTALLOC param swig_credentials python_lsa python_dcerpc_security python_dcerpc -python_wkssvc_OBJ_FILES = $(gen_ndrsrcdir)/py_wkssvc.o +python_wkssvc_OBJ_FILES = ../librpc/gen_ndr/py_wkssvc.o [PYTHON::python_dfs] LIBRARY_REALNAME = samba/dcerpc/dfs.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_DFS PYTALLOC param swig_credentials python_dcerpc_misc python_dcerpc -python_dfs_OBJ_FILES = $(gen_ndrsrcdir)/py_dfs.o +python_dfs_OBJ_FILES = ../librpc/gen_ndr/py_dfs.o [PYTHON::python_unixinfo] LIBRARY_REALNAME = samba/dcerpc/unixinfo.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO PYTALLOC param swig_credentials python_dcerpc_security python_dcerpc_misc python_dcerpc -python_unixinfo_OBJ_FILES = $(gen_ndrsrcdir)/py_unixinfo.o +python_unixinfo_OBJ_FILES = ../librpc/gen_ndr/py_unixinfo.o [PYTHON::python_irpc] LIBRARY_REALNAME = samba/irpc.$(SHLIBEXT) @@ -734,13 +734,13 @@ python_irpc_OBJ_FILES = $(gen_ndrsrcdir)/py_irpc.o LIBRARY_REALNAME = samba/dcerpc/drsuapi.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI PYTALLOC param swig_credentials python_dcerpc_misc python_dcerpc_security python_dcerpc -python_drsuapi_OBJ_FILES = $(gen_ndrsrcdir)/py_drsuapi.o +python_drsuapi_OBJ_FILES = ../librpc/gen_ndr/py_drsuapi.o [PYTHON::python_dcerpc_security] LIBRARY_REALNAME = samba/dcerpc/security.$(SHLIBEXT) PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc_misc python_dcerpc -python_dcerpc_security_OBJ_FILES = $(gen_ndrsrcdir)/py_security.o +python_dcerpc_security_OBJ_FILES = ../librpc/gen_ndr/py_security.o $(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \ $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \ @@ -748,9 +748,11 @@ $(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \ $(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl idl_full:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm - @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/gen_ndr $(IDL_FILES) + @PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" srcdir="$(srcdir)" PIDL="$(PIDL)" ../librpc/build_idl.sh --full ../librpc/idl/*.idl + @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl idl:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm - @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(IDL_FILES) + @PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" srcdir="$(srcdir)" PIDL="$(PIDL)" ../librpc/build_idl.sh ../librpc/idl/*.idl + @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl diff --git a/source4/librpc/idl-deps.pl b/source4/librpc/idl-deps.pl index 44990c5196..4d97139fc5 100755..100644 --- a/source4/librpc/idl-deps.pl +++ b/source4/librpc/idl-deps.pl @@ -1,25 +1,37 @@ #!/usr/bin/perl use strict; +use File::Basename; + +sub add($$) +{ + my ($name, $val) = @_; + + print "$name += $val\n"; +} my %vars = (); foreach(@ARGV) { my $f = $_; - my $b = $_; $b =~ s/.*\/(.*?).idl$/$1/; - push (@{$vars{IDL_FILES}}, $f); - push (@{$vars{IDL_HEADER_FILES}}, "\$(librpcsrcdir)/gen_ndr/$b.h"); - push (@{$vars{IDL_NDR_PARSE_H_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.h"); - push (@{$vars{IDL_NDR_PARSE_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.c"); - push (@{$vars{IDL_NDR_CLIENT_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b\_c.c"); - push (@{$vars{IDL_NDR_CLIENT_H_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b\_c.h"); - push (@{$vars{IDL_SWIG_FILES}}, "\$(librpcsrcdir)/gen_ndr/$b.i"); - push (@{$vars{IDL_NDR_SERVER_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b\_s.c"); - push (@{$vars{IDL_NDR_EJS_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b\_ejs.c"); - push (@{$vars{IDL_NDR_EJS_H_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b\_ejs.h"); - push (@{$vars{IDL_NDR_PY_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/py_$b.c"); - push (@{$vars{IDL_NDR_PY_H_FILES}}, "\$(librpcsrcdir)/gen_ndr/py_$b.h"); -} + my $b = basename($f); + + $b =~ s/\.idl//; + + my $gen_ndr = dirname($f); + $gen_ndr =~ s/\/idl$/\/gen_ndr/; -foreach (keys %vars) { - print "$_ = " . join (' ', @{$vars{$_}}) . "\n"; + print "# $f\n"; + add("IDL_FILES", $f); + add("IDL_HEADER_FILES", "$gen_ndr/$b.h"); + add("IDL_NDR_PARSE_H_FILES", "$gen_ndr/ndr_$b.h"); + add("IDL_NDR_PARSE_C_FILES", "$gen_ndr/ndr_$b.c"); + add("IDL_NDR_CLIENT_C_FILES", "$gen_ndr/ndr_$b\_c.c"); + add("IDL_NDR_CLIENT_H_FILES", "$gen_ndr/ndr_$b\_c.h"); + add("IDL_SWIG_FILES", "$gen_ndr/$b.i"); + add("IDL_NDR_SERVER_C_FILES", "$gen_ndr/ndr_$b\_s.c"); + add("IDL_NDR_EJS_C_FILES", "$gen_ndr/ndr_$b\_ejs.c"); + add("IDL_NDR_EJS_H_FILES", "$gen_ndr/ndr_$b\_ejs.h"); + add("IDL_NDR_PY_C_FILES", "$gen_ndr/py_$b.c"); + add("IDL_NDR_PY_H_FILES", "$gen_ndr/py_$b.h"); + print "\n"; } diff --git a/source4/librpc/scripts/build_idl.sh b/source4/librpc/scripts/build_idl.sh index 230939bb48..714f6d1f6a 100755 --- a/source4/librpc/scripts/build_idl.sh +++ b/source4/librpc/scripts/build_idl.sh @@ -7,7 +7,7 @@ IDL_FILES="$*" [ -d $OUTDIR ] || mkdir -p $OUTDIR || exit 1 -PIDL="$PIDL --outputdir $OUTDIR --header --ndr-parser --server --client --swig --python --dcom-proxy --com-header --includedir ../librpc/idl -- " +PIDL="$PIDL --outputdir $OUTDIR --header --ndr-parser --server --client --python --dcom-proxy --com-header --includedir ../librpc/idl -- " if [ x$FULLBUILD = xFULL ]; then echo Rebuilding all idl files in $IDLDIR diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index 02edb306b3..8e334f4539 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -48,9 +48,9 @@ static bool test_RemoteActivation(struct torture_context *tctx, } ZERO_STRUCT(r.in); - r.in.this.version.MajorVersion = 5; - r.in.this.version.MinorVersion = 1; - r.in.this.cid = GUID_random(); + r.in.this_object.version.MajorVersion = 5; + r.in.this_object.version.MinorVersion = 1; + r.in.this_object.cid = GUID_random(); GUID_from_string(CLSID_IMAGEDOC, &r.in.Clsid); r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY; r.in.num_protseqs = 3; diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c index 1fc3c1376b..0c5ac09977 100644 --- a/source4/torture/rpc/remact.c +++ b/source4/torture/rpc/remact.c @@ -37,9 +37,9 @@ static bool test_RemoteActivation(struct torture_context *tctx, uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID }; ZERO_STRUCT(r.in); - r.in.this.version.MajorVersion = 5; - r.in.this.version.MinorVersion = 1; - r.in.this.cid = GUID_random(); + r.in.this_object.version.MajorVersion = 5; + r.in.this_object.version.MinorVersion = 1; + r.in.this_object.cid = GUID_random(); GUID_from_string(CLSID_IMAGEDOC, &r.in.Clsid); r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY; r.in.num_protseqs = 3; |