remove the ldap-schema.[ch] files since this is now fully implemented in the database specific files

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@378 ef36b2f9-881f-0410-afb5-c4e39611909c

17 files changed, 0 insertions, 234 deletions

diff --git a/nslcd/Makefile.am b/nslcd/Makefile.am
index 14257a4..ea3e75f 100644
--- a/nslcd/Makefile.am
+++ b/nslcd/Makefile.am
@@ -26,7 +26,6 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
 nslcd_SOURCES = nslcd.c ../nslcd.h ../nslcd-common.h \
                 log.c log.h \
                 common.c common.h \
-                ldap-schema.c ldap-schema.h \
                 ldap-nss.c ldap-nss.h \
                 pagectrl.c pagectrl.h \
                 util.c util.h \
diff --git a/nslcd/alias.c b/nslcd/alias.c
index 9cba228..612cd1b 100644
--- a/nslcd/alias.c
+++ b/nslcd/alias.c
@@ -43,7 +43,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 /* the attributes to request with searches */
 static const char *alias_attrs[3];
diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index 74cfa9e..7865254 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -37,7 +37,6 @@
 #include "ldap-nss.h"
 #include "util.h"
 #include "log.h"
-#include "ldap-schema.h"
 #include "cfg.h"
 #include "attmap.h"
 
diff --git a/nslcd/ether.c b/nslcd/ether.c
index 25ce24a..31fe276 100644
--- a/nslcd/ether.c
+++ b/nslcd/ether.c
@@ -59,7 +59,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 #ifndef HAVE_STRUCT_ETHER_ADDR
 struct ether_addr {
diff --git a/nslcd/group.c b/nslcd/group.c
index 687790a..f3d73ea 100644
--- a/nslcd/group.c
+++ b/nslcd/group.c
@@ -50,7 +50,6 @@
 #include "log.h"
 #include "cfg.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 /* FIXME: fix following problem:
           if the entry has multiple cn fields we may end up
diff --git a/nslcd/host.c b/nslcd/host.c
index 9d1cc15..abb23b6 100644
--- a/nslcd/host.c
+++ b/nslcd/host.c
@@ -54,7 +54,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 #ifndef MAXALIASES
 #define MAXALIASES 35
diff --git a/nslcd/ldap-nss.c b/nslcd/ldap-nss.c
index 7f56429..3a36010 100644
--- a/nslcd/ldap-nss.c
+++ b/nslcd/ldap-nss.c
@@ -79,7 +79,6 @@
 #include "pagectrl.h"
 #include "common.h"
 #include "log.h"
-#include "ldap-schema.h"
 #include "cfg.h"
 #include "attmap.h"
 
@@ -772,8 +771,6 @@ do_init (void)
   __session.ls_timestamp = 0;
   __session.ls_state = LS_UNINITIALIZED;
 
-  _nss_ldap_init_filters ();
-
 #ifdef HAVE_LDAP_SET_OPTION
   if (nslcd_cfg->ldc_debug)
     {
diff --git a/nslcd/ldap-schema.c b/nslcd/ldap-schema.c
deleted file mode 100644
index 8177656..0000000
--- a/nslcd/ldap-schema.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-   ldap-schema.c - LDAP schema information functions and definitions
-   This file was part of the nss_ldap library which has been
-   forked into the nss-ldapd library.
-
-   Copyright (C) 1997-2005 Luke Howard
-   Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007 Arthur de Jong
-
-   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 2.1 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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA
-*/
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_LBER_H
-#include <lber.h>
-#endif
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-#if defined(HAVE_THREAD_H)
-#include <thread.h>
-#elif defined(HAVE_PTHREAD_H)
-#include <pthread.h>
-#endif
-
-#include "ldap-nss.h"
-#include "ldap-schema.h"
-#include "util.h"
-#include "attmap.h"
-#include "cfg.h"
-
-/* max number of attributes per object class */
-#define ATTRTAB_SIZE    15
-
-/**
- * declare filters formerly declared in ldap-*.h
- */
-
-/* rfc822 mail aliases */
-char _nss_ldap_filt_getaliasent[LDAP_FILT_MAXSIZ];
-
-/* MAC address mappings */
-char _nss_ldap_filt_getetherent[LDAP_FILT_MAXSIZ];
-
-/* groups */
-char _nss_ldap_filt_getgrent[LDAP_FILT_MAXSIZ];
-char _nss_ldap_filt_getgroupsbymemberanddn[LDAP_FILT_MAXSIZ];
-char _nss_ldap_filt_getgroupsbydn[LDAP_FILT_MAXSIZ];
-char _nss_ldap_filt_getgroupsbymember[LDAP_FILT_MAXSIZ];
-
-/* IP hosts */
-char _nss_ldap_filt_gethostent[LDAP_FILT_MAXSIZ];
-
-/* IP networks */
-char _nss_ldap_filt_getnetent[LDAP_FILT_MAXSIZ];
-
-/* IP protocols */
-char _nss_ldap_filt_getprotoent[LDAP_FILT_MAXSIZ];
-
-/* users */
-char _nss_ldap_filt_getpwent[LDAP_FILT_MAXSIZ];
-
-/* RPCs */
-char _nss_ldap_filt_getrpcent[LDAP_FILT_MAXSIZ];
-
-/* IP services */
-char _nss_ldap_filt_getservent[LDAP_FILT_MAXSIZ];
-
-/* shadow users */
-char _nss_ldap_filt_getspent[LDAP_FILT_MAXSIZ];
-
-/**
- * lookup filter initialization
- */
-void
-_nss_ldap_init_filters ()
-{
-  /* rfc822 mail aliases */
-  snprintf (_nss_ldap_filt_getaliasent, LDAP_FILT_MAXSIZ,
-            "(%s=%s)", attmap_objectClass, attmap_alias_objectClass);
-
-  /* MAC address mappings */
-  snprintf (_nss_ldap_filt_getetherent, LDAP_FILT_MAXSIZ, "(%s=%s)",
-            attmap_objectClass, attmap_ether_objectClass);
-
-  /* groups */
-  snprintf (_nss_ldap_filt_getgrent, LDAP_FILT_MAXSIZ, "(&(%s=%s))",
-            attmap_objectClass, attmap_group_objectClass);
-  snprintf (_nss_ldap_filt_getgroupsbymemberanddn, LDAP_FILT_MAXSIZ,
-            "(&(%s=%s)(|(%s=%s)(%s=%s)))",
-            attmap_objectClass, attmap_group_objectClass, attmap_group_memberUid, "%s", attmap_group_uniqueMember, "%s");
-  snprintf (_nss_ldap_filt_getgroupsbydn, LDAP_FILT_MAXSIZ,
-            "(&(%s=%s)(%s=%s))",
-            attmap_objectClass, attmap_group_objectClass, attmap_group_uniqueMember, "%s");
-  snprintf (_nss_ldap_filt_getgroupsbymember, LDAP_FILT_MAXSIZ,
-            "(&(%s=%s)(%s=%s))", attmap_objectClass, attmap_group_objectClass, attmap_group_memberUid,
-            "%s");
-
-  /* IP hosts */
-  snprintf (_nss_ldap_filt_gethostent, LDAP_FILT_MAXSIZ, "(%s=%s)",
-            attmap_objectClass, attmap_host_objectClass);
-
-  /* IP networks */
-  snprintf (_nss_ldap_filt_getnetent, LDAP_FILT_MAXSIZ, "(%s=%s)",
-            attmap_objectClass, attmap_network_objectClass);
-
-  /* IP protocols */
-  snprintf (_nss_ldap_filt_getprotoent, LDAP_FILT_MAXSIZ, "(%s=%s)",
-            attmap_objectClass, attmap_protocol_objectClass);
-
-  /* users */
-  snprintf (_nss_ldap_filt_getpwent, LDAP_FILT_MAXSIZ,
-            "(%s=%s)", attmap_objectClass, attmap_passwd_objectClass);
-
-  /* RPCs */
-  snprintf (_nss_ldap_filt_getrpcent, LDAP_FILT_MAXSIZ, "(%s=%s)",
-            attmap_objectClass, attmap_rpc_objectClass);
-
-  /* IP services */
-  snprintf (_nss_ldap_filt_getservent, LDAP_FILT_MAXSIZ, "(%s=%s)",
-            attmap_objectClass, attmap_service_objectClass);
-
-  /* shadow users */
-  snprintf (_nss_ldap_filt_getspent, LDAP_FILT_MAXSIZ,
-            "(%s=%s)", attmap_objectClass, attmap_shadow_objectClass);
-
-}
diff --git a/nslcd/ldap-schema.h b/nslcd/ldap-schema.h
deleted file mode 100644
index 68d5eac..0000000
--- a/nslcd/ldap-schema.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-   ldap-schema.h - LDAP schema information functions and definitions
-   This file was part of the nss_ldap library which has been
-   forked into the nss-ldapd library.
-
-   Copyright (C) 1997-2005 Luke Howard
-   Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007 Arthur de Jong
-
-   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 2.1 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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA
-*/
-
-#ifndef _LDAP_NSS_LDAP_LDAP_SCHEMA_H
-#define _LDAP_NSS_LDAP_LDAP_SCHEMA_H
-
-/**
- * function to initialize global lookup filters.
- */
-void _nss_ldap_init_filters(void);
-
-/**
- * make filters formerly declared in ldap-*.h globally available.
- */
-
-/* rfc822 mail aliases */
-extern char _nss_ldap_filt_getaliasent[];
-
-/* MAC address mappings */
-extern char _nss_ldap_filt_getetherent[];
-
-/* groups */
-extern char _nss_ldap_filt_getgrent[];
-extern char _nss_ldap_filt_getgroupsbymemberanddn[];
-extern char _nss_ldap_filt_getgroupsbydn[];
-extern char _nss_ldap_filt_getgroupsbymember[];
-
-/* IP hosts */
-extern char _nss_ldap_filt_gethostent[];
-
-/* IP networks */
-extern char _nss_ldap_filt_getnetent[];
-
-/* IP protocols */
-extern char _nss_ldap_filt_getprotoent[];
-
-/* users */
-extern char _nss_ldap_filt_getpwent[];
-
-/* RPCs */
-extern char _nss_ldap_filt_getrpcent[];
-
-/* IP services */
-extern char _nss_ldap_filt_getservent[];
-
-/* shadow users */
-extern char _nss_ldap_filt_getspent[];
-
-#endif /* _LDAP_NSS_LDAP_LDAP_SCHEMA_H */
diff --git a/nslcd/netgroup.c b/nslcd/netgroup.c
index a1ef35e..a426551 100644
--- a/nslcd/netgroup.c
+++ b/nslcd/netgroup.c
@@ -53,7 +53,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 /* A netgroup can consist of names of other netgroups.  We have to
    track which netgroups were read and which still have to be read.  */
diff --git a/nslcd/network.c b/nslcd/network.c
index b7b9b2b..1033c06 100644
--- a/nslcd/network.c
+++ b/nslcd/network.c
@@ -51,7 +51,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 #if defined(HAVE_USERSEC_H)
 #define MAXALIASES 35
diff --git a/nslcd/passwd.c b/nslcd/passwd.c
index 17d3ca7..2c48ccc 100644
--- a/nslcd/passwd.c
+++ b/nslcd/passwd.c
@@ -49,7 +49,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 #ifndef UID_NOBODY
 #define UID_NOBODY      (-2)
diff --git a/nslcd/protocol.c b/nslcd/protocol.c
index 278241f..4ec646f 100644
--- a/nslcd/protocol.c
+++ b/nslcd/protocol.c
@@ -53,7 +53,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 /* the attributes to request with searches */
 static const char *protocol_attrs[3];
diff --git a/nslcd/rpc.c b/nslcd/rpc.c
index 8b9c4f5..51ec6c9 100644
--- a/nslcd/rpc.c
+++ b/nslcd/rpc.c
@@ -57,7 +57,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 /* macros for expanding the NSLCD_RPC macro */
 #define NSLCD_STRING(field)     WRITE_STRING(fp,field)
diff --git a/nslcd/service.c b/nslcd/service.c
index cbfab55..791d8c0 100644
--- a/nslcd/service.c
+++ b/nslcd/service.c
@@ -57,7 +57,6 @@
 #include "common.h"
 #include "log.h"
 #include "attmap.h"
-#include "ldap-schema.h"
 
 /* macros for expanding the NSLCD_SERVICE macro */
 #define NSLCD_STRING(field)     WRITE_STRING(fp,field)
diff --git a/nslcd/shadow.c b/nslcd/shadow.c
index f569de7..e9fd76c 100644
--- a/nslcd/shadow.c
+++ b/nslcd/shadow.c
@@ -50,7 +50,6 @@
 #include "log.h"
 #include "attmap.h"
 #include "cfg.h"
-#include "ldap-schema.h"
 
 /* the attributes to request with searches */
 static const char *shadow_attrs[10];
diff --git a/nslcd/util.c b/nslcd/util.c
index bd08825..368d78c 100644
--- a/nslcd/util.c
+++ b/nslcd/util.c
@@ -54,7 +54,6 @@
 #include "common.h"
 #include "log.h"
 #include "cfg.h"
-#include "ldap-schema.h"
 #include "attmap.h"