Merge branch 'singlensswrap' into single

Conflicts:
	source3/configure.in
	source4/Makefile
	source4/configure.ac
	source4/lib/nss_wrapper/nss_wrapper.c
	source4/lib/replace/system/passwd.h
	source4/main.mk

diff --cc nss_wrapper/nss_wrapper.c
Simple merge

diff --cc replace/system/passwd.h
Simple merge

diff --cc source3/configure.in
index 21c556c2f2613750d1dafa1d92634a0348ac9f84,3e1fb4925b63295c853facb158fdf01a5afc4e1b..ab634a33138e55e9293d7da987913ff260b928e2
--- 1/source3/configure.in
--- 2/source3/configure.in
+++ b/source3/configure.in
@@@ -131,8 -131,8 +131,8 @@@ els
        CFLAGS="-O"
  fi
  
 -m4_include(lib/socket_wrapper/config.m4)
 +m4_include(../socket_wrapper/config.m4)
- m4_include(lib/nss_wrapper/config.m4)
+ m4_include(../nss_wrapper/config.m4)
  
  m4_include(m4/swat.m4)
  

diff --cc source4/Makefile
index 8054dc82afe7fb5e35d6cc4143a8d9fca30c032c,f54a0eb5c3786e70998babe0ace57c6c91ef9c4e..8f81055324fceff726950f1bbd8efe2d5ea55b17
--- 1/source4/Makefile
--- 2/source4/Makefile
+++ b/source4/Makefile
@@@ -71,8 -71,8 +71,8 @@@ libmessagingsrcdir := lib/messagin
  libeventssrcdir := lib/events
  libcmdlinesrcdir := lib/cmdline
  poptsrcdir := lib/popt
 -socketwrappersrcdir := lib/socket_wrapper
 +socketwrappersrcdir := ../socket_wrapper
- nsswrappersrcdir := lib/nss_wrapper
+ nsswrappersrcdir := ../nss_wrapper
  appwebsrcdir := lib/appweb
  libstreamsrcdir := lib/stream
  libutilsrcdir := lib/util

diff --cc source4/configure.ac
index e9c8ebe9e0c5007486fe14e04869c6136c895d0f,096b7f37e53ed3cb9be2b82298232e0ee99aa106..c91589b7d2f0279c0f8e3f640fefa006903dc32b
--- 1/source4/configure.ac
--- 2/source4/configure.ac
+++ b/source4/configure.ac
@@@ -99,8 -99,8 +99,8 @@@ m4_include(auth/gensec/config.m4
  m4_include(smbd/process_model.m4)
  m4_include(ntvfs/posix/config.m4)
  m4_include(ntvfs/unixuid/config.m4)
 -m4_include(lib/socket_wrapper/config.m4)
 +m4_include(../socket_wrapper/config.m4)
- m4_include(lib/nss_wrapper/config.m4)
+ m4_include(../nss_wrapper/config.m4)
  m4_include(auth/config.m4)
  m4_include(kdc/config.m4)
  m4_include(ntvfs/sysdep/config.m4)

diff --cc source4/main.mk
index 52170821e89da193d096afce377c43a775d8a0f9,903acb6b0d3b57338c0d2aaa1ac4eae0b9ce15c8..5ab9f95c05348a4da888b5ec044d8c2eff6723e9
--- 1/source4/main.mk
--- 2/source4/main.mk
+++ b/source4/main.mk
@@@ -16,8 -16,8 +16,8 @@@ mkinclude lib/registry/config.m
  mkinclude lib/messaging/config.mk
  mkinclude lib/events/config.mk
  mkinclude lib/cmdline/config.mk
 -mkinclude lib/socket_wrapper/config.mk
 +mkinclude ../socket_wrapper/config.mk
- mkinclude lib/nss_wrapper/config.mk
+ mkinclude ../nss_wrapper/config.mk
  mkinclude lib/appweb/config.mk
  mkinclude lib/stream/config.mk
  mkinclude lib/util/config.mk