Move gpo_fetch to top-level.

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/libgpo/config.mk b/libgpo/config.mk
index 10cd2382858b8bca4ebe094f3870f60b9b105eee..20901bf28cb24403d3ec0f5b3e0c83ad32399c5e 100644 (file)
--- a/libgpo/config.mk
+++ b/libgpo/config.mk
@@ -1,4 +1,4 @@
 [SUBSYSTEM::LIBGPO]
 
 LIBGPO_OBJ_FILES = ../libgpo/gpo_util.o ../libgpo/gpo_sec.o \
-                                  ../libgpo/gpext/gpext.o
+                                  ../libgpo/gpext/gpext.o ../libgpo/gpo_fetch.o

diff --git a/source3/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
similarity index 98%
rename from source3/libgpo/gpo_fetch.c
rename to libgpo/gpo_fetch.c
index 302003f5ae97ec807431508dcc02373cecb13441..03759262cd6cbdd1ddd0e3df9b9a33d9665888e3 100644 (file)
--- a/source3/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -18,6 +18,8 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "../libgpo/gpo.h"
 
 /****************************************************************
  explode the GPO CIFS URI into their components
@@ -71,7 +73,7 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
        *unix_path = talloc_strdup(mem_ctx, path);
        NT_STATUS_HAVE_NO_MEMORY(*unix_path);
 
-       TALLOC_FREE(path);
+       talloc_free(path);
        return NT_STATUS_OK;
 }
 

diff --git a/source3/Makefile.in b/source3/Makefile.in
index adc36dda2c9b580b0a248e917c9079f0c3149c38..97ef9176572736d4772727afd4cb26859d3788de 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -412,7 +412,7 @@ LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
 GPEXT_OBJ = ../libgpo/gpext/gpext.o @GPEXT_STATIC@
 
 LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o ../libgpo/gpo_util.o \
-             libgpo/gpo_fetch.o libgpo/gpo_filesync.o ../libgpo/gpo_sec.o \
+             ../libgpo/gpo_fetch.o libgpo/gpo_filesync.o ../libgpo/gpo_sec.o \
              libgpo/gpo_reg.o \
              $(GPEXT_OBJ)
 LIBGPO_OBJ = $(LIBGPO_OBJ0)