Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 15:14:16 +0000 (16:14 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 15:14:16 +0000 (16:14 +0100)
130 files changed:
librpc/gen_ndr/cli_dfs.c [moved from source3/librpc/gen_ndr/cli_dfs.c with 100% similarity]
librpc/gen_ndr/cli_dfs.h [moved from source3/librpc/gen_ndr/cli_dfs.h with 100% similarity]
librpc/gen_ndr/cli_drsuapi.c [moved from source3/librpc/gen_ndr/cli_drsuapi.c with 100% similarity]
librpc/gen_ndr/cli_drsuapi.h [moved from source3/librpc/gen_ndr/cli_drsuapi.h with 100% similarity]
librpc/gen_ndr/cli_dssetup.c [moved from source3/librpc/gen_ndr/cli_dssetup.c with 100% similarity]
librpc/gen_ndr/cli_dssetup.h [moved from source3/librpc/gen_ndr/cli_dssetup.h with 100% similarity]
librpc/gen_ndr/cli_echo.c [moved from source3/librpc/gen_ndr/cli_echo.c with 100% similarity]
librpc/gen_ndr/cli_echo.h [moved from source3/librpc/gen_ndr/cli_echo.h with 100% similarity]
librpc/gen_ndr/cli_epmapper.c [moved from source3/librpc/gen_ndr/cli_epmapper.c with 100% similarity]
librpc/gen_ndr/cli_epmapper.h [moved from source3/librpc/gen_ndr/cli_epmapper.h with 100% similarity]
librpc/gen_ndr/cli_eventlog.c [moved from source3/librpc/gen_ndr/cli_eventlog.c with 100% similarity]
librpc/gen_ndr/cli_eventlog.h [moved from source3/librpc/gen_ndr/cli_eventlog.h with 100% similarity]
librpc/gen_ndr/cli_initshutdown.c [moved from source3/librpc/gen_ndr/cli_initshutdown.c with 100% similarity]
librpc/gen_ndr/cli_initshutdown.h [moved from source3/librpc/gen_ndr/cli_initshutdown.h with 100% similarity]
librpc/gen_ndr/cli_lsa.c [moved from source3/librpc/gen_ndr/cli_lsa.c with 100% similarity]
librpc/gen_ndr/cli_lsa.h [moved from source3/librpc/gen_ndr/cli_lsa.h with 100% similarity]
librpc/gen_ndr/cli_netlogon.c [moved from source3/librpc/gen_ndr/cli_netlogon.c with 100% similarity]
librpc/gen_ndr/cli_netlogon.h [moved from source3/librpc/gen_ndr/cli_netlogon.h with 100% similarity]
librpc/gen_ndr/cli_ntsvcs.c [moved from source3/librpc/gen_ndr/cli_ntsvcs.c with 100% similarity]
librpc/gen_ndr/cli_ntsvcs.h [moved from source3/librpc/gen_ndr/cli_ntsvcs.h with 100% similarity]
librpc/gen_ndr/cli_samr.c [moved from source3/librpc/gen_ndr/cli_samr.c with 100% similarity]
librpc/gen_ndr/cli_samr.h [moved from source3/librpc/gen_ndr/cli_samr.h with 100% similarity]
librpc/gen_ndr/cli_srvsvc.c [moved from source3/librpc/gen_ndr/cli_srvsvc.c with 100% similarity]
librpc/gen_ndr/cli_srvsvc.h [moved from source3/librpc/gen_ndr/cli_srvsvc.h with 100% similarity]
librpc/gen_ndr/cli_svcctl.c [moved from source3/librpc/gen_ndr/cli_svcctl.c with 100% similarity]
librpc/gen_ndr/cli_svcctl.h [moved from source3/librpc/gen_ndr/cli_svcctl.h with 100% similarity]
librpc/gen_ndr/cli_winreg.c [moved from source3/librpc/gen_ndr/cli_winreg.c with 100% similarity]
librpc/gen_ndr/cli_winreg.h [moved from source3/librpc/gen_ndr/cli_winreg.h with 100% similarity]
librpc/gen_ndr/cli_wkssvc.c [moved from source3/librpc/gen_ndr/cli_wkssvc.c with 100% similarity]
librpc/gen_ndr/cli_wkssvc.h [moved from source3/librpc/gen_ndr/cli_wkssvc.h with 100% similarity]
librpc/gen_ndr/dfs.h [moved from source3/librpc/gen_ndr/dfs.h with 100% similarity]
librpc/gen_ndr/drsblobs.h [moved from source3/librpc/gen_ndr/drsblobs.h with 100% similarity]
librpc/gen_ndr/drsuapi.h [moved from source3/librpc/gen_ndr/drsuapi.h with 100% similarity]
librpc/gen_ndr/dssetup.h [moved from source3/librpc/gen_ndr/dssetup.h with 100% similarity]
librpc/gen_ndr/echo.h [moved from source3/librpc/gen_ndr/echo.h with 100% similarity]
librpc/gen_ndr/epmapper.h [moved from source3/librpc/gen_ndr/epmapper.h with 100% similarity]
librpc/gen_ndr/eventlog.h [moved from source3/librpc/gen_ndr/eventlog.h with 100% similarity]
librpc/gen_ndr/initshutdown.h [moved from source3/librpc/gen_ndr/initshutdown.h with 100% similarity]
librpc/gen_ndr/krb5pac.h [moved from source3/librpc/gen_ndr/krb5pac.h with 100% similarity]
librpc/gen_ndr/lsa.h [moved from source3/librpc/gen_ndr/lsa.h with 100% similarity]
librpc/gen_ndr/misc.h [moved from source3/librpc/gen_ndr/misc.h with 100% similarity]
librpc/gen_ndr/named_pipe_auth.h [moved from source3/librpc/gen_ndr/named_pipe_auth.h with 100% similarity]
librpc/gen_ndr/nbt.h [moved from source3/librpc/gen_ndr/nbt.h with 100% similarity]
librpc/gen_ndr/ndr_dfs.c [moved from source3/librpc/gen_ndr/ndr_dfs.c with 100% similarity]
librpc/gen_ndr/ndr_dfs.h [moved from source3/librpc/gen_ndr/ndr_dfs.h with 100% similarity]
librpc/gen_ndr/ndr_drsblobs.c [moved from source3/librpc/gen_ndr/ndr_drsblobs.c with 100% similarity]
librpc/gen_ndr/ndr_drsblobs.h [moved from source3/librpc/gen_ndr/ndr_drsblobs.h with 100% similarity]
librpc/gen_ndr/ndr_drsuapi.c [moved from source3/librpc/gen_ndr/ndr_drsuapi.c with 100% similarity]
librpc/gen_ndr/ndr_drsuapi.h [moved from source3/librpc/gen_ndr/ndr_drsuapi.h with 100% similarity]
librpc/gen_ndr/ndr_dssetup.c [moved from source3/librpc/gen_ndr/ndr_dssetup.c with 100% similarity]
librpc/gen_ndr/ndr_dssetup.h [moved from source3/librpc/gen_ndr/ndr_dssetup.h with 100% similarity]
librpc/gen_ndr/ndr_echo.c [moved from source3/librpc/gen_ndr/ndr_echo.c with 100% similarity]
librpc/gen_ndr/ndr_echo.h [moved from source3/librpc/gen_ndr/ndr_echo.h with 100% similarity]
librpc/gen_ndr/ndr_epmapper.c [moved from source3/librpc/gen_ndr/ndr_epmapper.c with 100% similarity]
librpc/gen_ndr/ndr_epmapper.h [moved from source3/librpc/gen_ndr/ndr_epmapper.h with 100% similarity]
librpc/gen_ndr/ndr_eventlog.c [moved from source3/librpc/gen_ndr/ndr_eventlog.c with 100% similarity]
librpc/gen_ndr/ndr_eventlog.h [moved from source3/librpc/gen_ndr/ndr_eventlog.h with 100% similarity]
librpc/gen_ndr/ndr_initshutdown.c [moved from source3/librpc/gen_ndr/ndr_initshutdown.c with 100% similarity]
librpc/gen_ndr/ndr_initshutdown.h [moved from source3/librpc/gen_ndr/ndr_initshutdown.h with 100% similarity]
librpc/gen_ndr/ndr_krb5pac.c [moved from source3/librpc/gen_ndr/ndr_krb5pac.c with 100% similarity]
librpc/gen_ndr/ndr_krb5pac.h [moved from source3/librpc/gen_ndr/ndr_krb5pac.h with 100% similarity]
librpc/gen_ndr/ndr_lsa.c [moved from source3/librpc/gen_ndr/ndr_lsa.c with 100% similarity]
librpc/gen_ndr/ndr_lsa.h [moved from source3/librpc/gen_ndr/ndr_lsa.h with 100% similarity]
librpc/gen_ndr/ndr_misc.c [moved from source3/librpc/gen_ndr/ndr_misc.c with 100% similarity]
librpc/gen_ndr/ndr_misc.h [moved from source3/librpc/gen_ndr/ndr_misc.h with 100% similarity]
librpc/gen_ndr/ndr_named_pipe_auth.c [moved from source3/librpc/gen_ndr/ndr_named_pipe_auth.c with 100% similarity]
librpc/gen_ndr/ndr_named_pipe_auth.h [moved from source3/librpc/gen_ndr/ndr_named_pipe_auth.h with 100% similarity]
librpc/gen_ndr/ndr_nbt.c [moved from source3/librpc/gen_ndr/ndr_nbt.c with 100% similarity]
librpc/gen_ndr/ndr_nbt.h [moved from source3/librpc/gen_ndr/ndr_nbt.h with 100% similarity]
librpc/gen_ndr/ndr_netlogon.c [moved from source3/librpc/gen_ndr/ndr_netlogon.c with 100% similarity]
librpc/gen_ndr/ndr_netlogon.h [moved from source3/librpc/gen_ndr/ndr_netlogon.h with 100% similarity]
librpc/gen_ndr/ndr_ntsvcs.c [moved from source3/librpc/gen_ndr/ndr_ntsvcs.c with 100% similarity]
librpc/gen_ndr/ndr_ntsvcs.h [moved from source3/librpc/gen_ndr/ndr_ntsvcs.h with 100% similarity]
librpc/gen_ndr/ndr_samr.c [moved from source3/librpc/gen_ndr/ndr_samr.c with 100% similarity]
librpc/gen_ndr/ndr_samr.h [moved from source3/librpc/gen_ndr/ndr_samr.h with 100% similarity]
librpc/gen_ndr/ndr_security.c [moved from source3/librpc/gen_ndr/ndr_security.c with 100% similarity]
librpc/gen_ndr/ndr_security.h [moved from source3/librpc/gen_ndr/ndr_security.h with 100% similarity]
librpc/gen_ndr/ndr_srvsvc.c [moved from source3/librpc/gen_ndr/ndr_srvsvc.c with 100% similarity]
librpc/gen_ndr/ndr_srvsvc.h [moved from source3/librpc/gen_ndr/ndr_srvsvc.h with 100% similarity]
librpc/gen_ndr/ndr_svcctl.c [moved from source3/librpc/gen_ndr/ndr_svcctl.c with 100% similarity]
librpc/gen_ndr/ndr_svcctl.h [moved from source3/librpc/gen_ndr/ndr_svcctl.h with 100% similarity]
librpc/gen_ndr/ndr_winreg.c [moved from source3/librpc/gen_ndr/ndr_winreg.c with 100% similarity]
librpc/gen_ndr/ndr_winreg.h [moved from source3/librpc/gen_ndr/ndr_winreg.h with 100% similarity]
librpc/gen_ndr/ndr_wkssvc.c [moved from source3/librpc/gen_ndr/ndr_wkssvc.c with 100% similarity]
librpc/gen_ndr/ndr_wkssvc.h [moved from source3/librpc/gen_ndr/ndr_wkssvc.h with 100% similarity]
librpc/gen_ndr/ndr_xattr.c [moved from source3/librpc/gen_ndr/ndr_xattr.c with 100% similarity]
librpc/gen_ndr/ndr_xattr.h [moved from source3/librpc/gen_ndr/ndr_xattr.h with 100% similarity]
librpc/gen_ndr/netlogon.h [moved from source3/librpc/gen_ndr/netlogon.h with 100% similarity]
librpc/gen_ndr/ntsvcs.h [moved from source3/librpc/gen_ndr/ntsvcs.h with 100% similarity]
librpc/gen_ndr/samr.h [moved from source3/librpc/gen_ndr/samr.h with 100% similarity]
librpc/gen_ndr/security.h [moved from source3/librpc/gen_ndr/security.h with 100% similarity]
librpc/gen_ndr/srv_dfs.c [moved from source3/librpc/gen_ndr/srv_dfs.c with 100% similarity]
librpc/gen_ndr/srv_dfs.h [moved from source3/librpc/gen_ndr/srv_dfs.h with 100% similarity]
librpc/gen_ndr/srv_dssetup.c [moved from source3/librpc/gen_ndr/srv_dssetup.c with 100% similarity]
librpc/gen_ndr/srv_dssetup.h [moved from source3/librpc/gen_ndr/srv_dssetup.h with 100% similarity]
librpc/gen_ndr/srv_echo.c [moved from source3/librpc/gen_ndr/srv_echo.c with 100% similarity]
librpc/gen_ndr/srv_echo.h [moved from source3/librpc/gen_ndr/srv_echo.h with 100% similarity]
librpc/gen_ndr/srv_epmapper.c [moved from source3/librpc/gen_ndr/srv_epmapper.c with 100% similarity]
librpc/gen_ndr/srv_epmapper.h [moved from source3/librpc/gen_ndr/srv_epmapper.h with 100% similarity]
librpc/gen_ndr/srv_eventlog.c [moved from source3/librpc/gen_ndr/srv_eventlog.c with 100% similarity]
librpc/gen_ndr/srv_eventlog.h [moved from source3/librpc/gen_ndr/srv_eventlog.h with 100% similarity]
librpc/gen_ndr/srv_initshutdown.c [moved from source3/librpc/gen_ndr/srv_initshutdown.c with 100% similarity]
librpc/gen_ndr/srv_initshutdown.h [moved from source3/librpc/gen_ndr/srv_initshutdown.h with 100% similarity]
librpc/gen_ndr/srv_lsa.c [moved from source3/librpc/gen_ndr/srv_lsa.c with 100% similarity]
librpc/gen_ndr/srv_lsa.h [moved from source3/librpc/gen_ndr/srv_lsa.h with 100% similarity]
librpc/gen_ndr/srv_netlogon.c [moved from source3/librpc/gen_ndr/srv_netlogon.c with 100% similarity]
librpc/gen_ndr/srv_netlogon.h [moved from source3/librpc/gen_ndr/srv_netlogon.h with 100% similarity]
librpc/gen_ndr/srv_ntsvcs.c [moved from source3/librpc/gen_ndr/srv_ntsvcs.c with 100% similarity]
librpc/gen_ndr/srv_ntsvcs.h [moved from source3/librpc/gen_ndr/srv_ntsvcs.h with 100% similarity]
librpc/gen_ndr/srv_samr.c [moved from source3/librpc/gen_ndr/srv_samr.c with 100% similarity]
librpc/gen_ndr/srv_samr.h [moved from source3/librpc/gen_ndr/srv_samr.h with 100% similarity]
librpc/gen_ndr/srv_srvsvc.c [moved from source3/librpc/gen_ndr/srv_srvsvc.c with 100% similarity]
librpc/gen_ndr/srv_srvsvc.h [moved from source3/librpc/gen_ndr/srv_srvsvc.h with 100% similarity]
librpc/gen_ndr/srv_svcctl.c [moved from source3/librpc/gen_ndr/srv_svcctl.c with 100% similarity]
librpc/gen_ndr/srv_svcctl.h [moved from source3/librpc/gen_ndr/srv_svcctl.h with 100% similarity]
librpc/gen_ndr/srv_winreg.c [moved from source3/librpc/gen_ndr/srv_winreg.c with 100% similarity]
librpc/gen_ndr/srv_winreg.h [moved from source3/librpc/gen_ndr/srv_winreg.h with 100% similarity]
librpc/gen_ndr/srv_wkssvc.c [moved from source3/librpc/gen_ndr/srv_wkssvc.c with 100% similarity]
librpc/gen_ndr/srv_wkssvc.h [moved from source3/librpc/gen_ndr/srv_wkssvc.h with 100% similarity]
librpc/gen_ndr/srvsvc.h [moved from source3/librpc/gen_ndr/srvsvc.h with 100% similarity]
librpc/gen_ndr/svcctl.h [moved from source3/librpc/gen_ndr/svcctl.h with 100% similarity]
librpc/gen_ndr/tables.c [moved from source3/librpc/gen_ndr/tables.c with 100% similarity]
librpc/gen_ndr/winreg.h [moved from source3/librpc/gen_ndr/winreg.h with 100% similarity]
librpc/gen_ndr/wkssvc.h [moved from source3/librpc/gen_ndr/wkssvc.h with 100% similarity]
librpc/gen_ndr/xattr.h [moved from source3/librpc/gen_ndr/xattr.h with 100% similarity]
librpc/tables.pl [changed mode: 0644->0755]
source3/Makefile.in
source3/librpc/gen_ndr/ndr_notify.c
source3/librpc/gen_ndr/notify.h
source3/script/build_idl.sh

old mode 100644 (file)
new mode 100755 (executable)
index 4b5c99e3b1f86fd82ee99326c10b403702d712f6..1571e2baa70ca7aa3d5b11670d4010958f2148eb 100644 (file)
@@ -256,9 +256,9 @@ PASSCHANGE_OBJ = libsmb/passchange.o
 
 LIBNDR_DRSUAPI_OBJ = ../librpc/ndr/ndr_drsuapi.o \
                     ../librpc/ndr/ndr_compression.o \
-                    librpc/gen_ndr/ndr_drsuapi.o \
+                    ../librpc/gen_ndr/ndr_drsuapi.o \
                     ../librpc/ndr/ndr_drsblobs.o \
-                    librpc/gen_ndr/ndr_drsblobs.o
+                    ../librpc/gen_ndr/ndr_drsblobs.o
 
 ZLIB_OBJ = @ZLIB_OBJS@
 
@@ -272,8 +272,8 @@ DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
 LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
             ../librpc/ndr/ndr.o \
             ../librpc/ndr/ndr_misc.o \
-            librpc/gen_ndr/ndr_misc.o \
-            librpc/gen_ndr/ndr_security.o \
+            ../librpc/gen_ndr/ndr_misc.o \
+            ../librpc/gen_ndr/ndr_security.o \
             ../librpc/ndr/ndr_sec_helper.o \
             librpc/ndr/ndr_string.o \
             librpc/ndr/sid.o \
@@ -282,27 +282,27 @@ LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
 
 RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
 
-LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
-                 librpc/gen_ndr/ndr_lsa.o
+LIBNDR_GEN_OBJ0 = ../librpc/gen_ndr/ndr_samr.o \
+                 ../librpc/gen_ndr/ndr_lsa.o
 
-LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o \
+LIBNDR_GEN_OBJ1 = ../librpc/gen_ndr/ndr_netlogon.o \
                  ../librpc/ndr/ndr_netlogon.o
 
-LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
+LIBNDR_GEN_OBJ = ../librpc/gen_ndr/ndr_wkssvc.o \
                 $(LIBNDR_GEN_OBJ0) \
-                librpc/gen_ndr/ndr_dfs.o \
-                librpc/gen_ndr/ndr_echo.o \
-                librpc/gen_ndr/ndr_winreg.o \
-                librpc/gen_ndr/ndr_initshutdown.o \
-                librpc/gen_ndr/ndr_srvsvc.o \
-                librpc/gen_ndr/ndr_eventlog.o \
+                ../librpc/gen_ndr/ndr_dfs.o \
+                ../librpc/gen_ndr/ndr_echo.o \
+                ../librpc/gen_ndr/ndr_winreg.o \
+                ../librpc/gen_ndr/ndr_initshutdown.o \
+                ../librpc/gen_ndr/ndr_srvsvc.o \
+                ../librpc/gen_ndr/ndr_eventlog.o \
                 $(LIBNDR_GEN_OBJ1) \
-                librpc/gen_ndr/ndr_dssetup.o \
+                ../librpc/gen_ndr/ndr_dssetup.o \
                 librpc/gen_ndr/ndr_notify.o \
-                librpc/gen_ndr/ndr_xattr.o \
-                librpc/gen_ndr/ndr_epmapper.o \
-                librpc/gen_ndr/ndr_named_pipe_auth.o \
-                librpc/gen_ndr/ndr_ntsvcs.o
+                ../librpc/gen_ndr/ndr_xattr.o \
+                ../librpc/gen_ndr/ndr_epmapper.o \
+                ../librpc/gen_ndr/ndr_named_pipe_auth.o \
+                ../librpc/gen_ndr/ndr_ntsvcs.o
 
 RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
 
@@ -399,15 +399,15 @@ LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
 
 LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
                    ../librpc/ndr/ndr_krb5pac.o \
-                   librpc/gen_ndr/ndr_krb5pac.o
+                   ../librpc/gen_ndr/ndr_krb5pac.o
 
 SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o
 
 LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
             ../libcli/netlogon.o \
             ../libcli/ndr_netlogon.o \
-            librpc/gen_ndr/ndr_nbt.o \
-            librpc/gen_ndr/ndr_svcctl.o
+            ../librpc/gen_ndr/ndr_nbt.o \
+            ../librpc/gen_ndr/ndr_svcctl.o
 
 LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
             libsmb/namequery.o libsmb/conncache.o libads/dns.o
@@ -459,21 +459,21 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
                   librpc/rpc/dcerpc.o \
                   ../librpc/rpc/binding.o
 
-LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
-                  librpc/gen_ndr/cli_dfs.o \
-                  librpc/gen_ndr/cli_echo.o \
-                  librpc/gen_ndr/cli_srvsvc.o \
-                  librpc/gen_ndr/cli_svcctl.o \
-                  librpc/gen_ndr/cli_winreg.o \
-                  librpc/gen_ndr/cli_initshutdown.o \
-                  librpc/gen_ndr/cli_eventlog.o \
-                  librpc/gen_ndr/cli_wkssvc.o \
-                  librpc/gen_ndr/cli_netlogon.o \
-                  librpc/gen_ndr/cli_samr.o \
-                  librpc/gen_ndr/cli_dssetup.o \
-                  librpc/gen_ndr/cli_ntsvcs.o \
-                  librpc/gen_ndr/cli_epmapper.o \
-                  librpc/gen_ndr/cli_drsuapi.o \
+LIBMSRPC_GEN_OBJ = ../librpc/gen_ndr/cli_lsa.o \
+                  ../librpc/gen_ndr/cli_dfs.o \
+                  ../librpc/gen_ndr/cli_echo.o \
+                  ../librpc/gen_ndr/cli_srvsvc.o \
+                  ../librpc/gen_ndr/cli_svcctl.o \
+                  ../librpc/gen_ndr/cli_winreg.o \
+                  ../librpc/gen_ndr/cli_initshutdown.o \
+                  ../librpc/gen_ndr/cli_eventlog.o \
+                  ../librpc/gen_ndr/cli_wkssvc.o \
+                  ../librpc/gen_ndr/cli_netlogon.o \
+                  ../librpc/gen_ndr/cli_samr.o \
+                  ../librpc/gen_ndr/cli_dssetup.o \
+                  ../librpc/gen_ndr/cli_ntsvcs.o \
+                  ../librpc/gen_ndr/cli_epmapper.o \
+                  ../librpc/gen_ndr/cli_drsuapi.o \
                   $(LIBNDR_GEN_OBJ) \
                   $(RPCCLIENT_NDR_OBJ)
 
@@ -527,47 +527,47 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
               registry/reg_util_legacy.o
 
 
-RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o
+RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o ../librpc/gen_ndr/srv_lsa.o
 
 RPC_NETLOG_OBJ = rpc_server/srv_netlog_nt.o \
-                librpc/gen_ndr/srv_netlogon.o
+                ../librpc/gen_ndr/srv_netlogon.o
 
 RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
                rpc_server/srv_samr_util.o \
-              librpc/gen_ndr/srv_samr.o
+              ../librpc/gen_ndr/srv_samr.o
 
-RPC_INITSHUTDOWN_OBJ =  librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
+RPC_INITSHUTDOWN_OBJ =  ../librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
 
 RPC_REG_OBJ =  rpc_server/srv_winreg_nt.o \
-              librpc/gen_ndr/srv_winreg.o
+              ../librpc/gen_ndr/srv_winreg.o
 
-RPC_DSSETUP_OBJ =  rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
+RPC_DSSETUP_OBJ =  rpc_server/srv_dssetup_nt.o ../librpc/gen_ndr/srv_dssetup.o
 
 RPC_SVC_OBJ = rpc_server/srv_srvsvc_nt.o \
-             librpc/gen_ndr/srv_srvsvc.o
+             ../librpc/gen_ndr/srv_srvsvc.o
 
-RPC_WKS_OBJ =  librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
+RPC_WKS_OBJ =  ../librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
 
 RPC_SVCCTL_OBJ =  rpc_server/srv_svcctl.o rpc_server/srv_svcctl_nt.o \
-                 librpc/gen_ndr/srv_svcctl.o \
+                 ../librpc/gen_ndr/srv_svcctl.o \
                   services/svc_spoolss.o services/svc_rcinit.o services/services_db.o \
                   services/svc_netlogon.o services/svc_winreg.o \
                   services/svc_wins.o
 
 RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs.o rpc_server/srv_ntsvcs_nt.o \
-                librpc/gen_ndr/srv_ntsvcs.o
+                ../librpc/gen_ndr/srv_ntsvcs.o
 
-RPC_DFS_OBJ =  librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
+RPC_DFS_OBJ =  ../librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
 
 RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o
 
 RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \
-                  rpc_server/srv_eventlog_lib.o librpc/gen_ndr/srv_eventlog.o
+                  rpc_server/srv_eventlog_lib.o ../librpc/gen_ndr/srv_eventlog.o
 
 RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \
                rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o
 
-RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
+RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o ../librpc/gen_ndr/srv_echo.o
 
 RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ)
 
@@ -998,10 +998,10 @@ 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/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
+                 ../librpc/gen_ndr/ndr_krb5pac.o ../lib/util/asn1.o
 
 DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
 
@@ -1227,17 +1227,20 @@ modules:: SHOWFLAGS $(MODULES)
 #####################################################################
 ## Perl IDL Compiler
 samba3-idl::
-       @PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+       @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/notify.idl ../librpc/idl/epmapper.idl librpc/idl/messaging.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/libnetapi.idl ../librpc/idl/drsuapi.idl \
+               ../librpc/idl/ntsvcs.idl ../librpc/idl/drsuapi.idl \
                ../librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl \
                ../librpc/idl/named_pipe_auth.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
index dfa72d8004068610a73b5537520c7d832c2ed2b8..00ba8bc29329107c6c0c5e9e0ac91a657109a40b 100644 (file)
@@ -3,7 +3,6 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_notify.h"
 
-#include "librpc/gen_ndr/ndr_security.h"
 _PUBLIC_ enum ndr_err_code ndr_push_notify_entry(struct ndr_push *ndr, int ndr_flags, const struct notify_entry *r)
 {
        if (ndr_flags & NDR_SCALARS) {
index 46a7e24e0df4f7ca4380fef500ccab5ca471dabf..c809702e5d509e555b4eec66d8656e4af79dfe15 100644 (file)
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 
-#include "librpc/gen_ndr/security.h"
 #ifndef _HEADER_notify
 #define _HEADER_notify
 
index 34f262ee0063496a8ae88d3106d5c0f22bb0134b..0f4908114edba03311050e72f4b5f0247d812ff7 100755 (executable)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-ARGS="--includedir=../librpc/idl --outputdir librpc/gen_ndr --header --ndr-parser --samba3-ndr-server --samba3-ndr-client $PIDL_ARGS --"
+ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client $PIDL_ARGS --"
 IDL_FILES="$*"
 
 oldpwd=`pwd`
 cd ${srcdir}
 
-[ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
+[ -d $PIDL_OUTPUTDIR ] || mkdir -p $PIDL_OUTPUTDIR || exit 1
 
 PIDL="$PIDL $ARGS"
 
@@ -17,7 +17,7 @@ PIDL="$PIDL $ARGS"
 list=""
 for f in ${IDL_FILES}; do
        basename=`basename $f .idl`
-       ndr="librpc/gen_ndr/ndr_$basename.c"
+       ndr="$PIDL_OUTPUTDIR/ndr_$basename.c"
 
        if [ -f $ndr ]; then
                if [ "x`find $f -newer $ndr -print`" = "x$f" ]; then