lib:replace: Remove NIS support

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/replace/system/nis.h b/lib/replace/system/nis.h
deleted file mode 100644 (file)
index 7213b15..0000000
--- a/lib/replace/system/nis.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   nis system include wrappers
-
-   Copyright (C) Andrew Tridgell 2004
-
-     ** NOTE! The following LGPL license applies to the replace
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _nis_passwd_h
-#define _nis_passwd_h
-
-#if defined(HAVE_RPC_RPC_H)
-/*
- * Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h.
- */
-#if defined(HAVE_SYS_SECURITY_H) && defined(HAVE_RPC_AUTH_ERROR_CONFLICT)
-#undef AUTH_ERROR
-#endif /* HAVE_SYS_SECURITY_H && HAVE_RPC_AUTH_ERROR_CONFLICT */
-
-#include <rpc/rpc.h>
-#endif /* HAVE_RPC_RPC_H */
-
-
-#if defined (HAVE_NETGROUP)
-
-#if defined(HAVE_RPCSVC_YP_PROT_H)
-
-#include <rpcsvc/yp_prot.h>
-
-#endif /* HAVE_RPCSVC_YP_PROT_H */
-
-#if defined(HAVE_RPCSVC_YPCLNT_H)
-#include <rpcsvc/ypclnt.h>
-#endif /* HAVE_RPCSVC_YPCLNT_H */
-
-#endif /* HAVE_NETGROUP */
-
-#endif /* _nis_passwd_h */

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 21b29bb9b9011721b2bbdb505ba28aa8f59efafd..dac3042bb6559dbe6195dbc3439beeb89f682ad9 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -95,17 +95,6 @@ def configure(conf):
     if not conf.CONFIG_SET('HAVE_RPC_RPC_H'):
             Logs.warn('No rpc/rpc.h header found, tirpc or libntirpc missing?')
 
-    if not conf.CHECK_LIB('nsl'):
-        conf.SET_TARGET_TYPE('nsl', 'EMPTY')
-    conf.CHECK_HEADERS('rpc/rpc.h rpcsvc/yp_prot.h', lib='tirpc')
-    if not conf.CONFIG_SET('HAVE_RPCSVC_YP_PROT_H'):
-        if conf.CHECK_CFG(package='libnsl', args='--cflags --libs',
-                          msg='Checking for libnsl',
-                          uselib_store='NSL'):
-            conf.SET_TARGET_TYPE('nsl', 'SYSLIB')
-            conf.CHECK_HEADERS('rpc/rpc.h rpcsvc/yp_prot.h', lib='tirpc nsl')
-    conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h', lib='tirpc nsl')
-
     # This file is decprecated with glibc >= 2.30 so we need to check if it
     # includes a deprecation warning:
     # #warning "The <sys/sysctl.h> header is deprecated and will be removed."