summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-01 02:53:42 +0100
committerGünther Deschner <gd@samba.org>2009-04-20 23:16:16 +0200
commit7761850b1f6062b61fbb05124e23703c191229d1 (patch)
tree13ebfa86b53847f0ca23d809c056315cd2911340
parentd2bd5895cf9b8a3572b17bca850e9c56a4cca901 (diff)
downloadsamba-7761850b1f6062b61fbb05124e23703c191229d1.tar.gz
samba-7761850b1f6062b61fbb05124e23703c191229d1.tar.bz2
samba-7761850b1f6062b61fbb05124e23703c191229d1.zip
Move gpo_fetch to top-level.
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--libgpo/config.mk2
-rw-r--r--libgpo/gpo_fetch.c (renamed from source3/libgpo/gpo_fetch.c)4
-rw-r--r--source3/Makefile.in2
3 files changed, 5 insertions, 3 deletions
diff --git a/libgpo/config.mk b/libgpo/config.mk
index 10cd238285..20901bf28c 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
index 302003f5ae..03759262cd 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 adc36dda2c..97ef917657 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)