Import talloc_stack into util library.

diff --git a/lib/util/config.mk b/lib/util/config.mk
index 5488534f262ad760b5e6b6a1d5fc2156d5fd02dd..0eaabbf86b64bd473515699042e4aea572cdecc1 100644 (file)
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -26,6 +26,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
                idtree.o \
                become_daemon.o \
                rbtree.o \
+               talloc_stack.o \
                params.o)
 
 PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \

diff --git a/source3/lib/talloc_stack.c b/lib/util/talloc_stack.c
similarity index 100%
rename from source3/lib/talloc_stack.c
rename to lib/util/talloc_stack.c

diff --git a/source3/include/talloc_stack.h b/lib/util/talloc_stack.h
similarity index 100%
rename from source3/include/talloc_stack.h
rename to lib/util/talloc_stack.h

diff --git a/lib/util/util.h b/lib/util/util.h
index fc651d58af2da3e28e7944aab591c2f990120c04..e72df023a9fb432fb8f080b8fc7d2ac21ca54e87 100644 (file)
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -44,6 +44,7 @@ extern const char *panic_action;
 #include "../lib/util/xfile.h"
 #include "../lib/util/mutex.h"
 #include "../lib/util/byteorder.h"
+#include "../lib/util/talloc_stack.h"
 
 /**
  * assert macros 

diff --git a/source3/Makefile.in b/source3/Makefile.in
index eee03dbaa84dfdb754009c52d4174eb5c07810a4..120b98064e3710671376def5dc3fe9bf7f1fb081 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -320,7 +320,7 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
                   ../lib/util/xfile.o ../lib/util/util_strlist.o  \
                   ../lib/util/util_file.o ../lib/util/data_blob.o \
                   ../lib/util/util.o ../lib/util/fsusage.o \
-                  ../lib/util/params.o 
+                  ../lib/util/params.o ../lib/util/talloc_stack.o
 
 CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
                         ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
@@ -328,7 +328,7 @@ CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
 
 LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
          lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
-         lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \
+         lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o \
          lib/interfaces.o lib/memcache.o \
          lib/util_transfer_file.o lib/async_req.o \
          lib/async_sock.o \

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 6b25982ff7fa445c1f82c41f8ef55247038f519a..035d46fe0aa78e790f77f65b3a62729a6e172f16 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -654,7 +654,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"
-#include "talloc_stack.h"
+#include "../lib/util/talloc_stack.h"
 #include "memcache.h"
 #include "async_req.h"
 #include "async_smb.h"