define the list of attributes to look up in searches in the service modules instead of in ldap-schema

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

1 files changed, 0 insertions, 176 deletions

diff --git a/nslcd/ldap-schema.c b/nslcd/ldap-schema.c
index e4ba186..5d316fa 100644
--- a/nslcd/ldap-schema.c
+++ b/nslcd/ldap-schema.c
@@ -239,179 +239,3 @@ _nss_ldap_init_filters ()
 
 }
 
-static void
-init_pwd_attributes (const char ***pwd_attrs)
-{
-  int i = 0;
-  static const char *__pwd_attrs[ATTRTAB_SIZE + 1];
-
-  (*pwd_attrs) = __pwd_attrs;
-
-  (*pwd_attrs)[i++] = attmap_passwd_uid;
-  (*pwd_attrs)[i++] = attmap_passwd_userPassword;
-  (*pwd_attrs)[i++] = attmap_passwd_uidNumber;
-  (*pwd_attrs)[i++] = attmap_passwd_gidNumber;
-  (*pwd_attrs)[i++] = attmap_passwd_cn;
-  (*pwd_attrs)[i++] = attmap_passwd_homeDirectory;
-  (*pwd_attrs)[i++] = attmap_passwd_loginShell;
-  (*pwd_attrs)[i++] = attmap_passwd_gecos;
-  (*pwd_attrs)[i++] = attmap_objectClass;
-  (*pwd_attrs)[i] = NULL;
-}
-
-static void
-init_sp_attributes (const char ***sp_attrs)
-{
-  static const char *__sp_attrs[ATTRTAB_SIZE + 1];
-
-  (*sp_attrs) = __sp_attrs;
-
-  (*sp_attrs)[0] = attmap_shadow_uid;
-  (*sp_attrs)[1] = attmap_shadow_userPassword;
-  (*sp_attrs)[2] = attmap_shadow_shadowLastChange;
-  (*sp_attrs)[3] = attmap_shadow_shadowMax;
-  (*sp_attrs)[4] = attmap_shadow_shadowMin;
-  (*sp_attrs)[5] = attmap_shadow_shadowWarning;
-  (*sp_attrs)[6] = attmap_shadow_shadowInactive;
-  (*sp_attrs)[7] = attmap_shadow_shadowExpire;
-  (*sp_attrs)[8] = attmap_shadow_shadowFlag;
-  (*sp_attrs)[9] = NULL;
-}
-
-static void
-init_grp_attributes (const char ***grp_attrs)
-{
-  int i = 0;
-  static const char *__grp_attrs[ATTRTAB_SIZE + 1];
-
-  (*grp_attrs) = __grp_attrs;
-
-  (*grp_attrs)[i++] = attmap_group_cn;
-  (*grp_attrs)[i++] = attmap_group_userPassword;
-  (*grp_attrs)[i++] = attmap_group_memberUid;
-  if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_RFC2307BIS))
-    (*grp_attrs)[i++] = attmap_group_uniqueMember;
-  (*grp_attrs)[i++] = attmap_group_gidNumber;
-  (*grp_attrs)[i] = NULL;
-}
-
-static void
-init_hosts_attributes (const char ***hosts_attrs)
-{
-  static const char *__hosts_attrs[ATTRTAB_SIZE + 1];
-
-  (*hosts_attrs) = __hosts_attrs;
-
-  (*hosts_attrs)[0] = attmap_host_cn;
-  (*hosts_attrs)[1] = attmap_host_ipHostNumber;
-  (*hosts_attrs)[2] = NULL;
-}
-
-static void
-init_services_attributes (const char ***services_attrs)
-{
-  static const char *__services_attrs[ATTRTAB_SIZE + 1];
-
-  (*services_attrs) = __services_attrs;
-
-  (*services_attrs)[0] = attmap_service_cn;
-  (*services_attrs)[1] = attmap_service_ipServicePort;
-  (*services_attrs)[2] = attmap_service_ipServiceProtocol;
-  (*services_attrs)[3] = NULL;
-}
-
-static void
-init_network_attributes (const char ***network_attrs)
-{
-  static const char *__network_attrs[ATTRTAB_SIZE + 1];
-
-  (*network_attrs) = __network_attrs;
-
-  (*network_attrs)[0] = attmap_network_cn;
-  (*network_attrs)[1] = attmap_network_ipNetworkNumber;
-  (*network_attrs)[2] = NULL;
-}
-
-static void
-init_proto_attributes (const char ***proto_attrs)
-{
-  static const char *__proto_attrs[ATTRTAB_SIZE + 1];
-
-  (*proto_attrs) = __proto_attrs;
-
-  (*proto_attrs)[0] = attmap_protocol_cn;
-  (*proto_attrs)[1] = attmap_protocol_ipProtocolNumber;
-  (*proto_attrs)[2] = NULL;
-}
-
-static void
-init_rpc_attributes (const char ***rpc_attrs)
-{
-  static const char *__rpc_attrs[ATTRTAB_SIZE + 1];
-
-  (*rpc_attrs) = __rpc_attrs;
-
-  (*rpc_attrs)[0] = attmap_rpc_cn;
-  (*rpc_attrs)[1] = attmap_rpc_oncRpcNumber;
-  (*rpc_attrs)[2] = NULL;
-}
-
-static void
-init_ethers_attributes (const char ***ethers_attrs)
-{
-  static const char *__ethers_attrs[ATTRTAB_SIZE + 1];
-
-  (*ethers_attrs) = __ethers_attrs;
-
-  (*ethers_attrs)[0] = attmap_ether_cn;
-  (*ethers_attrs)[1] = attmap_ether_macAddress;
-  (*ethers_attrs)[2] = NULL;
-}
-
-static void
-init_alias_attributes (const char ***alias_attrs)
-{
-  static const char *__alias_attrs[ATTRTAB_SIZE + 1];
-
-  (*alias_attrs) = __alias_attrs;
-
-  (*alias_attrs)[0] = attmap_alias_cn;
-  (*alias_attrs)[1] = attmap_alias_rfc822MailMember;
-  (*alias_attrs)[2] = NULL;
-}
-
-static void
-init_netgrp_attributes (const char ***netgrp_attrs)
-{
-  static const char *__netgrp_attrs[ATTRTAB_SIZE + 1];
-
-  (*netgrp_attrs) = __netgrp_attrs;
-
-  (*netgrp_attrs)[0] = attmap_netgroup_cn;
-  (*netgrp_attrs)[1] = attmap_netgroup_nisNetgroupTriple;
-  (*netgrp_attrs)[2] = attmap_netgroup_memberNisNetgroup;
-  (*netgrp_attrs)[3] = NULL;
-}
-
-/**
- * attribute table initialization routines
- */
-void
-_nss_ldap_init_attributes (const char ***attrtab)
-{
-  init_pwd_attributes (&attrtab[LM_PASSWD]);
-  init_sp_attributes (&attrtab[LM_SHADOW]);
-  init_grp_attributes (&attrtab[LM_GROUP]);
-  init_hosts_attributes (&attrtab[LM_HOSTS]);
-  init_services_attributes (&attrtab[LM_SERVICES]);
-  init_network_attributes (&attrtab[LM_NETWORKS]);
-  init_proto_attributes (&attrtab[LM_PROTOCOLS]);
-  init_rpc_attributes (&attrtab[LM_RPC]);
-  init_ethers_attributes (&attrtab[LM_ETHERS]);
-  init_alias_attributes (&attrtab[LM_ALIASES]);
-  init_netgrp_attributes (&attrtab[LM_NETGROUP]);
-
-  attrtab[LM_NONE] = NULL;
-}
-
-