From 7761850b1f6062b61fbb05124e23703c191229d1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 1 Mar 2009 02:53:42 +0100 Subject: [PATCH] Move gpo_fetch to top-level. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner --- libgpo/config.mk | 2 +- {source3/libgpo => libgpo}/gpo_fetch.c | 4 +++- source3/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename {source3/libgpo => libgpo}/gpo_fetch.c (98%) diff --git a/libgpo/config.mk b/libgpo/config.mk index 10cd2382858..20901bf28cb 100644 --- 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 302003f5ae9..03759262cd6 100644 --- 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 adc36dda2c9..97ef9176572 100644 --- 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) -- 2.34.1