summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2014-04-07 16:09:00 +0200
committerStefan Metzmacher <metze@samba.org>2014-04-17 14:56:06 +0200
commitd407446ddc3dfa02c56e517d87238444f1c9b51b (patch)
tree292e35f67204af46b2c9aac478386c1efea71604 /nsswitch
parenta9c1d5bd636c5d87a0e165361038671cead58550 (diff)
downloadsamba-d407446ddc3dfa02c56e517d87238444f1c9b51b.tar.gz
Remove special socket_wrapper code.
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'nsswitch')
-rw-r--r--nsswitch/winbind_nss_config.h8
-rw-r--r--nsswitch/wscript_build2
2 files changed, 1 insertions, 9 deletions
diff --git a/nsswitch/winbind_nss_config.h b/nsswitch/winbind_nss_config.h
index facde349dac..fb3299d58a4 100644
--- a/nsswitch/winbind_nss_config.h
+++ b/nsswitch/winbind_nss_config.h
@@ -27,14 +27,6 @@
#undef SIZEOF_LONG
#endif
-/*
- * we don't need socket wrapper
- * nor nss wrapper here and we don't
- * want to depend on swrap_close()
- * so we better disable both
- */
-#define SOCKET_WRAPPER_NOT_REPLACE
-
/* Include header files from data in config.h file */
#ifndef NO_CONFIG_H
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 55ba776e5d7..cc17a2ef594 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -6,7 +6,7 @@ host_os = sys.platform
bld.SAMBA_LIBRARY('winbind-client',
source='wb_common.c',
deps='replace',
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+ cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
private_library=True
)