Merge branch 'checktalloc' into tdr

diff --git a/source4/lib/tdr/TODO b/lib/tdr/TODO
similarity index 100%
rename from source4/lib/tdr/TODO
rename to lib/tdr/TODO

diff --git a/source4/lib/tdr/config.mk b/lib/tdr/config.mk
similarity index 100%
rename from source4/lib/tdr/config.mk
rename to lib/tdr/config.mk

diff --git a/source4/lib/tdr/tdr.c b/lib/tdr/tdr.c
similarity index 99%
rename from source4/lib/tdr/tdr.c
rename to lib/tdr/tdr.c
index 8b62ea0c2b989b06171985a8bf7f947128d2645a..293436ed5e3474a942a1ab53efadbe65892aec3e 100644 (file)
--- a/source4/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/network.h"
-#include "tdr/tdr.h"
+#include "lib/tdr/tdr.h"
 
 #define TDR_BASE_MARSHALL_SIZE 1024
 

diff --git a/source4/lib/tdr/tdr.h b/lib/tdr/tdr.h
similarity index 100%
rename from source4/lib/tdr/tdr.h
rename to lib/tdr/tdr.h

diff --git a/source4/lib/tdr/testsuite.c b/lib/tdr/testsuite.c
similarity index 100%
rename from source4/lib/tdr/testsuite.c
rename to lib/tdr/testsuite.c

diff --git a/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
index 568dff5adf541a54b05b29270b12f1e32ea2db91..a6b74a0ba45d0d51265ae832d7ca9d82113ea577 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/TDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
@@ -271,7 +271,7 @@ sub Parser($$$$)
        $self->pidl("");
        $self->pidl_hdr("/* autogenerated by pidl */");
        $self->pidl_hdr("#include \"$baseheader\"");
-       $self->pidl_hdr(choose_header("tdr/tdr.h", "tdr.h"));
+       $self->pidl_hdr(choose_header("lib/tdr/tdr.h", "tdr.h"));
        $self->pidl_hdr("");
 
        foreach (@$idl) { $self->ParserInterface($_) if ($_->{TYPE} eq "INTERFACE"); }  

diff --git a/source4/Makefile b/source4/Makefile
index 15b1b8ba40382573716ed20fd20566f360e14ff9..c42f0ba9fff60c44ab6b1ce8bc76f71dd9407d3a 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -77,7 +77,7 @@ nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := ../lib/util
-libtdrsrcdir := lib/tdr
+libtdrsrcdir := ../lib/tdr
 libcryptosrcdir := ../lib/crypto
 libtorturesrcdir := ../lib/torture
 smb_serversrcdir := smb_server

diff --git a/source4/main.mk b/source4/main.mk
index ee2018fb694f7dae00683c77eba272f8aac6a6a4..8ea9727ed3bc2a92a3c92339ce642f4b65b0073a 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -20,7 +20,7 @@ mkinclude ../lib/socket_wrapper/config.mk
 mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/stream/config.mk
 mkinclude ../lib/util/config.mk
-mkinclude lib/tdr/config.mk
+mkinclude ../lib/tdr/config.mk
 mkinclude ../lib/crypto/config.mk
 mkinclude ../lib/torture/config.mk
 mkinclude lib/basic.mk

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 36f4f08072a3fcde5a2586b183bb9494724baefa..e13056190a2e024eda8c125946ff3ae8133329cb 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -44,7 +44,7 @@ TORTURE_LOCAL_OBJ_FILES = \
                $(torturesrcdir)/../../lib/compression/testsuite.o \
                $(torturesrcdir)/../../lib/util/charset/tests/charset.o \
                $(torturesrcdir)/../libcli/security/tests/sddl.o \
-               $(torturesrcdir)/../lib/tdr/testsuite.o \
+               ../lib/tdr/testsuite.o \
                $(torturesrcdir)/../../lib/tevent/testsuite.o \
                $(torturesrcdir)/../param/tests/share.o \
                $(torturesrcdir)/../param/tests/loadparm.o \