From caa4e428604780bb098060f7286c69d30c8b4007 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 11 Oct 2008 21:05:38 +0200 Subject: [PATCH] Move lib/util from source4 to top-level libutil. Conflicts: source4/Makefile --- .gitignore | 10 +++++----- {source4/lib => lib}/util/Doxyfile | 0 {source4/lib => lib}/util/asn1.c | 0 {source4/lib => lib}/util/asn1.h | 0 {source4/lib => lib}/util/attr.h | 0 {source4/lib => lib}/util/become_daemon.c | 0 {source4/lib => lib}/util/byteorder.h | 0 {source4/lib => lib}/util/capability.c | 0 {source4/lib => lib}/util/capability.m4 | 0 {source4/lib => lib}/util/config.mk | 0 {source4/lib => lib}/util/data_blob.c | 0 {source4/lib => lib}/util/data_blob.h | 0 {source4/lib => lib}/util/debug.c | 0 {source4/lib => lib}/util/debug.h | 0 {source4/lib => lib}/util/dlinklist.h | 0 {source4/lib => lib}/util/dprintf.c | 0 {source4/lib => lib}/util/fault.c | 0 {source4/lib => lib}/util/fault.m4 | 0 {source4/lib => lib}/util/fsusage.c | 0 {source4/lib => lib}/util/fsusage.m4 | 0 {source4/lib => lib}/util/genrand.c | 0 {source4/lib => lib}/util/idtree.c | 0 {source4/lib => lib}/util/mainpage.dox | 0 {source4/lib => lib}/util/ms_fnmatch.c | 0 {source4/lib => lib}/util/mutex.c | 0 {source4/lib => lib}/util/mutex.h | 0 {source4/lib => lib}/util/params.c | 0 {source4/lib => lib}/util/safe_string.h | 0 {source4/lib => lib}/util/signal.c | 0 {source4/lib => lib}/util/signal.m4 | 0 {source4/lib => lib}/util/system.c | 0 {source4/lib => lib}/util/tests/file.c | 0 {source4/lib => lib}/util/tests/genrand.c | 0 {source4/lib => lib}/util/tests/idtree.c | 0 {source4/lib => lib}/util/tests/str.c | 0 {source4/lib => lib}/util/tests/strlist.c | 0 {source4/lib => lib}/util/time.c | 0 {source4/lib => lib}/util/time.h | 0 {source4/lib => lib}/util/time.m4 | 0 {source4/lib => lib}/util/unix_privs.c | 0 {source4/lib => lib}/util/util.c | 0 {source4/lib => lib}/util/util.h | 14 +++++++------- {source4/lib => lib}/util/util.m4 | 0 {source4/lib => lib}/util/util_file.c | 0 {source4/lib => lib}/util/util_getent.c | 0 {source4/lib => lib}/util/util_ldb.c | 0 {source4/lib => lib}/util/util_ldb.h | 0 {source4/lib => lib}/util/util_pw.c | 0 {source4/lib => lib}/util/util_str.c | 0 {source4/lib => lib}/util/util_strlist.c | 0 {source4/lib => lib}/util/util_tdb.c | 0 {source4/lib => lib}/util/wrap_xattr.c | 0 {source4/lib => lib}/util/wrap_xattr.h | 0 {source4/lib => lib}/util/xattr.m4 | 0 {source4/lib => lib}/util/xfile.c | 0 {source4/lib => lib}/util/xfile.h | 0 source4/Makefile | 4 ++-- source4/auth/credentials/credentials.h | 2 +- source4/configure.ac | 14 +++++++------- source4/include/includes.h | 4 ++-- source4/librpc/ndr/libndr.h | 2 +- source4/librpc/rpc/dcerpc.h | 2 +- source4/main.mk | 2 +- source4/torture/local/config.mk | 10 +++++----- source4/utils/getntacl.c | 2 +- 65 files changed, 33 insertions(+), 33 deletions(-) rename {source4/lib => lib}/util/Doxyfile (100%) rename {source4/lib => lib}/util/asn1.c (100%) rename {source4/lib => lib}/util/asn1.h (100%) rename {source4/lib => lib}/util/attr.h (100%) rename {source4/lib => lib}/util/become_daemon.c (100%) rename {source4/lib => lib}/util/byteorder.h (100%) rename {source4/lib => lib}/util/capability.c (100%) rename {source4/lib => lib}/util/capability.m4 (100%) rename {source4/lib => lib}/util/config.mk (100%) rename {source4/lib => lib}/util/data_blob.c (100%) rename {source4/lib => lib}/util/data_blob.h (100%) rename {source4/lib => lib}/util/debug.c (100%) rename {source4/lib => lib}/util/debug.h (100%) rename {source4/lib => lib}/util/dlinklist.h (100%) rename {source4/lib => lib}/util/dprintf.c (100%) rename {source4/lib => lib}/util/fault.c (100%) rename {source4/lib => lib}/util/fault.m4 (100%) rename {source4/lib => lib}/util/fsusage.c (100%) rename {source4/lib => lib}/util/fsusage.m4 (100%) rename {source4/lib => lib}/util/genrand.c (100%) rename {source4/lib => lib}/util/idtree.c (100%) rename {source4/lib => lib}/util/mainpage.dox (100%) rename {source4/lib => lib}/util/ms_fnmatch.c (100%) rename {source4/lib => lib}/util/mutex.c (100%) rename {source4/lib => lib}/util/mutex.h (100%) rename {source4/lib => lib}/util/params.c (100%) rename {source4/lib => lib}/util/safe_string.h (100%) rename {source4/lib => lib}/util/signal.c (100%) rename {source4/lib => lib}/util/signal.m4 (100%) rename {source4/lib => lib}/util/system.c (100%) rename {source4/lib => lib}/util/tests/file.c (100%) rename {source4/lib => lib}/util/tests/genrand.c (100%) rename {source4/lib => lib}/util/tests/idtree.c (100%) rename {source4/lib => lib}/util/tests/str.c (100%) rename {source4/lib => lib}/util/tests/strlist.c (100%) rename {source4/lib => lib}/util/time.c (100%) rename {source4/lib => lib}/util/time.h (100%) rename {source4/lib => lib}/util/time.m4 (100%) rename {source4/lib => lib}/util/unix_privs.c (100%) rename {source4/lib => lib}/util/util.c (100%) rename {source4/lib => lib}/util/util.h (99%) rename {source4/lib => lib}/util/util.m4 (100%) rename {source4/lib => lib}/util/util_file.c (100%) rename {source4/lib => lib}/util/util_getent.c (100%) rename {source4/lib => lib}/util/util_ldb.c (100%) rename {source4/lib => lib}/util/util_ldb.h (100%) rename {source4/lib => lib}/util/util_pw.c (100%) rename {source4/lib => lib}/util/util_str.c (100%) rename {source4/lib => lib}/util/util_strlist.c (100%) rename {source4/lib => lib}/util/util_tdb.c (100%) rename {source4/lib => lib}/util/wrap_xattr.c (100%) rename {source4/lib => lib}/util/wrap_xattr.h (100%) rename {source4/lib => lib}/util/xattr.m4 (100%) rename {source4/lib => lib}/util/xfile.c (100%) rename {source4/lib => lib}/util/xfile.h (100%) diff --git a/.gitignore b/.gitignore index e585504ce5e..fa4fc5f3775 100644 --- a/.gitignore +++ b/.gitignore @@ -231,11 +231,11 @@ source4/lib/tdb/bin/tdbtool source4/lib/tdb/bin/tdbtorture source4/lib/tdr/tdr_proto.h source4/lib/util/apidocs -source4/lib/util/asn1_proto.h -source4/lib/util/pidfile.h -source4/lib/util/unix_privs.h -source4/lib/util/util_proto.h -source4/lib/util/util_tdb.h +lib/util/asn1_proto.h +lib/util/pidfile.h +lib/util/unix_privs.h +lib/util/util_proto.h +lib/util/util_tdb.h source4/mkconfig.mk source4/nbt_server/dgram/proto.h source4/nbt_server/nbt_server_proto.h diff --git a/source4/lib/util/Doxyfile b/lib/util/Doxyfile similarity index 100% rename from source4/lib/util/Doxyfile rename to lib/util/Doxyfile diff --git a/source4/lib/util/asn1.c b/lib/util/asn1.c similarity index 100% rename from source4/lib/util/asn1.c rename to lib/util/asn1.c diff --git a/source4/lib/util/asn1.h b/lib/util/asn1.h similarity index 100% rename from source4/lib/util/asn1.h rename to lib/util/asn1.h diff --git a/source4/lib/util/attr.h b/lib/util/attr.h similarity index 100% rename from source4/lib/util/attr.h rename to lib/util/attr.h diff --git a/source4/lib/util/become_daemon.c b/lib/util/become_daemon.c similarity index 100% rename from source4/lib/util/become_daemon.c rename to lib/util/become_daemon.c diff --git a/source4/lib/util/byteorder.h b/lib/util/byteorder.h similarity index 100% rename from source4/lib/util/byteorder.h rename to lib/util/byteorder.h diff --git a/source4/lib/util/capability.c b/lib/util/capability.c similarity index 100% rename from source4/lib/util/capability.c rename to lib/util/capability.c diff --git a/source4/lib/util/capability.m4 b/lib/util/capability.m4 similarity index 100% rename from source4/lib/util/capability.m4 rename to lib/util/capability.m4 diff --git a/source4/lib/util/config.mk b/lib/util/config.mk similarity index 100% rename from source4/lib/util/config.mk rename to lib/util/config.mk diff --git a/source4/lib/util/data_blob.c b/lib/util/data_blob.c similarity index 100% rename from source4/lib/util/data_blob.c rename to lib/util/data_blob.c diff --git a/source4/lib/util/data_blob.h b/lib/util/data_blob.h similarity index 100% rename from source4/lib/util/data_blob.h rename to lib/util/data_blob.h diff --git a/source4/lib/util/debug.c b/lib/util/debug.c similarity index 100% rename from source4/lib/util/debug.c rename to lib/util/debug.c diff --git a/source4/lib/util/debug.h b/lib/util/debug.h similarity index 100% rename from source4/lib/util/debug.h rename to lib/util/debug.h diff --git a/source4/lib/util/dlinklist.h b/lib/util/dlinklist.h similarity index 100% rename from source4/lib/util/dlinklist.h rename to lib/util/dlinklist.h diff --git a/source4/lib/util/dprintf.c b/lib/util/dprintf.c similarity index 100% rename from source4/lib/util/dprintf.c rename to lib/util/dprintf.c diff --git a/source4/lib/util/fault.c b/lib/util/fault.c similarity index 100% rename from source4/lib/util/fault.c rename to lib/util/fault.c diff --git a/source4/lib/util/fault.m4 b/lib/util/fault.m4 similarity index 100% rename from source4/lib/util/fault.m4 rename to lib/util/fault.m4 diff --git a/source4/lib/util/fsusage.c b/lib/util/fsusage.c similarity index 100% rename from source4/lib/util/fsusage.c rename to lib/util/fsusage.c diff --git a/source4/lib/util/fsusage.m4 b/lib/util/fsusage.m4 similarity index 100% rename from source4/lib/util/fsusage.m4 rename to lib/util/fsusage.m4 diff --git a/source4/lib/util/genrand.c b/lib/util/genrand.c similarity index 100% rename from source4/lib/util/genrand.c rename to lib/util/genrand.c diff --git a/source4/lib/util/idtree.c b/lib/util/idtree.c similarity index 100% rename from source4/lib/util/idtree.c rename to lib/util/idtree.c diff --git a/source4/lib/util/mainpage.dox b/lib/util/mainpage.dox similarity index 100% rename from source4/lib/util/mainpage.dox rename to lib/util/mainpage.dox diff --git a/source4/lib/util/ms_fnmatch.c b/lib/util/ms_fnmatch.c similarity index 100% rename from source4/lib/util/ms_fnmatch.c rename to lib/util/ms_fnmatch.c diff --git a/source4/lib/util/mutex.c b/lib/util/mutex.c similarity index 100% rename from source4/lib/util/mutex.c rename to lib/util/mutex.c diff --git a/source4/lib/util/mutex.h b/lib/util/mutex.h similarity index 100% rename from source4/lib/util/mutex.h rename to lib/util/mutex.h diff --git a/source4/lib/util/params.c b/lib/util/params.c similarity index 100% rename from source4/lib/util/params.c rename to lib/util/params.c diff --git a/source4/lib/util/safe_string.h b/lib/util/safe_string.h similarity index 100% rename from source4/lib/util/safe_string.h rename to lib/util/safe_string.h diff --git a/source4/lib/util/signal.c b/lib/util/signal.c similarity index 100% rename from source4/lib/util/signal.c rename to lib/util/signal.c diff --git a/source4/lib/util/signal.m4 b/lib/util/signal.m4 similarity index 100% rename from source4/lib/util/signal.m4 rename to lib/util/signal.m4 diff --git a/source4/lib/util/system.c b/lib/util/system.c similarity index 100% rename from source4/lib/util/system.c rename to lib/util/system.c diff --git a/source4/lib/util/tests/file.c b/lib/util/tests/file.c similarity index 100% rename from source4/lib/util/tests/file.c rename to lib/util/tests/file.c diff --git a/source4/lib/util/tests/genrand.c b/lib/util/tests/genrand.c similarity index 100% rename from source4/lib/util/tests/genrand.c rename to lib/util/tests/genrand.c diff --git a/source4/lib/util/tests/idtree.c b/lib/util/tests/idtree.c similarity index 100% rename from source4/lib/util/tests/idtree.c rename to lib/util/tests/idtree.c diff --git a/source4/lib/util/tests/str.c b/lib/util/tests/str.c similarity index 100% rename from source4/lib/util/tests/str.c rename to lib/util/tests/str.c diff --git a/source4/lib/util/tests/strlist.c b/lib/util/tests/strlist.c similarity index 100% rename from source4/lib/util/tests/strlist.c rename to lib/util/tests/strlist.c diff --git a/source4/lib/util/time.c b/lib/util/time.c similarity index 100% rename from source4/lib/util/time.c rename to lib/util/time.c diff --git a/source4/lib/util/time.h b/lib/util/time.h similarity index 100% rename from source4/lib/util/time.h rename to lib/util/time.h diff --git a/source4/lib/util/time.m4 b/lib/util/time.m4 similarity index 100% rename from source4/lib/util/time.m4 rename to lib/util/time.m4 diff --git a/source4/lib/util/unix_privs.c b/lib/util/unix_privs.c similarity index 100% rename from source4/lib/util/unix_privs.c rename to lib/util/unix_privs.c diff --git a/source4/lib/util/util.c b/lib/util/util.c similarity index 100% rename from source4/lib/util/util.c rename to lib/util/util.c diff --git a/source4/lib/util/util.h b/lib/util/util.h similarity index 99% rename from source4/lib/util/util.h rename to lib/util/util.h index ffe83c14b29..4616de9f944 100644 --- a/source4/lib/util/util.h +++ b/lib/util/util.h @@ -21,7 +21,7 @@ #ifndef _SAMBA_UTIL_H_ #define _SAMBA_UTIL_H_ -#include "util/attr.h" +#include "../lib/util/attr.h" #include "charset/charset.h" @@ -38,12 +38,12 @@ struct smbsrv_tcon; extern const char *logfile; extern const char *panic_action; -#include "util/time.h" -#include "util/data_blob.h" -#include "util/xfile.h" -#include "util/debug.h" -#include "util/mutex.h" -#include "util/byteorder.h" +#include "../lib/util/time.h" +#include "../lib/util/data_blob.h" +#include "../lib/util/xfile.h" +#include "../lib/util/debug.h" +#include "../lib/util/mutex.h" +#include "../lib/util/byteorder.h" /** this is a warning hack. The idea is to use this everywhere that we diff --git a/source4/lib/util/util.m4 b/lib/util/util.m4 similarity index 100% rename from source4/lib/util/util.m4 rename to lib/util/util.m4 diff --git a/source4/lib/util/util_file.c b/lib/util/util_file.c similarity index 100% rename from source4/lib/util/util_file.c rename to lib/util/util_file.c diff --git a/source4/lib/util/util_getent.c b/lib/util/util_getent.c similarity index 100% rename from source4/lib/util/util_getent.c rename to lib/util/util_getent.c diff --git a/source4/lib/util/util_ldb.c b/lib/util/util_ldb.c similarity index 100% rename from source4/lib/util/util_ldb.c rename to lib/util/util_ldb.c diff --git a/source4/lib/util/util_ldb.h b/lib/util/util_ldb.h similarity index 100% rename from source4/lib/util/util_ldb.h rename to lib/util/util_ldb.h diff --git a/source4/lib/util/util_pw.c b/lib/util/util_pw.c similarity index 100% rename from source4/lib/util/util_pw.c rename to lib/util/util_pw.c diff --git a/source4/lib/util/util_str.c b/lib/util/util_str.c similarity index 100% rename from source4/lib/util/util_str.c rename to lib/util/util_str.c diff --git a/source4/lib/util/util_strlist.c b/lib/util/util_strlist.c similarity index 100% rename from source4/lib/util/util_strlist.c rename to lib/util/util_strlist.c diff --git a/source4/lib/util/util_tdb.c b/lib/util/util_tdb.c similarity index 100% rename from source4/lib/util/util_tdb.c rename to lib/util/util_tdb.c diff --git a/source4/lib/util/wrap_xattr.c b/lib/util/wrap_xattr.c similarity index 100% rename from source4/lib/util/wrap_xattr.c rename to lib/util/wrap_xattr.c diff --git a/source4/lib/util/wrap_xattr.h b/lib/util/wrap_xattr.h similarity index 100% rename from source4/lib/util/wrap_xattr.h rename to lib/util/wrap_xattr.h diff --git a/source4/lib/util/xattr.m4 b/lib/util/xattr.m4 similarity index 100% rename from source4/lib/util/xattr.m4 rename to lib/util/xattr.m4 diff --git a/source4/lib/util/xfile.c b/lib/util/xfile.c similarity index 100% rename from source4/lib/util/xfile.c rename to lib/util/xfile.c diff --git a/source4/lib/util/xfile.h b/lib/util/xfile.h similarity index 100% rename from source4/lib/util/xfile.h rename to lib/util/xfile.h diff --git a/source4/Makefile b/source4/Makefile index cab82674d21..345c16ed6e8 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -74,7 +74,7 @@ socketwrappersrcdir := ../lib/socket_wrapper nsswrappersrcdir := ../lib/nss_wrapper appwebsrcdir := lib/appweb libstreamsrcdir := lib/stream -libutilsrcdir := lib/util +libutilsrcdir := ../lib/util libtdrsrcdir := lib/tdr libdbwrapsrcdir := lib/dbwrap libcryptosrcdir := ../lib/crypto @@ -144,7 +144,7 @@ endif clean:: @find ../lib ../libcli -name '*.o' -o -name '*.hd' | xargs rm -f -DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \ +DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \ $(srcdir)/version.h libraries:: $(STATIC_LIBS) $(SHARED_LIBS) diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h index 79c50ae5aff..52b10c633c3 100644 --- a/source4/auth/credentials/credentials.h +++ b/source4/auth/credentials/credentials.h @@ -22,7 +22,7 @@ #ifndef __CREDENTIALS_H__ #define __CREDENTIALS_H__ -#include "util/data_blob.h" +#include "../lib/util/data_blob.h" #include "librpc/gen_ndr/misc.h" struct ccache_container; diff --git a/source4/configure.ac b/source4/configure.ac index 611b8dd104b..62f9dc43a0a 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -14,13 +14,13 @@ m4_include(build/m4/env.m4) m4_include(../lib/replace/samba.m4) m4_include(lib/smbreadline/readline.m4) m4_include(heimdal_build/config.m4) -m4_include(lib/util/fault.m4) -m4_include(lib/util/signal.m4) -m4_include(lib/util/util.m4) -m4_include(lib/util/fsusage.m4) -m4_include(lib/util/xattr.m4) -m4_include(lib/util/capability.m4) -m4_include(lib/util/time.m4) +m4_include(../lib/util/fault.m4) +m4_include(../lib/util/signal.m4) +m4_include(../lib/util/util.m4) +m4_include(../lib/util/fsusage.m4) +m4_include(../lib/util/xattr.m4) +m4_include(../lib/util/capability.m4) +m4_include(../lib/util/time.m4) m4_include(../lib/popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) diff --git a/source4/include/includes.h b/source4/include/includes.h index 750ebc4137b..1386ea510b9 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -42,12 +42,12 @@ #ifndef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) #endif -#include "util/util.h" +#include "../lib/util/util.h" #include "libcli/util/error.h" /* String routines */ -#include "util/safe_string.h" +#include "../lib/util/safe_string.h" #if 0 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */ diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index 3f4de7801a4..1be1a540457 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -26,7 +26,7 @@ #define __LIBNDR_H__ #include -#include "lib/util/util.h" /* for discard_const */ +#include "../lib/util/util.h" /* for discard_const */ #include #include "lib/charset/charset.h" diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 2b38c656690..482e803a359 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -27,7 +27,7 @@ #ifndef __DCERPC_H__ #define __DCERPC_H__ -#include "lib/util/data_blob.h" +#include "../lib/util/data_blob.h" #include "librpc/gen_ndr/dcerpc.h" #include "librpc/ndr/libndr.h" diff --git a/source4/main.mk b/source4/main.mk index 368dce9f59b..8ce86b91ca2 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -19,7 +19,7 @@ mkinclude lib/cmdline/config.mk mkinclude ../lib/socket_wrapper/config.mk mkinclude ../lib/nss_wrapper/config.mk mkinclude lib/stream/config.mk -mkinclude lib/util/config.mk +mkinclude ../lib/util/config.mk mkinclude lib/tdr/config.mk mkinclude lib/dbwrap/config.mk mkinclude ../lib/crypto/config.mk diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 4cd9f6c865d..1f87912e8b0 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -28,14 +28,14 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../lib/messaging/tests/messaging.o \ $(torturesrcdir)/../lib/messaging/tests/irpc.o \ $(torturesrcdir)/../librpc/tests/binding_string.o \ - $(torturesrcdir)/../lib/util/tests/idtree.o \ + $(torturesrcdir)/../../lib/util/tests/idtree.o \ $(torturesrcdir)/../lib/socket/testsuite.o \ $(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \ $(torturesrcdir)/../libcli/resolve/testsuite.o \ - $(torturesrcdir)/../lib/util/tests/strlist.o \ - $(torturesrcdir)/../lib/util/tests/str.o \ - $(torturesrcdir)/../lib/util/tests/file.o \ - $(torturesrcdir)/../lib/util/tests/genrand.o \ + $(torturesrcdir)/../../lib/util/tests/strlist.o \ + $(torturesrcdir)/../../lib/util/tests/str.o \ + $(torturesrcdir)/../../lib/util/tests/file.o \ + $(torturesrcdir)/../../lib/util/tests/genrand.o \ $(torturesrcdir)/../../lib/compression/testsuite.o \ $(torturesrcdir)/../lib/charset/tests/charset.o \ $(torturesrcdir)/../libcli/security/tests/sddl.o \ diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c index 132d689dcba..f26c87bd852 100644 --- a/source4/utils/getntacl.c +++ b/source4/utils/getntacl.c @@ -22,7 +22,7 @@ #include "includes.h" #include "system/filesys.h" #include "librpc/gen_ndr/ndr_xattr.h" -#include "lib/util/wrap_xattr.h" +#include "../lib/util/wrap_xattr.h" #include "param/param.h" static void ntacl_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3); -- 2.34.1