From b2163f23c09128ad0d2765a1a4c9a993500b588f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 3 Jul 2013 14:04:57 +0200 Subject: [PATCH] Remove special nss_wrapper code Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher --- lib/replace/system/passwd.h | 12 ------------ lib/replace/wscript | 2 +- nsswitch/winbind_nss_config.h | 1 - source4/heimdal_build/wscript_build | 6 +++--- 4 files changed, 4 insertions(+), 17 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 - #ifdef HAVE_PWD_H #include #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 ) diff --git a/nsswitch/winbind_nss_config.h b/nsswitch/winbind_nss_config.h index e1ad3f64635..facde349dac 100644 --- a/nsswitch/winbind_nss_config.h +++ b/nsswitch/winbind_nss_config.h @@ -34,7 +34,6 @@ * so we better disable both */ #define SOCKET_WRAPPER_NOT_REPLACE -#define NSS_WRAPPER_NOT_REPLACE /* Include header files from data in config.h file */ diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index abda84803d3..53d7e509b6a 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -424,7 +424,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'): use_hostcc=True, use_global_deps=False, includes='../heimdal/lib/roken', - cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_', + cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_', group='compiler_libraries', deps='LIBREPLACE_HOSTCC', ) @@ -918,7 +918,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ASN1_COMPILE'): 'lib/asn1/main.c lib/asn1/gen.c lib/asn1/gen_copy.c lib/asn1/gen_decode.c lib/asn1/gen_encode.c lib/asn1/gen_free.c lib/asn1/gen_glue.c lib/asn1/gen_length.c lib/asn1/gen_seq.c lib/asn1/gen_template.c lib/asn1/hash.c lib/asn1/symbol.c lib/asn1/asn1parse.c lib/asn1/lex.c', 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_', includes='../heimdal/lib/asn1', group='build_compilers', deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC', @@ -934,7 +934,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'): use_global_deps=False, includes='../heimdal/lib/com_err', group='build_compilers', - cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_', + cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_', deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC', install=False ) -- 2.11.4.GIT