[SCM] Samba Shared Repository - branch master updated - 54dc421f5820099531a77879f52a904c2fefcf49

Jelmer Vernooij jelmer at samba.org
Tue Dec 16 18:53:00 GMT 2008


The branch, master has been updated
       via  54dc421f5820099531a77879f52a904c2fefcf49 (commit)
       via  d59a79e5bb425d260af3261e88422eeaf1f1359c (commit)
       via  f1773a91874863ebb1a64ea24f715342739d2b9a (commit)
       via  e0016b88337268cc91c65fcfb4a2d892fadbfd30 (commit)
       via  53c82ae7a352043a305b865840aaafa1ea4c0d40 (commit)
       via  b5a0c4cefed62fcb67c5f214bed27083a44b012d (commit)
       via  9692c71aa1552a6415bec185706aa7afdf16c288 (commit)
       via  327218f1cfa604058e3a11a64d72b930efc126d2 (commit)
       via  5bf0c0bf9c561d49a9311ad202228ca47822feaa (commit)
       via  4c7293feaed7aca289aee68a6677dc0b629deb24 (commit)
       via  121970d22409dd3686a7082e52682636eb6a133f (commit)
       via  5317dd50c01bb82881e2f641e43574a54c878967 (commit)
      from  4c3aea3f62a76fa62ead66d64941156375fc4501 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 54dc421f5820099531a77879f52a904c2fefcf49
Merge: d59a79e5bb425d260af3261e88422eeaf1f1359c 4c3aea3f62a76fa62ead66d64941156375fc4501
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 19:51:35 2008 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit d59a79e5bb425d260af3261e88422eeaf1f1359c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 19:46:43 2008 +0100

    Use py_* files to check whether generated files are out of date / not
    present.
    
    ndr_*.c files are in git (required for Samba 3), py_*.c files are not.

commit f1773a91874863ebb1a64ea24f715342739d2b9a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 19:43:52 2008 +0100

    Ignore generated files.

commit e0016b88337268cc91c65fcfb4a2d892fadbfd30
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 19:08:36 2008 +0100

    Remove ndrdump - it's available in merged build mode as bin/ndrdump4 and uses the exact same object files there.

commit 53c82ae7a352043a305b865840aaafa1ea4c0d40
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 19:07:02 2008 +0100

    Remove use of C++ keywords.

commit b5a0c4cefed62fcb67c5f214bed27083a44b012d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 18:56:21 2008 +0100

    Share object files for gen_ndr.

commit 9692c71aa1552a6415bec185706aa7afdf16c288
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 18:02:14 2008 +0100

    Make some fatal errors non-fatal. This means we generate invalid code in
    some cases, but we do print errors. We don't use all generated code yet at the
    moment, so this isn't much of a problem.

commit 327218f1cfa604058e3a11a64d72b930efc126d2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 17:42:23 2008 +0100

    Fix [out] pointers in DCOM-related IDL files.

commit 5bf0c0bf9c561d49a9311ad202228ca47822feaa
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 16:48:48 2008 +0100

    Remove pidl SWIG backend; the native Python one works much better, and
    that's also the best way to go for any other languages.

commit 4c7293feaed7aca289aee68a6677dc0b629deb24
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 16:46:13 2008 +0100

    Simplify idl-deps.pl script a bit.

commit 121970d22409dd3686a7082e52682636eb6a133f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 16:37:54 2008 +0100

    Only create (D)COM output files if there were COM objects in the IDL files.

commit 5317dd50c01bb82881e2f641e43574a54c878967
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 16:32:18 2008 +0100

    Add new script for building IDL files in librpc/idl, generating both
    Samba 3 and Samba 4 output.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                |   69 +++++++---
 {source3/script => librpc}/build_idl.sh   |   18 ++-
 librpc/gen_ndr/cli_dfs.c                  |    2 +-
 librpc/gen_ndr/cli_dfs.h                  |    2 +-
 librpc/gen_ndr/cli_drsuapi.c              |    2 +-
 librpc/gen_ndr/cli_drsuapi.h              |    2 +-
 librpc/gen_ndr/cli_dssetup.c              |    2 +-
 librpc/gen_ndr/cli_dssetup.h              |    2 +-
 librpc/gen_ndr/cli_echo.c                 |    2 +-
 librpc/gen_ndr/cli_echo.h                 |    2 +-
 librpc/gen_ndr/cli_epmapper.c             |    2 +-
 librpc/gen_ndr/cli_epmapper.h             |    2 +-
 librpc/gen_ndr/cli_eventlog.c             |    2 +-
 librpc/gen_ndr/cli_eventlog.h             |    2 +-
 librpc/gen_ndr/cli_initshutdown.c         |    2 +-
 librpc/gen_ndr/cli_initshutdown.h         |    2 +-
 librpc/gen_ndr/cli_lsa.c                  |    2 +-
 librpc/gen_ndr/cli_lsa.h                  |    2 +-
 librpc/gen_ndr/cli_netlogon.c             |    2 +-
 librpc/gen_ndr/cli_netlogon.h             |    2 +-
 librpc/gen_ndr/cli_ntsvcs.c               |    2 +-
 librpc/gen_ndr/cli_ntsvcs.h               |    2 +-
 librpc/gen_ndr/cli_samr.c                 |    2 +-
 librpc/gen_ndr/cli_samr.h                 |    2 +-
 librpc/gen_ndr/cli_srvsvc.c               |    2 +-
 librpc/gen_ndr/cli_srvsvc.h               |    2 +-
 librpc/gen_ndr/cli_svcctl.c               |    2 +-
 librpc/gen_ndr/cli_svcctl.h               |    2 +-
 librpc/gen_ndr/cli_winreg.c               |    2 +-
 librpc/gen_ndr/cli_winreg.h               |    2 +-
 librpc/gen_ndr/cli_wkssvc.c               |    2 +-
 librpc/gen_ndr/cli_wkssvc.h               |    2 +-
 librpc/gen_ndr/ndr_dfs.c                  |    2 +-
 librpc/gen_ndr/ndr_dfs.h                  |    2 +-
 librpc/gen_ndr/ndr_drsblobs.c             |    2 +-
 librpc/gen_ndr/ndr_drsblobs.h             |    2 +-
 librpc/gen_ndr/ndr_drsuapi.c              |    2 +-
 librpc/gen_ndr/ndr_drsuapi.h              |    2 +-
 librpc/gen_ndr/ndr_dssetup.c              |    2 +-
 librpc/gen_ndr/ndr_dssetup.h              |    2 +-
 librpc/gen_ndr/ndr_echo.c                 |    2 +-
 librpc/gen_ndr/ndr_echo.h                 |    2 +-
 librpc/gen_ndr/ndr_epmapper.c             |    2 +-
 librpc/gen_ndr/ndr_epmapper.h             |    2 +-
 librpc/gen_ndr/ndr_eventlog.c             |    2 +-
 librpc/gen_ndr/ndr_eventlog.h             |    2 +-
 librpc/gen_ndr/ndr_initshutdown.c         |    2 +-
 librpc/gen_ndr/ndr_initshutdown.h         |    2 +-
 librpc/gen_ndr/ndr_krb5pac.c              |    2 +-
 librpc/gen_ndr/ndr_krb5pac.h              |    2 +-
 librpc/gen_ndr/ndr_lsa.c                  |    2 +-
 librpc/gen_ndr/ndr_lsa.h                  |    2 +-
 librpc/gen_ndr/ndr_misc.c                 |    2 +-
 librpc/gen_ndr/ndr_misc.h                 |    2 +-
 librpc/gen_ndr/ndr_named_pipe_auth.c      |    2 +-
 librpc/gen_ndr/ndr_named_pipe_auth.h      |    2 +-
 librpc/gen_ndr/ndr_nbt.c                  |    2 +-
 librpc/gen_ndr/ndr_nbt.h                  |    2 +-
 librpc/gen_ndr/ndr_netlogon.c             |    4 +-
 librpc/gen_ndr/ndr_netlogon.h             |    2 +-
 librpc/gen_ndr/ndr_ntsvcs.c               |    2 +-
 librpc/gen_ndr/ndr_ntsvcs.h               |    2 +-
 librpc/gen_ndr/ndr_samr.c                 |    2 +-
 librpc/gen_ndr/ndr_samr.h                 |    2 +-
 librpc/gen_ndr/ndr_security.c             |    2 +-
 librpc/gen_ndr/ndr_security.h             |    2 +-
 librpc/gen_ndr/ndr_srvsvc.c               |    2 +-
 librpc/gen_ndr/ndr_srvsvc.h               |    2 +-
 librpc/gen_ndr/ndr_svcctl.c               |    2 +-
 librpc/gen_ndr/ndr_svcctl.h               |    2 +-
 librpc/gen_ndr/ndr_winreg.c               |    2 +-
 librpc/gen_ndr/ndr_winreg.h               |    2 +-
 librpc/gen_ndr/ndr_wkssvc.c               |    2 +-
 librpc/gen_ndr/ndr_wkssvc.h               |    2 +-
 librpc/gen_ndr/ndr_xattr.c                |    2 +-
 librpc/gen_ndr/ndr_xattr.h                |    2 +-
 librpc/gen_ndr/srv_dfs.c                  |    2 +-
 librpc/gen_ndr/srv_dfs.h                  |    2 +-
 librpc/gen_ndr/srv_dssetup.c              |    2 +-
 librpc/gen_ndr/srv_dssetup.h              |    2 +-
 librpc/gen_ndr/srv_echo.c                 |    2 +-
 librpc/gen_ndr/srv_echo.h                 |    2 +-
 librpc/gen_ndr/srv_epmapper.c             |    2 +-
 librpc/gen_ndr/srv_epmapper.h             |    2 +-
 librpc/gen_ndr/srv_eventlog.c             |    2 +-
 librpc/gen_ndr/srv_eventlog.h             |    2 +-
 librpc/gen_ndr/srv_initshutdown.c         |    2 +-
 librpc/gen_ndr/srv_initshutdown.h         |    2 +-
 librpc/gen_ndr/srv_lsa.c                  |    2 +-
 librpc/gen_ndr/srv_lsa.h                  |    2 +-
 librpc/gen_ndr/srv_netlogon.c             |    2 +-
 librpc/gen_ndr/srv_netlogon.h             |    2 +-
 librpc/gen_ndr/srv_ntsvcs.c               |    2 +-
 librpc/gen_ndr/srv_ntsvcs.h               |    2 +-
 librpc/gen_ndr/srv_samr.c                 |    2 +-
 librpc/gen_ndr/srv_samr.h                 |    2 +-
 librpc/gen_ndr/srv_srvsvc.c               |    2 +-
 librpc/gen_ndr/srv_srvsvc.h               |    2 +-
 librpc/gen_ndr/srv_svcctl.c               |    2 +-
 librpc/gen_ndr/srv_svcctl.h               |    2 +-
 librpc/gen_ndr/srv_winreg.c               |    2 +-
 librpc/gen_ndr/srv_winreg.h               |    2 +-
 librpc/gen_ndr/srv_wkssvc.c               |    2 +-
 librpc/gen_ndr/srv_wkssvc.h               |    2 +-
 librpc/idl/dcom.idl                       |   13 +-
 librpc/idl/oxidresolver.idl               |    4 +-
 librpc/idl/remact.idl                     |    2 +-
 {source4/librpc => librpc}/idl/scerpc.idl |    0 
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm   |    8 +-
 pidl/lib/Parse/Pidl/Samba4.pm             |    4 +-
 pidl/lib/Parse/Pidl/Samba4/COM/Header.pm  |    7 +-
 pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm   |    6 +-
 pidl/lib/Parse/Pidl/Samba4/SWIG.pm        |  177 -----------------------
 pidl/pidl                                 |   13 +--
 source3/Makefile.in                       |   34 +----
 source3/samba4.mk                         |    4 +
 source4/lib/ldb/ldb_wrap.c                |    2 +-
 source4/librpc/config.mk                  |  222 +++++++++++++++--------------
 source4/librpc/idl-deps.pl                |   44 ++++--
 source4/librpc/scripts/build_idl.sh       |    2 +-
 source4/torture/rpc/oxidresolve.c         |    6 +-
 source4/torture/rpc/remact.c              |    6 +-
 122 files changed, 351 insertions(+), 496 deletions(-)
 copy {source3/script => librpc}/build_idl.sh (59%)
 rename {source4/librpc => librpc}/idl/scerpc.idl (100%)
 delete mode 100644 pidl/lib/Parse/Pidl/Samba4/SWIG.pm
 mode change 100755 => 100644 source4/librpc/idl-deps.pl


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 4985738..e2f7500 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/source3/script/build_idl.sh b/librpc/build_idl.sh
similarity index 59%
copy from source3/script/build_idl.sh
copy to librpc/build_idl.sh
index 0f49081..ac0fab4 100755
--- a/source3/script/build_idl.sh
+++ b/librpc/build_idl.sh
@@ -1,6 +1,13 @@
 #!/bin/sh
 
-ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client $PIDL_ARGS --"
+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`
@@ -10,6 +17,12 @@ cd ${srcdir}
 
 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
 ##
@@ -17,7 +30,7 @@ PIDL="$PIDL $ARGS"
 list=""
 for f in ${IDL_FILES}; do
 	basename=`basename $f .idl`
-	ndr="$PIDL_OUTPUTDIR/ndr_$basename.c"
+	ndr="$PIDL_OUTPUTDIR/py_$basename.c"
 
 	if [ -f $ndr ]; then
 		if [ "x`find $f -newer $ndr -print`" = "x$f" ]; then
@@ -40,4 +53,3 @@ fi
 cd ${oldpwd}
 
 exit 0
-
diff --git a/librpc/gen_ndr/cli_dfs.c b/librpc/gen_ndr/cli_dfs.c
index 81ec146..d2c9b4f 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 0c86209..9e40a56 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 57d7a25..4063a67 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 ab7375f..65bc26a 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 5526f8d..39abe34 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 e2dca43..e6847c3 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 a775825..f59a191 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 9da13e9..46dd830 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 19673ab..6ef5f9a 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 44884fa..cc1d3a9 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 02d8fb2..cf44141 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 0594a06..a1360cb 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 bc8ca5b..40d7bdf 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 e2eb9da..9a12c5e 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 e7775b1..306206f 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 554182c..8dbd733 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 1ce4e67..39eaf7b 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 3fbc00e..873f519 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 0f97970..0736a02 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 fc4a9f4..c97ced8 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 7edb790..9099d0b 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 b57d633..7bfe71b 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 eb81652..1428d3d 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 44b50e7..f57bf5d 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 9f11a40..3288e4a 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 78c9bf4..fbd15b3 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 17b7281..58eff22 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 fb27bce..a5a5fa2 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 b82e953..628f7f9 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 0d360ab..2427099 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 75a0d4b..6e36cb3 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)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list