r23481: As per metze's suggestion, move the nsstest files from torture/ to nsswitch/

(This used to be commit 4e7dc9eae4a30f67a87dbf8ccfda7f6a3ace114d)

diff --git a/source4/configure.ac b/source4/configure.ac
index 4feb6debd4a2d9f87e9d4a5375376b90ded1457a..c947a1629a8ed714288ae65b0c1300cd0abbf771 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -25,7 +25,7 @@ m4_include(lib/util/time.m4)
 m4_include(lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
-m4_include(torture/nsstest.m4)
+m4_include(nsswitch/nsstest.m4)
 
 #SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0,
 #                         [samba_cv_internal_talloc=no],

diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 9723964a4b007e04c15ba1a62084fccc9bd6ab99..4123194c2306112849bee9538c3f070d91d5983d 100644 (file)
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -3,3 +3,15 @@ VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = Client library for communicating with winbind
 OBJ_FILES = wb_common.o
+
+#################################
+# Start BINARY nsstest
+[BINARY::nsstest]
+INSTALLDIR = BINDIR
+OBJ_FILES = \
+               nsstest.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-UTIL \
+               LIBREPLACE_EXT
+# End BINARY nsstest
+#################################

diff --git a/source4/torture/nsstest.c b/source4/nsswitch/nsstest.c
similarity index 99%
rename from source4/torture/nsstest.c
rename to source4/nsswitch/nsstest.c
index 0fc2baf0689ce722f54cbaad8b4516193795ba54..5a5af8e35609c5bc98b80664f8259d354cd88173 100644 (file)
--- a/source4/torture/nsstest.c
+++ b/source4/nsswitch/nsstest.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 
-#include "torture/nsstest.h"
+#include "nsswitch/nsstest.h"
 
 static const char *so_path = "/lib/libnss_winbind.so";
 static const char *nss_name = "winbind";

diff --git a/source4/torture/nsstest.h b/source4/nsswitch/nsstest.h
similarity index 100%
rename from source4/torture/nsstest.h
rename to source4/nsswitch/nsstest.h

diff --git a/source4/torture/nsstest.m4 b/source4/nsswitch/nsstest.m4
similarity index 100%
rename from source4/torture/nsstest.m4
rename to source4/nsswitch/nsstest.m4

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 6a825b01a811533d09f8b1114590657089a2be58..42f1d72bb0350dfa038bc221446657608e0aac43 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -358,18 +358,6 @@ MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
 
-#################################
-# Start BINARY nsstest
-[BINARY::nsstest]
-INSTALLDIR = BINDIR
-OBJ_FILES = \
-               nsstest.o
-PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-UTIL \
-               LIBREPLACE_EXT
-# End BINARY nsstest
-#################################
-
 GCOV_FLAGS = -ftest-coverage -fprofile-arcs
 GCOV_LIBS = -lgcov