summaryrefslogtreecommitdiffstats
path: root/lib/replace
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2013-07-03 14:04:57 +0200
committerStefan Metzmacher <metze@samba.org>2014-04-17 14:56:06 +0200
commitb2163f23c09128ad0d2765a1a4c9a993500b588f (patch)
treea99245dd572b1519192c1da208ade0a7d1bfb1f3 /lib/replace
parentf95e86828a33690f7bb22d320d6781f2b749f8e1 (diff)
downloadsamba-b2163f23c09128ad0d2765a1a4c9a993500b588f.tar.gz
samba-b2163f23c09128ad0d2765a1a4c9a993500b588f.tar.xz
samba-b2163f23c09128ad0d2765a1a4c9a993500b588f.zip
Remove special nss_wrapper code
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib/replace')
-rw-r--r--lib/replace/system/passwd.h12
-rw-r--r--lib/replace/wscript2
2 files changed, 1 insertions, 13 deletions
diff --git a/lib/replace/system/passwd.h b/lib/replace/system/passwd.h
index ba738a7edb4..f8b9a774b3d 100644
--- a/lib/replace/system/passwd.h
+++ b/lib/replace/system/passwd.h
@@ -27,9 +27,6 @@
*/
-/* this needs to be included before nss_wrapper.h on some systems */
-#include <unistd.h>
-
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
@@ -88,13 +85,4 @@
#define ULTRIX_AUTH 1
#endif
-#ifdef NSS_WRAPPER
-#ifndef NSS_WRAPPER_DISABLE
-#ifndef NSS_WRAPPER_NOT_REPLACE
-#define NSS_WRAPPER_REPLACE
-#endif /* NSS_WRAPPER_NOT_REPLACE */
-#include "../nss_wrapper/nss_wrapper.h"
-#endif /* NSS_WRAPPER_DISABLE */
-#endif /* NSS_WRAPPER */
-
#endif
diff --git a/lib/replace/wscript b/lib/replace/wscript
index f26ae943e20..680eb4ca1fb 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -617,7 +617,7 @@ def build(bld):
REPLACE_HOSTCC_SOURCE,
use_hostcc=True,
use_global_deps=False,
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+ cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
group='compiler_libraries',
deps = extra_libs
)