diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | exports.solaris | 30 | ||||
| -rw-r--r-- | ldap-alias.c | 1 | ||||
| -rw-r--r-- | ldap-alias.h | 32 | ||||
| -rw-r--r-- | ldap-automount.c | 16 | ||||
| -rw-r--r-- | ldap-automount.h | 52 | ||||
| -rw-r--r-- | ldap-bp.c | 58 | ||||
| -rw-r--r-- | ldap-bp.h | 40 | ||||
| -rw-r--r-- | ldap-ethers.c | 14 | ||||
| -rw-r--r-- | ldap-ethers.h | 62 | ||||
| -rw-r--r-- | ldap-grp.c | 1 | ||||
| -rw-r--r-- | ldap-grp.h | 32 | ||||
| -rw-r--r-- | ldap-hosts.c | 41 | ||||
| -rw-r--r-- | ldap-hosts.h | 39 | ||||
| -rw-r--r-- | ldap-netgrp.c | 1 | ||||
| -rw-r--r-- | ldap-netgrp.h | 32 | ||||
| -rw-r--r-- | ldap-network.c | 1 | ||||
| -rw-r--r-- | ldap-network.h | 33 | ||||
| -rw-r--r-- | ldap-proto.c | 1 | ||||
| -rw-r--r-- | ldap-proto.h | 39 | ||||
| -rw-r--r-- | ldap-pwd.c | 1 | ||||
| -rw-r--r-- | ldap-pwd.h | 27 | ||||
| -rw-r--r-- | ldap-rpc.c | 1 | ||||
| -rw-r--r-- | ldap-rpc.h | 38 | ||||
| -rw-r--r-- | ldap-service.c | 1 | ||||
| -rw-r--r-- | ldap-service.h | 43 | ||||
| -rw-r--r-- | ldap-spwd.c | 1 | ||||
| -rw-r--r-- | ldap-spwd.h | 32 |
28 files changed, 49 insertions, 622 deletions
diff --git a/Makefile.am b/Makefile.am index a5eb50e..5237415 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ man_MANS = nss_ldap.5 nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c \ ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \ ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \ - ldap-bp.c ldap-automount.c util.c ltf.c resolve.c \ + ldap-automount.c util.c ltf.c resolve.c \ dnsconfig.c pagectrl.c nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@ diff --git a/exports.solaris b/exports.solaris deleted file mode 100644 index e65c6c9..0000000 --- a/exports.solaris +++ /dev/null @@ -1,30 +0,0 @@ -#ident $Id$ -nss_ldap.so.1 { - global: - # Published NSS service module interfaces - _nss_ldap_bootparams_constr; - _nss_ldap_ethers_constr; - _nss_ldap_group_constr; - _nss_ldap_hosts_constr; - _nss_ldap_networks_constr; - _nss_ldap_protocols_constr; - _nss_ldap_passwd_constr; - _nss_ldap_rpc_constr; - _nss_ldap_services_constr; - _nss_ldap_shadow_constr; - _nss_ldap_netgroup_constr; - # libsldap library interfaces - __ns_ldap_getMappedAttributes; - __ns_ldap_getMappedObjectClass; - __ns_ldap_getParam; - __ns_ldap_freeError; - __ns_ldap_freeEntry; - __ns_ldap_freeResult; - __ns_ldap_list; - __ns_ldap_err2str; - __ns_ldap_firstEntry; - __ns_ldap_nextEntry; - __ns_ldap_endEntry; - local: - *; -}; diff --git a/ldap-alias.c b/ldap-alias.c index 973ec63..be518cb 100644 --- a/ldap-alias.c +++ b/ldap-alias.c @@ -43,7 +43,6 @@ #include <aliases.h> #include "ldap-nss.h" -#include "ldap-alias.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H diff --git a/ldap-alias.h b/ldap-alias.h deleted file mode 100644 index 5238412..0000000 --- a/ldap-alias.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_ALIAS_H -#define _LDAP_NSS_LDAP_LDAP_ALIAS_H - -static enum nss_status _nss_ldap_parse_alias (LDAPMessage * e, - ldap_state_t *, - void *result, - char *buffer, size_t buflen); - -#endif /* _LDAP_NSS_LDAP_LDAP_ALIAS_H */ diff --git a/ldap-automount.c b/ldap-automount.c index 2784753..7edc5d9 100644 --- a/ldap-automount.c +++ b/ldap-automount.c @@ -50,13 +50,27 @@ #endif #include "ldap-nss.h" -#include "ldap-automount.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H #include <port_after.h> #endif +/* Linux only for now */ +struct ldap_automount_context { + /* Enumeration state */ + ent_context_t *lac_state; + + /* DNs of containers representing automount map */ + char **lac_dn_list; + size_t lac_dn_size; + size_t lac_dn_count; + size_t lac_dn_index; +}; + +typedef struct ldap_automount_context ldap_automount_context_t; + + static enum nss_status _nss_ldap_parse_automount (LDAPMessage * e, ldap_state_t * pvt, diff --git a/ldap-automount.h b/ldap-automount.h deleted file mode 100644 index 4b8e45f..0000000 --- a/ldap-automount.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - Copyright (C) 2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 2005. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_AUTOMOUNT_H -#define _LDAP_NSS_LDAP_LDAP_AUTOMOUNT_H - -/* Linux only for now */ -struct ldap_automount_context { - /* Enumeration state */ - ent_context_t *lac_state; - - /* DNs of containers representing automount map */ - char **lac_dn_list; - size_t lac_dn_size; - size_t lac_dn_count; - size_t lac_dn_index; -}; - -typedef struct ldap_automount_context ldap_automount_context_t; - -enum nss_status _nss_ldap_am_context_alloc(ldap_automount_context_t **pContext); -void _nss_ldap_am_context_free(ldap_automount_context_t **pContext); -enum nss_status _nss_ldap_am_context_init(const char *mapname, ldap_automount_context_t **pContext); -enum nss_status _nss_ldap_setautomntent(const char *mapname, void **context); -enum nss_status _nss_ldap_getautomntent(void *context, const char **key, const char **value, - char *buffer, size_t buflen, int *errnop); -enum nss_status _nss_ldap_endautomntent(void **context); -enum nss_status _nss_ldap_getautomntbyname_r(void *private, const char *key, - const char **canon_key, const char **value, - char *buffer, size_t buflen, int *errnop); - -#endif /* _LDAP_NSS_LDAP_LDAP_AUTOMOUNT_H */ diff --git a/ldap-bp.c b/ldap-bp.c deleted file mode 100644 index 270ec5e..0000000 --- a/ldap-bp.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#include "config.h" - -#ifdef HAVE_PORT_BEFORE_H -#include <port_before.h> -#endif - -#if defined(HAVE_THREAD_H) -#include <thread.h> -#elif defined(HAVE_PTHREAD_H) -#include <pthread.h> -#endif - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <netdb.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#ifdef HAVE_LBER_H -#include <lber.h> -#endif -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - -#include "ldap-nss.h" -#include "ldap-bp.h" -#include "util.h" - -#ifdef HAVE_PORT_AFTER_H -#include <port_after.h> -#endif - diff --git a/ldap-bp.h b/ldap-bp.h deleted file mode 100644 index f05433f..0000000 --- a/ldap-bp.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_BP_H -#define _LDAP_NSS_LDAP_LDAP_BP_H - -/* I'm guessing here. This is certainly wrong. */ -struct bootparams -{ - char *bp_name; - char **bp_params; -}; - - -static enum nss_status _nss_ldap_parse_bp (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - -#endif /* _LDAP_NSS_LDAP_LDAP_BP_H */ diff --git a/ldap-ethers.c b/ldap-ethers.c index 2c4d768..ddedcd4 100644 --- a/ldap-ethers.c +++ b/ldap-ethers.c @@ -62,7 +62,6 @@ #endif #include "ldap-nss.h" -#include "ldap-ethers.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H @@ -74,6 +73,19 @@ #define NSS_BUFLEN_ETHERS 1024 #endif /* NSS_BUFLEN_ETHERS */ +#ifndef HAVE_STRUCT_ETHER_ADDR +struct ether_addr { + u_char ether_addr_octet[6]; +}; +#endif + + +struct ether +{ + char *e_name; + struct ether_addr e_addr; +}; + static ent_context_t *ether_context = NULL; diff --git a/ldap-ethers.h b/ldap-ethers.h deleted file mode 100644 index aa57ea1..0000000 --- a/ldap-ethers.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_ETHERS_H -#define _LDAP_NSS_LDAP_LDAP_ETHERS_H - -#ifdef HAVE_NETINET_IF_ETHER_H -#include <netinet/if_ether.h> -#endif -#ifdef HAVE_NETINET_ETHER_H -#include <netinet/ether.h> -#endif - -#ifndef HAVE_STRUCT_ETHER_ADDR -struct ether_addr { - u_char ether_addr_octet[6]; -}; -#endif - -struct ether -{ - char *e_name; - struct ether_addr e_addr; -}; - -static enum nss_status _nss_ldap_parse_ether (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - -/* for the record */ -enum nss_status _nss_ldap_gethostton_r (const char *name, struct ether *eth, - char *buffer, size_t buflen, int *errnop); -enum nss_status _nss_ldap_getntohost_r (struct ether_addr *addr, struct ether *eth, - char *buffer, size_t buflen, int *errnop); -enum nss_status _nss_ldap_endetherent (void); -enum nss_status _nss_ldap_setetherent (void); -enum nss_status _nss_ldap_getetherent_r (struct ether *result, char *buffer, - size_t buflen, int *errnop); - - -#endif /* _LDAP_NSS_LDAP_LDAP_ETHERS_H */ @@ -48,7 +48,6 @@ #endif #include "ldap-nss.h" -#include "ldap-grp.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H diff --git a/ldap-grp.h b/ldap-grp.h deleted file mode 100644 index 9a55c46..0000000 --- a/ldap-grp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_GRP_H -#define _LDAP_NSS_LDAP_LDAP_GRP_H - -static enum nss_status _nss_ldap_parse_gr (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - -#endif /* _LDAP_NSS_LDAP_LDAP_GRP_H */ diff --git a/ldap-hosts.c b/ldap-hosts.c index cd88142..38a86b4 100644 --- a/ldap-hosts.c +++ b/ldap-hosts.c @@ -59,7 +59,6 @@ #endif #include "ldap-nss.h" -#include "ldap-hosts.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H @@ -69,26 +68,6 @@ static ent_context_t *hosts_context = NULL; static enum nss_status -_nss_ldap_parse_hostv4 (LDAPMessage * e, - ldap_state_t * pvt, - void *result, char *buffer, size_t buflen) -{ - return _nss_ldap_parse_host (e, pvt, result, buffer, buflen, - AF_INET); -} - -#ifdef INET6 -static enum nss_status -_nss_ldap_parse_hostv6 (LDAPMessage * e, - ldap_state_t * pvt, - void *result, char *buffer, size_t buflen) -{ - return _nss_ldap_parse_host (e, pvt, result, buffer, buflen, - AF_INET6); -} -#endif - -static enum nss_status _nss_ldap_parse_host (LDAPMessage * e, ldap_state_t * pvt, void *result, char *buffer, size_t buflen, @@ -231,6 +210,26 @@ _nss_ldap_parse_host (LDAPMessage * e, return NSS_SUCCESS; } +static enum nss_status +_nss_ldap_parse_hostv4 (LDAPMessage * e, + ldap_state_t * pvt, + void *result, char *buffer, size_t buflen) +{ + return _nss_ldap_parse_host (e, pvt, result, buffer, buflen, + AF_INET); +} + +#ifdef INET6 +static enum nss_status +_nss_ldap_parse_hostv6 (LDAPMessage * e, + ldap_state_t * pvt, + void *result, char *buffer, size_t buflen) +{ + return _nss_ldap_parse_host (e, pvt, result, buffer, buflen, + AF_INET6); +} +#endif + enum nss_status _nss_ldap_gethostbyname2_r (const char *name, int af, struct hostent * result, char *buffer, size_t buflen, int *errnop, diff --git a/ldap-hosts.h b/ldap-hosts.h deleted file mode 100644 index 9d193be..0000000 --- a/ldap-hosts.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_HOSTS_H -#define _LDAP_NSS_LDAP_LDAP_HOSTS_H - -/* - * It's critical that we support IPv6 both in the IRS and the NSS modules. - * For code, check out the BIND IRS and the glibc as it stands. Both support - * NIS lookups for IPv6 addresses. - * - */ - -static enum nss_status _nss_ldap_parse_host (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen, int af); - -#endif /* _LDAP_NSS_LDAP_LDAP_HOSTS_H */ diff --git a/ldap-netgrp.c b/ldap-netgrp.c index e3206df..b0db478 100644 --- a/ldap-netgrp.c +++ b/ldap-netgrp.c @@ -52,7 +52,6 @@ #endif #include "ldap-nss.h" -#include "ldap-netgrp.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H diff --git a/ldap-netgrp.h b/ldap-netgrp.h deleted file mode 100644 index f7fdc9e..0000000 --- a/ldap-netgrp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_NETGRP_H -#define _LDAP_NSS_LDAP_LDAP_NETGRP_H - - -static enum nss_status _nss_ldap_parse_netgr (void *result, - char *buffer, size_t buflen); - - -#endif /* _LDAP_NSS_LDAP_LDAP_NETGRP_H */ diff --git a/ldap-network.c b/ldap-network.c index 552850e..83a7d0d 100644 --- a/ldap-network.c +++ b/ldap-network.c @@ -53,7 +53,6 @@ #endif #include "ldap-nss.h" -#include "ldap-network.h" #include "util.h" #if defined(HAVE_USERSEC_H) diff --git a/ldap-network.h b/ldap-network.h deleted file mode 100644 index b185e4c..0000000 --- a/ldap-network.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_NETWORK_H -#define _LDAP_NSS_LDAP_LDAP_NETWORK_H - -static enum nss_status _nss_ldap_parse_net (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - - -#endif /* _LDAP_NSS_LDAP_LDAP_NETWORK_H */ diff --git a/ldap-proto.c b/ldap-proto.c index 0394682..d733a3d 100644 --- a/ldap-proto.c +++ b/ldap-proto.c @@ -52,7 +52,6 @@ #endif #include "ldap-nss.h" -#include "ldap-proto.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H diff --git a/ldap-proto.h b/ldap-proto.h deleted file mode 100644 index 599eadd..0000000 --- a/ldap-proto.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_PROTO_H -#define _LDAP_NSS_LDAP_LDAP_PROTO_H - -/* - Determine the canonical name of the protocol with _nss_ldap_getrdnvalue(), - and assign any values of "cn" which do NOT match this canonical name - as aliases. - */ - - -static enum nss_status _nss_ldap_parse_proto (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - -#endif /* _LDAP_NSS_LDAP_LDAP_PROTO_H */ @@ -45,7 +45,6 @@ #endif #include "ldap-nss.h" -#include "ldap-pwd.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H diff --git a/ldap-pwd.h b/ldap-pwd.h deleted file mode 100644 index f911188..0000000 --- a/ldap-pwd.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_PWD_H -#define _LDAP_NSS_LDAP_LDAP_PWD_H - -#endif /* _LDAP_NSS_LDAP_LDAP_PWD_H */ @@ -57,7 +57,6 @@ #endif #include "ldap-nss.h" -#include "ldap-rpc.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H diff --git a/ldap-rpc.h b/ldap-rpc.h deleted file mode 100644 index eb24eb3..0000000 --- a/ldap-rpc.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_RPC_H -#define _LDAP_NSS_LDAP_LDAP_RPC_H - -/* - * Determine the canonical name of the RPC with _nss_ldap_getrdnvalue(), - * and assign any values of "cn" which do NOT match this canonical name - * as aliases. - */ - -static enum nss_status _nss_ldap_parse_rpc (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - -#endif /* _LDAP_NSS_LDAP_LDAP_RPC_H */ diff --git a/ldap-service.c b/ldap-service.c index 9827d11..6205b2b 100644 --- a/ldap-service.c +++ b/ldap-service.c @@ -57,7 +57,6 @@ #endif #include "ldap-nss.h" -#include "ldap-service.h" #include "util.h" #ifdef HAVE_PORT_AFTER_H diff --git a/ldap-service.h b/ldap-service.h deleted file mode 100644 index fdf99b0..0000000 --- a/ldap-service.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_SERVICE_H -#define _LDAP_NSS_LDAP_LDAP_SERVICE_H - -/* - * Determine the canonical name of the service with _nss_ldap_getrdnvalue(), - * and assign any values of "cn" which do NOT match this canonical name - * as aliases. - * - * You can use the ec_state in the context to derive multiple service - * entries from one LDAP entry. See the example in draft-...-nis-schema-xx.txt. - * - */ - - -static enum nss_status _nss_ldap_parse_serv (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - -#endif /* _LDAP_NSS_LDAP_LDAP_SERVICE_H */ diff --git a/ldap-spwd.c b/ldap-spwd.c index 8ca454f..94e0ee5 100644 --- a/ldap-spwd.c +++ b/ldap-spwd.c @@ -50,7 +50,6 @@ #endif #include "ldap-nss.h" -#include "ldap-spwd.h" #ifdef HAVE_PORT_AFTER_H #include <port_after.h> diff --git a/ldap-spwd.h b/ldap-spwd.h deleted file mode 100644 index a02a57a..0000000 --- a/ldap-spwd.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 1997-2005 Luke Howard - This file is part of the nss_ldap library. - Contributed by Luke Howard, <lukeh@padl.com>, 1997. - - The nss_ldap library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The nss_ldap 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the nss_ldap library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - $Id$ -*/ - -#ifndef _LDAP_NSS_LDAP_LDAP_SPWD_H -#define _LDAP_NSS_LDAP_LDAP_SPWD_H - -static enum nss_status _nss_ldap_parse_sp (LDAPMessage * e, - ldap_state_t * pvt, - void *result, - char *buffer, size_t buflen); - -#endif /* _LDAP_NSS_LDAP_LDAP_SPWD_H */ |