From 4e7dc9eae4a30f67a87dbf8ccfda7f6a3ace114d Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Thu, 14 Jun 2007 06:05:27 +0000
Subject: [PATCH] r23481: As per metze's suggestion, move the nsstest files
 from torture/ to nsswitch/

---
 source/configure.ac                     |  2 +-
 source/nsswitch/config.mk               | 12 ++++++++++++
 source/{torture => nsswitch}/nsstest.c  |  2 +-
 source/{torture => nsswitch}/nsstest.h  |  0
 source/{torture => nsswitch}/nsstest.m4 |  0
 source/torture/config.mk                | 12 ------------
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename source/{torture => nsswitch}/nsstest.c (99%)
 rename source/{torture => nsswitch}/nsstest.h (100%)
 rename source/{torture => nsswitch}/nsstest.m4 (100%)

diff --git a/source/configure.ac b/source/configure.ac
index 4feb6debd4a..c947a1629a8 100644
--- a/source/configure.ac
+++ b/source/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/source/nsswitch/config.mk b/source/nsswitch/config.mk
index 9723964a4b0..4123194c230 100644
--- a/source/nsswitch/config.mk
+++ b/source/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/source/torture/nsstest.c b/source/nsswitch/nsstest.c
similarity index 99%
rename from source/torture/nsstest.c
rename to source/nsswitch/nsstest.c
index 0fc2baf0689..5a5af8e3560 100644
--- a/source/torture/nsstest.c
+++ b/source/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/source/torture/nsstest.h b/source/nsswitch/nsstest.h
similarity index 100%
rename from source/torture/nsstest.h
rename to source/nsswitch/nsstest.h
diff --git a/source/torture/nsstest.m4 b/source/nsswitch/nsstest.m4
similarity index 100%
rename from source/torture/nsstest.m4
rename to source/nsswitch/nsstest.m4
diff --git a/source/torture/config.mk b/source/torture/config.mk
index 6a825b01a81..42f1d72bb03 100644
--- a/source/torture/config.mk
+++ b/source/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