diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-02-18 13:55:15 +0000 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2004-02-18 13:55:15 +0000 |
commit | 932026724ff7e8050cfa0412c45168c25ee47e1a (patch) | |
tree | 90f4ffb4c8bc27e4684dee93598e1b6852f2eea2 /source4 | |
parent | 947f90b881d6155cb71398def58390d45b66bcbd (diff) | |
download | samba-932026724ff7e8050cfa0412c45168c25ee47e1a.tar.gz samba-932026724ff7e8050cfa0412c45168c25ee47e1a.tar.bz2 samba-932026724ff7e8050cfa0412c45168c25ee47e1a.zip |
remove unused NISPLUS/AUTOMOUNT stuff
metze
(This used to be commit cbfa29549e5b302f947c7f2ca14fbea257e46c33)
Diffstat (limited to 'source4')
-rw-r--r-- | source4/build/m4/rewrite.m4 | 11 | ||||
-rw-r--r-- | source4/include/includes.h | 2 | ||||
-rw-r--r-- | source4/lib/util.c | 31 |
3 files changed, 1 insertions, 43 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index a75568b599..4f8fbdc2ca 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -1539,17 +1539,6 @@ fi ;; esac -AC_CACHE_CHECK([for broken nisplus include files],samba_cv_BROKEN_NISPLUS_INCLUDE_FILES,[ -AC_TRY_COMPILE([#include <sys/acl.h> -#if defined(HAVE_RPCSVC_NIS_H) -#include <rpcsvc/nis.h> -#endif], -[int i;], -samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no,samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes)]) -if test x"$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" = x"yes"; then - AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES,1,[Whether the nisplus include files are broken]) -fi - AC_SUBST(SMBD_EXTRA_OBJS) AC_SUBST(SMBD_EXTRA_LIBS) diff --git a/source4/include/includes.h b/source4/include/includes.h index 32132b9fcd..71ecaa508e 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -798,7 +798,7 @@ struct functable { #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDB_SAM)) +#if (!defined(WITH_LDAP) && !defined(WITH_TDB_SAM)) #define USE_SMBPASS_DB 1 #endif diff --git a/source4/lib/util.c b/source4/lib/util.c index 233609263d..0cb5258a64 100644 --- a/source4/lib/util.c +++ b/source4/lib/util.c @@ -24,37 +24,6 @@ #include "includes.h" -#if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT)) -#ifdef WITH_NISPLUS_HOME -#ifdef BROKEN_NISPLUS_INCLUDE_FILES -/* - * The following lines are needed due to buggy include files - * in Solaris 2.6 which define GROUP in both /usr/include/sys/acl.h and - * also in /usr/include/rpcsvc/nis.h. The definitions conflict. JRA. - * Also GROUP_OBJ is defined as 0x4 in /usr/include/sys/acl.h and as - * an enum in /usr/include/rpcsvc/nis.h. - */ - -#if defined(GROUP) -#undef GROUP -#endif - -#if defined(GROUP_OBJ) -#undef GROUP_OBJ -#endif - -#endif /* BROKEN_NISPLUS_INCLUDE_FILES */ - -#include <rpcsvc/nis.h> - -#else /* !WITH_NISPLUS_HOME */ - -#include "rpcsvc/ypclnt.h" - -#endif /* WITH_NISPLUS_HOME */ -#endif /* HAVE_NETGROUP && WITH_AUTOMOUNT */ - - /**************************************************************************n Find a suitable temporary directory. The result should be copied immediately as it may be overwritten by a subsequent call. |