diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-12 12:34:06 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-12 12:34:06 +0000 |
| commit | c18cfefcbc8acb57b1d47c580db7f8c8f57d6e32 (patch) | |
| tree | e875ad93ab08492a58c687eecb362f6cc0b7a6f2 | |
| parent | f1de6decf34b37672e2c4cc3d191b689a95d07d1 (diff) | |
remove trailing spaces
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@14 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | ANNOUNCE | 2 | ||||
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | ChangeLog | 50 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rwxr-xr-x | certutil | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | dnsconfig.c | 2 | ||||
| -rw-r--r-- | dnsconfig.h | 2 | ||||
| -rw-r--r-- | ldap-alias.c | 2 | ||||
| -rw-r--r-- | ldap-alias.h | 2 | ||||
| -rw-r--r-- | ldap-automount.c | 6 | ||||
| -rw-r--r-- | ldap-automount.h | 2 | ||||
| -rw-r--r-- | ldap-bp.c | 2 | ||||
| -rw-r--r-- | ldap-bp.h | 2 | ||||
| -rw-r--r-- | ldap-ethers.c | 2 | ||||
| -rw-r--r-- | ldap-ethers.h | 2 | ||||
| -rw-r--r-- | ldap-grp.c | 6 | ||||
| -rw-r--r-- | ldap-grp.h | 2 | ||||
| -rw-r--r-- | ldap-hosts.c | 2 | ||||
| -rw-r--r-- | ldap-hosts.h | 2 | ||||
| -rw-r--r-- | ldap-netgrp.c | 6 | ||||
| -rw-r--r-- | ldap-netgrp.h | 2 | ||||
| -rw-r--r-- | ldap-network.c | 2 | ||||
| -rw-r--r-- | ldap-network.h | 2 | ||||
| -rw-r--r-- | ldap-nss.c | 36 | ||||
| -rw-r--r-- | ldap-nss.h | 14 | ||||
| -rw-r--r-- | ldap-parse.h | 2 | ||||
| -rw-r--r-- | ldap-proto.c | 2 | ||||
| -rw-r--r-- | ldap-proto.h | 4 | ||||
| -rw-r--r-- | ldap-pwd.c | 4 | ||||
| -rw-r--r-- | ldap-pwd.h | 2 | ||||
| -rw-r--r-- | ldap-rpc.c | 2 | ||||
| -rw-r--r-- | ldap-rpc.h | 2 | ||||
| -rw-r--r-- | ldap-schema.c | 2 | ||||
| -rw-r--r-- | ldap-schema.h | 8 | ||||
| -rw-r--r-- | ldap-service.c | 2 | ||||
| -rw-r--r-- | ldap-service.h | 2 | ||||
| -rw-r--r-- | ldap-spwd.c | 2 | ||||
| -rw-r--r-- | ldap-spwd.h | 2 | ||||
| -rw-r--r-- | ldap.conf | 8 | ||||
| -rw-r--r-- | ltf.c | 2 | ||||
| -rw-r--r-- | ltf.h | 2 | ||||
| -rw-r--r-- | nss_common.h | 14 | ||||
| -rw-r--r-- | nss_ldap.5 | 6 | ||||
| -rw-r--r-- | nss_ldap.spec | 6 | ||||
| -rw-r--r-- | pagectrl.c | 36 | ||||
| -rw-r--r-- | pagectrl.h | 4 | ||||
| -rw-r--r-- | resolve.c | 12 | ||||
| -rw-r--r-- | resolve.h | 12 | ||||
| -rw-r--r-- | util.c | 2 | ||||
| -rw-r--r-- | util.h | 4 |
54 files changed, 164 insertions, 164 deletions
@@ -17,7 +17,7 @@ nss_ldap nominally supports the following operating system libraries: o the Nameservice Switch in the GNU C Library 2.1 (as in libc.so.6 under Linux) o the Nameservice Switch in FreeBSD 5.x - o the Information Retrieval Service (IRS) in BIND + o the Information Retrieval Service (IRS) in BIND o the Information Retrieval Service (IRS) and proprietary authentication and identity interface in AIX 4.3.3 @@ -65,6 +65,6 @@ If I've forgotton anyone, please let me know. Contributors should appraise themselves of the document at http://www.padl.com/Articles/GuidelinesforContributing.html. --- +-- Luke Howard <lukeh@padl.com> @@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -368,7 +368,7 @@ $Id$ * incorporated patches from (see below) Geert Jansen * add the "sasl_secprops" option to configure SASL security layers (usage as for OpenLDAP ldap.conf) - * add the "krb5_ccname" option to specify the + * add the "krb5_ccname" option to specify the location of the Kerberos ticket cache (requires --enable-configurable-krb5-ccname for now as it is a fairly coarse solution to a lack @@ -439,7 +439,7 @@ $Id$ because nss_ldap in SRV mode trusts DNS we do not believe this to be exploitable to elevate privilege in the default configuration) - * do not malloc() configuration structure; use + * do not malloc() configuration structure; use buffer 197 Luke Howard <lukeh@padl.com> @@ -542,7 +542,7 @@ $Id$ 180 Luke Howard <lukeh@padl.com> - * pull in libpthreads on AIX + * pull in libpthreads on AIX 179 Luke Howard <lukeh@padl.com> @@ -623,7 +623,7 @@ $Id$ a big thanks to Stephan for these! * use LDAP_OPT_NETWORK_TIMEOUT if available for network connect timeout - * removed hard-coded schema mapping for + * removed hard-coded schema mapping for authPassword, NDS and MSSFU 167 Luke Howard <lukeh@padl.com> @@ -634,7 +634,7 @@ $Id$ 166 Luke Howard <lukeh@padl.com> - * corrected small typos + * corrected small typos 165 Luke Howard <lukeh@padl.com> @@ -676,7 +676,7 @@ $Id$ 158 Luke Howard <lukeh@padl.com> * in the distinguished name to login cache (dn2uid) - make sure we use the AT(uid) macro for the uid + make sure we use the AT(uid) macro for the uid attribute rather than the hard-coded value of "uid" This should enable the cache for MSSFU support. @@ -689,7 +689,7 @@ $Id$ 156 Luke Howard <lukeh@padl.com> - * logic was around the wrong way in do_search(), + * logic was around the wrong way in do_search(), all searches were broken! * --disable-ssl option for configure * removed "Obsoletes: pam_ldap" from spec file @@ -729,7 +729,7 @@ $Id$ * fixed compile on Solaris, broken in 145 by malformed Linux patch - + 148 Luke Howard <lukeh@padl.com> * check for HAVE_LDAP_SET_OPTION always @@ -746,7 +746,7 @@ $Id$ * patch from Simon Wilkinson <sxw@sxw.org.uk> for compatibility with old initgroups entry point - * request authPassword attribute if + * request authPassword attribute if --enable-authpassword * authPassword support in ldap-spwd.c (shadow) @@ -765,7 +765,7 @@ $Id$ 143 Luke Howard <lukeh@padl.com> - * patch from nalin@redhat.com to avoid + * patch from nalin@redhat.com to avoid corrupting the heap when the configuration file exists but has no host and base values. _nss_ldap_readconfigfromdns() will write to @@ -791,7 +791,7 @@ $Id$ 139 Luke Howard <lukeh@padl.com> - * updated INSTALL file with boilerplate + * updated INSTALL file with boilerplate * fixed pointer error in ldap-nss.c 138 Luke Howard <lukeh@padl.com> @@ -802,7 +802,7 @@ $Id$ ldap.conf would cause the configuration file to not be parsed at all, if they were the last entries in the config file. - + 137.1 Luke Howard <lukeh@padl.com> * patch from nalin@redhat.com; return { NULL } not @@ -812,7 +812,7 @@ $Id$ * use __libc_atfork() or pthread_atfork() to close off connection on fork, rather than checking PIDs; this is expensive and breaks - on Linux where each thread may have a + on Linux where each thread may have a different PID. 137 Gabor Gombas <gombasg@inf.elte.hu> @@ -885,7 +885,7 @@ $Id$ * parity with pam_ldap; "ssl" directive in ldap.conf can now specify "yes" or "start_tls" for Start TLS - * hopefully fixed Berkeley DB include + * hopefully fixed Berkeley DB include mess in util.c * fixed potential buffer overflow in util.c * default to LDAP protocol version 3 @@ -1015,7 +1015,7 @@ $Id$ 102 Luke Howard <lukeh@padl.com> * added defines for LDAP_MSG_ONE et al if not in ldap.h - * removed LDAP_MORE_RESULTS_TO_RETURN test + * removed LDAP_MORE_RESULTS_TO_RETURN test 101 Luke Howard <lukeh@padl.com> @@ -1076,7 +1076,7 @@ $Id$ 92 Luke Howard <lukeh@padl.com> * signal handling fix: don't restore handler - unnecessarily. + unnecessarily. * don't open nss_ldap.secret unless a root pw is specified in ldap.conf @@ -1177,11 +1177,11 @@ $Id$ 2.70 Luke Howard <lukeh@padl.com> * put /usr/ucblib back into linker search path for - Solaris. + Solaris. 2.69 Luke Howard <lukeh@padl.com> - * added timeout, unavailable, and server busy + * added timeout, unavailable, and server busy conditions to rebind logic * indent -gnu all source files @@ -1283,7 +1283,7 @@ $Id$ 2.39 Luke Howard <lukeh@xedoc.com> - * fixed warning in ldap-ethers.c (removed const from + * fixed warning in ldap-ethers.c (removed const from struct ether) * added ldap_version keyword to ldap.conf for parity with pam_ldap @@ -1293,13 +1293,13 @@ $Id$ * debugged ldap_explode_rdn() code * added support for Mozilla LDAP client library; see Makefile.linux.mozilla and ltf.c for more information. - Thanks to Netscape for making their library + Thanks to Netscape for making their library available. 2.37 Luke Howard <lukeh@xedoc.com> * moved to CVS repository and Linux as development - environment + environment * incorporated ldap-service.c fix from Greg 2.36 Luke Howard <lukeh@xedoc.com> @@ -1312,7 +1312,7 @@ $Id$ 2.34 Luke Howard <lukeh@xedoc.com> - * fixed #endif in testpw.c + * fixed #endif in testpw.c * fixed another DN freeing leak in util.c * added RFC 2307 to distribution (fixed the two typos in it: @@ -1336,7 +1336,7 @@ $Id$ * cleaned up testpw.c to use pthreads and protos * fixed prototype for gethostbyaddr_r on GNU_NSS * braced conditional in getservbyname_r - * merged in Makefile.linux and README.LINUX diffs + * merged in Makefile.linux and README.LINUX diffs * added htons(port) in getservbyport_r * added nsswitch.test * added ldaptest.pl @@ -1500,9 +1500,9 @@ $Id$ 2.15 Luke Howard <lukeh@xedoc.com> - * dnsconfig.c: got DNS SRV support working under NEXTSTEP + * dnsconfig.c: got DNS SRV support working under NEXTSTEP * util.c: (_nss_ldap_getdomainname) made host and network DN parsing - compliant with current draft + compliant with current draft 2.2 - 2.14 Luke Howard <lukeh@xedoc.com> diff --git a/Makefile.am b/Makefile.am index 60ef35f..a5eb50e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ endif EXTRA_DIST = CVSVersionInfo.txt ChangeLog \ AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING\ - ldap.conf nss_ldap.spec nsswitch.ldap + ldap.conf nss_ldap.spec nsswitch.ldap man_MANS = nss_ldap.5 @@ -55,7 +55,7 @@ NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS) endif if USE_NATIVE_LINKER -NATIVE_LINK = $(nss_ldap_so_LD) $(AM_LDFLAGS) -o $@ +NATIVE_LINK = $(nss_ldap_so_LD) $(AM_LDFLAGS) -o $@ else GNU_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ endif @@ -92,7 +92,7 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \ $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \ fi - $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; + $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; uninstall-local: @$(NORMAL_UNINSTALL) @@ -11,7 +11,7 @@ BUGZILLA BUGS: BUGS 18, 19, 20, 34 would be good to fix soon. [BUG#12] -- we should probably put the session, under Solaris, in the backend. +- we should probably put the session, under Solaris, in the backend. We need to do so in a way that remains compatible with the GNU NSS, where I expect we need to open a connection for every lookup. In nscd, where the backends are cached, it doesn't make sense to keep @@ -22,7 +22,7 @@ BUGS 18, 19, 20, 34 would be good to fix soon. [BUG#12] - ditto for IRS: the private data should contain the session and be long - lived. + lived. [BUG#13] - we could clean up the text segment a bit by generating filters on the @@ -16,7 +16,7 @@ group: files nis ldap or something similar in /etc/nsswitch.conf. The source code is distributed under the GNU General Library Public Licence -(see COPYING.LIB). +(see COPYING.LIB). Platforms this has been built under: @@ -92,7 +92,7 @@ Netscape LDAP client library (maybe it's required for OpenLDAP?). Scott M. Stone <sstone@foo3.com> writes: Your openldap libs *and* your SSL/RSAREF libs must be DYNAMIC LIBRARIES -or neither nss_ldap nor pam_ldap will work. +or neither nss_ldap nor pam_ldap will work. 3. glibc 2.0 compatibility -------------------------- @@ -145,7 +145,7 @@ of the secret. ---------------- To discuss nss_ldap and related technologies, you may -subscribe to the following mailing lists: +subscribe to the following mailing lists: <URL:mailto:nssldap-request@padl.com> and @@ -158,7 +158,7 @@ message body to join the list. --------------------- Note that PADL now offer commercial support on a -per-incident basis. +per-incident basis. To request a support incident, send email to: nssldap-support@padl.com @@ -43,7 +43,7 @@ # # $ certutil -r -n "My Cert" [-d certdir] # -# This command removes the certificate named "My Cert". certdir is +# This command removes the certificate named "My Cert". certdir is # optional, see 2. # # 4. List sertificates @@ -113,7 +113,7 @@ check_path() { # Add certificates add_cert() { check_path - if [ ! -e $FILE ]; then + if [ ! -e $FILE ]; then echo "$0: cannot find $FILE" exit 1 fi diff --git a/configure.ac b/configure.ac index 6872542..baad830 100644 --- a/configure.ac +++ b/configure.ac @@ -151,16 +151,16 @@ AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD") if test -n "$with_ldap_dir"; then CPPFLAGS="$CPPFLAGS -I$with_ldap_dir/include" LDFLAGS="$LDFLAGS -L$with_ldap_dir/lib" - case "$target_os" in + case "$target_os" in aix*) LDFLAGS="$LDFLAGS -Wl,-blibpath:$with_ldap_dir/lib" nss_ldap_so_LDFLAGS="$nss_ldap_so_LDFLAGS -L$with_ldap_dir/lib -blibpath:$with_ldap_dir/lib" NSS_LDAP_LDFLAGS="$NSS_LDAP_LDFLAGS -L$with_ldap_dir/lib -blibpath:$with_ldap_dir/lib" ;; hpux*) LDFLAGS="$LDFLAGS -Wl,+b$with_ldap_dir/lib" nss_ldap_so_LDFLAGS="$nss_ldap_so_LDFLAGS -L$with_ldap_dir/lib +b$with_ldap_dir/lib" ;; - solaris*) LDFLAGS="$LDFLAGS -R$with_ldap_dir/lib" + solaris*) LDFLAGS="$LDFLAGS -R$with_ldap_dir/lib" nss_ldap_so_LDFLAGS="$nss_ldap_so_LDFLAGS -L$with_ldap_dir/lib -R$with_ldap_dir/lib" ;; *) LDFLAGS="$LDFLAGS -Wl,-rpath,$with_ldap_dir/lib" ;; - esac + esac fi if test -n "$with_gssapi_dir"; then CPPFLAGS="$CPPFLAGS -I$with_gssapi_dir/include" @@ -178,7 +178,7 @@ AC_CHECK_HEADERS(ldap_ssl.h) dnl AC_MSG_CHECKING(for ldap_ssl.h) dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> dnl #include <ldap.h> -dnl #include <ldap_ssl.h>]], [[]])],[dnl +dnl #include <ldap_ssl.h>]], [[]])],[dnl dnl AC_MSG_RESULT(yes), dnl AC_DEFINE(HAVE_LDAP_SSL_H, 1) dnl ],[dnl AC_MSG_RESULT(no)]) diff --git a/dnsconfig.c b/dnsconfig.c index 92e4795..5201713 100644 --- a/dnsconfig.c +++ b/dnsconfig.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/dnsconfig.h b/dnsconfig.h index bd51d48..c54aede 100644 --- a/dnsconfig.h +++ b/dnsconfig.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-alias.c b/ldap-alias.c index 098cadc..973ec63 100644 --- a/ldap-alias.c +++ b/ldap-alias.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-alias.h b/ldap-alias.h index c3d3dd8..5238412 100644 --- a/ldap-alias.h +++ b/ldap-alias.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-automount.c b/ldap-automount.c index ee73ff5..2784753 100644 --- a/ldap-automount.c +++ b/ldap-automount.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 2005. @@ -65,13 +65,13 @@ _nss_ldap_parse_automount (LDAPMessage * e, enum nss_status stat; char ***keyval = result; - stat = + stat = _nss_ldap_assign_attrval (e, AT (automountKey), keyval[0], &buffer, &buflen); if (stat != NSS_SUCCESS) return stat; - stat = + stat = _nss_ldap_assign_attrval (e, AT (automountInformation), keyval[1], &buffer, &buflen); if (stat != NSS_SUCCESS) diff --git a/ldap-automount.h b/ldap-automount.h index c77fe17..4b8e45f 100644 --- a/ldap-automount.h +++ b/ldap-automount.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 2005. @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-ethers.c b/ldap-ethers.c index 22ecd71..2c4d768 100644 --- a/ldap-ethers.c +++ b/ldap-ethers.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-ethers.h b/ldap-ethers.h index f21dddc..aa57ea1 100644 --- a/ldap-ethers.h +++ b/ldap-ethers.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2006 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -258,7 +258,7 @@ do_construct_range_attribute (const char *attribute, return NSS_SUCCESS; } -/* +/* * Expand group members, including nested groups */ static enum nss_status @@ -748,7 +748,7 @@ do_parse_initgroups_nested (LDAPMessage * e, lia->depth--; ldap_value_free (values); - + return stat; } } @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-hosts.c b/ldap-hosts.c index 00b9008..cd88142 100644 --- a/ldap-hosts.c +++ b/ldap-hosts.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-hosts.h b/ldap-hosts.h index 9ec22b7..9d193be 100644 --- a/ldap-hosts.h +++ b/ldap-hosts.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-netgrp.c b/ldap-netgrp.c index 7d59479..e3206df 100644 --- a/ldap-netgrp.c +++ b/ldap-netgrp.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2002-2005 Luke Howard This file is part of the nss_ldap library. Linux support contributed by Larry Lile, <llile@dreamworks.com>, 2002. @@ -68,8 +68,8 @@ static ent_context_t *_ngbe = NULL; * I pulled the following macro (EXPAND), functions (strip_whitespace and * _nss_netgroup_parseline) and structures (name_list and __netgrent) from * glibc-2.2.x. _nss_netgroup_parseline became _nss_ldap_parse_netgr after - * some modification. - * + * some modification. + * * The rest of the code is modeled on various other _nss_ldap functions. */ diff --git a/ldap-netgrp.h b/ldap-netgrp.h index 32a207d..f7fdc9e 100644 --- a/ldap-netgrp.h +++ b/ldap-netgrp.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-network.c b/ldap-network.c index b25df79..552850e 100644 --- a/ldap-network.c +++ b/ldap-network.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-network.h b/ldap-network.h index 9a11131..b185e4c 100644 --- a/ldap-network.h +++ b/ldap-network.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -1,4 +1,4 @@ -/* +/* ldap-nss.c - main file for NSS interface This file is part of the nss_ldap library. @@ -19,7 +19,7 @@ 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$ */ @@ -147,7 +147,7 @@ static FILE *__debugfile; #endif /* LBER_OPT_LOG_PRINT_FILE */ #ifndef HAVE_PTHREAD_ATFORK -/* +/* * Process ID that opened the session. */ static pid_t __pid = -1; @@ -248,7 +248,7 @@ static enum nss_status do_parse (ent_context_t * ctx, void *result, char *buffer size_t buflen, int *errnop, parser_t parser); /* - * Parse a result, fetching results from the result chain + * Parse a result, fetching results from the result chain * rather than the server. */ static enum nss_status do_parse_s (ent_context_t * ctx, void *result, char *buffer, @@ -525,7 +525,7 @@ _nss_ldap_block_sigpipe (void) /* * Patch for Debian Bug 130006: * ignore SIGPIPE for all LDAP operations. - * + * * The following bug was reintroduced in nss_ldap-213 and is fixed here: * http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=84344 * @@ -883,7 +883,7 @@ do_drop_connection(int sd, int closeSd) #else (void) ldap_ld_free (__session.ls_conn, 0); #endif /* OPENLDAP 2.x */ - + #else #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_DESC) @@ -896,7 +896,7 @@ do_drop_connection(int sd, int closeSd) ldap_unbind (__session.ls_conn); #endif /* HAVE_LDAP_LD_FREE */ - + } #endif /* HAVE_LDAPSSL_CLIENT_INIT */ __session.ls_conn = NULL; @@ -1064,9 +1064,9 @@ do_init (void) * not. If it is NULL, then we're not linked with the * threading library, and we need to compare the current * process ID against the saved one to figure out - * whether we've forked. - * - * Once we know whether we have forked or not, + * whether we've forked. + * + * Once we know whether we have forked or not, * courtesy of pthread_atfork() or us checking * ourselves, we can close the socket to the LDAP * server to avoid leaking a socket, and reopen @@ -1143,7 +1143,7 @@ do_init (void) * LDAP session. * * Patch from Steven Barrus <sbarrus@eng.utah.edu> to - * close the session after an idle timeout. + * close the session after an idle timeout. */ assert (__session.ls_conn != NULL); @@ -1252,7 +1252,7 @@ do_init (void) #ifdef HAVE_LDAPSSL_CLIENT_INIT /* - * Initialize the SSL library. + * Initialize the SSL library. */ if (cfg->ldc_ssl_on == SSL_LDAPS) { @@ -1722,7 +1722,7 @@ do_bind (LDAP * ld, int timelimit, const char *dn, const char *pw, debug("==> do_bind"); /* - * set timelimit in ld for select() call in ldap_pvt_connect() + * set timelimit in ld for select() call in ldap_pvt_connect() * function implemented in libldap2's os-ip.c */ tv.tv_sec = timelimit; @@ -1829,7 +1829,7 @@ do_bind (LDAP * ld, int timelimit, const char *dn, const char *pw, rc = ldap_sasl_interactive_bind_s (ld, dn, "GSSAPI", NULL, NULL, LDAP_SASL_QUIET, do_sasl_interact, (void *) pw); - + # ifdef CONFIGURE_KRB5_CCNAME /* Restore default Kerberos ticket cache. */ if (oldccname != NULL) @@ -2691,7 +2691,7 @@ do_parse_s (ent_context_t * ctx, void *result, char } /* - * We have an entry; now, try to parse it. + * We have an entry; now, try to parse it. * * If we do not parse the entry because of a schema * violation, the parser should return NSS_NOTFOUND. @@ -3101,7 +3101,7 @@ do_next_page (const ldap_args_t * args, /* * General entry point for enumeration routines. - * This should really use the asynchronous LDAP search API to avoid + * This should really use the asynchronous LDAP search API to avoid * pulling down all the entries at once, particularly if the * enumeration is not completed. * Locks mutex. @@ -3214,7 +3214,7 @@ next: /* * General match function. - * Locks mutex. + * Locks mutex. */ enum nss_status _nss_ldap_getbyname (ldap_args_t * args, @@ -3783,7 +3783,7 @@ _nss_ldap_map_get (ldap_config_t * config, /* * Proxy bind support for AIX. Very simple, but should do - * the job. + * the job. */ #if LDAP_SET_REBIND_PROC_ARGS < 3 @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -95,7 +95,7 @@ #define LDAP_NSS_MAXGR_DEPTH 16 /* maximum depth of group nesting for getgrent()/initgroups() */ #if LDAP_NSS_NGROUPS > 64 -#define LDAP_NSS_BUFLEN_GROUP (NSS_BUFSIZ + (LDAP_NSS_NGROUPS * (sizeof (char *) + LOGNAME_MAX))) +#define LDAP_NSS_BUFLEN_GROUP (NSS_BUFSIZ + (LDAP_NSS_NGROUPS * (sizeof (char *) + LOGNAME_MAX))) #else #define LDAP_NSS_BUFLEN_GROUP NSS_BUFSIZ #endif /* LDAP_NSS_NGROUPS > 64 */ @@ -353,7 +353,7 @@ struct ldap_config void *ldc_maps[LM_NONE + 1][6]; /* must match MAP_MAX */ /* - * is userPassword "userPassword" or not? + * is userPassword "userPassword" or not? * ie. do we need {crypt} to be stripped */ ldap_userpassword_selector_t ldc_password_type; @@ -362,7 +362,7 @@ struct ldap_config */ ldap_shadow_selector_t ldc_shadow_type; - /* + /* * attribute table for ldap search requensts */ const char **ldc_attrtab[LM_NONE + 1]; @@ -609,7 +609,7 @@ void _nss_ldap_leave (void); #ifdef LDAP_OPT_THREAD_FN_PTRS /* * Netscape's libldap is threadsafe, but we use a - * lock before it is initialized + * lock before it is initialized */ struct ldap_error @@ -624,7 +624,7 @@ typedef struct ldap_error ldap_error_t; #endif /* LDAP_OPT_THREAD_FN_PTRS */ -/* +/* * _nss_ldap_ent_context_init() is called for each getXXent() call * This will acquire the global mutex. */ @@ -639,7 +639,7 @@ ent_context_t *_nss_ldap_ent_context_init (ent_context_t **); ent_context_t *_nss_ldap_ent_context_init_locked (ent_context_t **); /* - * _nss_ldap_ent_context_release() is used to manually free a context + * _nss_ldap_ent_context_release() is used to manually free a context */ void _nss_ldap_ent_context_release (ent_context_t *); diff --git a/ldap-parse.h b/ldap-parse.h index 90ff301..0fc57fd 100644 --- a/ldap-parse.h +++ b/ldap-parse.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-proto.c b/ldap-proto.c index 3808cb4..0394682 100644 --- a/ldap-proto.c +++ b/ldap-proto.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-proto.h b/ldap-proto.h index 587dc62..599eadd 100644 --- a/ldap-proto.h +++ b/ldap-proto.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -26,7 +26,7 @@ /* Determine the canonical name of the protocol with _nss_ldap_getrdnvalue(), - and assign any values of "cn" which do NOT match this canonical name + and assign any values of "cn" which do NOT match this canonical name as aliases. */ @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -85,7 +85,7 @@ _nss_ldap_parse_pw (LDAPMessage * e, char tmpbuf[ sizeof( uid_t ) * 8 / 3 + 2 ]; size_t tmplen; char *tmp; - + tmpbuf[ sizeof(tmpbuf) - 1 ] = '\0'; if (_nss_ldap_oc_check (e, "shadowAccount") == NSS_SUCCESS) @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-schema.c b/ldap-schema.c index f636292..4fac0c0 100644 --- a/ldap-schema.c +++ b/ldap-schema.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 2000. diff --git a/ldap-schema.h b/ldap-schema.h index 9875532..4df00f5 100644 --- a/ldap-schema.h +++ b/ldap-schema.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1999. @@ -156,7 +156,7 @@ extern char _nss_ldap_filt_getautomntbyname[]; /* * ( nisSchema.2.1 NAME 'shadowAccount' SUP top AUXILIARY - * DESC 'Additional attributes for shadow passwords' + * DESC 'Additional attributes for shadow passwords' * MUST uid * MAY ( userPassword $ shadowLastChange $ shadowMin * shadowMax $ shadowWarning $ shadowInactive $ @@ -172,7 +172,7 @@ extern char _nss_ldap_filt_getautomntbyname[]; #define AT_shadowFlag "shadowFlag" /* - * ( nisSchema.2.2 NAME 'posixGroup' SUP top STRUCTURAL + * ( nisSchema.2.2 NAME 'posixGroup' SUP top STRUCTURAL * DESC 'Abstraction of a group of accounts' * MUST ( cn $ gidNumber ) * MAY ( userPassword $ uidMember $ description ) ) @@ -227,7 +227,7 @@ extern char _nss_ldap_filt_getautomntbyname[]; * value of the cn attribute denotes the host's canonical * name. Device SHOULD be used as a structural class' * MUST ( cn $ ipHostNumber ) - * MAY ( l $ description $ manager ) ) + * MAY ( l $ description $ manager ) ) */ #define OC_ipHost "ipHost" #define AT_ipHostNumber "ipHostNumber" diff --git a/ldap-service.c b/ldap-service.c index 5f1a02d..9827d11 100644 --- a/ldap-service.c +++ b/ldap-service.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-service.h b/ldap-service.h index e0f8d27..fdf99b0 100644 --- a/ldap-service.h +++ b/ldap-service.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-spwd.c b/ldap-spwd.c index 7a20120..8ca454f 100644 --- a/ldap-spwd.c +++ b/ldap-spwd.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. diff --git a/ldap-spwd.h b/ldap-spwd.h index 67b054d..a02a57a 100644 --- a/ldap-spwd.h +++ b/ldap-spwd.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -8,7 +8,7 @@ # # Your LDAP server. Must be resolvable without using LDAP. -# Multiple hosts may be specified, each separated by a +# Multiple hosts may be specified, each separated by a # space. How long nss_ldap takes to failover depends on # whether your LDAP client library supports configurable # network or connect timeouts (see bind_timelimit). @@ -21,7 +21,7 @@ base dc=padl,dc=com # uri with the server name. This allows to use # Unix Domain Sockets to connect to a local LDAP Server. #uri ldap://127.0.0.1/ -#uri ldaps://127.0.0.1/ +#uri ldaps://127.0.0.1/ #uri ldapi://%2fvar%2frun%2fldapi_sock/ # Note: %2f encodes the '/' used as directory separator @@ -35,7 +35,7 @@ base dc=padl,dc=com # would be included literally. #binddn cn=proxyuser,dc=padl,dc=com -# The credentials to bind with. +# The credentials to bind with. # Optional: default is no credential. #bindpw secret @@ -143,7 +143,7 @@ base dc=padl,dc=com # Michigan LDAP server, and works with Netscape # Directory Server if you're using the UNIX-Crypt # hash mechanism and not using the NT Synchronization -# service. +# service. #pam_password crypt # Remove old password first, then update in @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard Portions Copyright (C) 1997-2002 Luke Howard This file is part of the nss_ldap library. diff --git a/nss_common.h b/nss_common.h index 373a442..c4a7307 100644 --- a/nss_common.h +++ b/nss_common.h @@ -1,17 +1,17 @@ /* Donated by HP to enable Winbindd to build on HPUX 11.x. Copyright (C) Jeremy Allison 2002. - + This 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. - + 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 Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -20,14 +20,14 @@ #ifndef _NSS_COMMON_H #define _NSS_COMMON_H - + #ifdef HAVE_SYNCH_H #include <synch.h> #endif #ifdef HAVE_PTHREAD_H #include <pthread.h> #endif - + #error "not used" @@ -37,12 +37,12 @@ typedef enum { NSS_UNAVAIL, NSS_TRYAGAIN } nss_status_t; - + struct nss_backend; typedef nss_status_t (*nss_backend_op_t)(struct nss_backend *, void *args); - + struct nss_backend { nss_backend_op_t *ops; int n_ops; @@ -30,7 +30,7 @@ nss_ldap will work alongside existing NIS, NIS+, DNS and flat file name services. More importantly, because it builds as a shared library, it is not necessary to recompile any applications to take advantage -of LDAP. +of LDAP. .LP The present version of .B @@ -382,7 +382,7 @@ to use the attribute instead of the RFC 2307 attribute .B from_attribute in all lookups. -If +If .B nss_ldap was built without schema mapping support, then this option is ignored. @@ -410,7 +410,7 @@ was built without schema mapping support, then this option is ignored. .TP .B nss_override_attribute_value <attribute> <value> -Specifies a value to use for the specified attribute in preference +Specifies a value to use for the specified attribute in preference to that contained in the actual entry. This option may be specified multiple times, for different attributes. If diff --git a/nss_ldap.spec b/nss_ldap.spec index a511586..b0fd93a 100644 --- a/nss_ldap.spec +++ b/nss_ldap.spec @@ -26,13 +26,13 @@ Install nss_ldap if you need LDAP access clients. %build -./configure -make +./configure +make %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{etc,lib,usr/lib} -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/ldap.conf @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2002 Max Caines, All Rights Reserved. This file is part of the nss_ldap library. Contributed by Max Caines, <Max.Caines@wlv.ac.uk>, April 2002. @@ -42,36 +42,36 @@ #ifndef HAVE_LDAP_CREATE_PAGE_CONTROL /*--- ldap_create_page_control - + Create and encode the Paged Results control. ld (IN) An LDAP session handle, as obtained from a call to ldap_init(). - + pagesize (IN) The number of entries to return in each page cookiep (IN) Pointer to a berVal structure that the server uses to determine the current location in the result set (opaque). Set to NULL the first time. - + iscritical (IN) Is this control critical to the search? - + ctrlp (OUT) A result parameter that will be assigned the address - of an LDAPControl structure that contains the + of an LDAPControl structure that contains the PagedResult control created by this function. The memory occupied by the LDAPControl structure SHOULD be freed when it is no longer in use by calling ldap_control_free(). - - + + Ber encoding - + PageResult ::= SEQUENCE { pageSize INTEGER cookie OCTET STRING } - - + + Note: The first time the Page control is created, the cookie should be set to a zero-length string. The cookie obtained from calling ldap_parse_page_control() should be used as @@ -133,18 +133,18 @@ exit: #ifndef HAVE_LDAP_PARSE_PAGE_CONTROL /*--- ldap_parse_page_control - + Decode the Virtual List View control return information. ld (IN) An LDAP session handle. - - ctrls (IN) The address of a NULL-terminated array of - LDAPControl structures, typically obtained + + ctrls (IN) The address of a NULL-terminated array of + LDAPControl structures, typically obtained by a call to ldap_parse_result(). - + list_countp (OUT) This result parameter is filled in with the number of entries returned in this page - + cookiep (OUT) This result parameter is filled in with the address of a struct berval that contains the server- generated cookie. @@ -152,7 +152,7 @@ exit: to create a Page sort control. The struct berval returned SHOULD be disposed of by calling ber_bvfree() when it is no longer needed. - + ---*/ #ifndef HAVE_LDAP_CREATE_CONTROL @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -19,7 +19,7 @@ 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$ */ @@ -2,27 +2,27 @@ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Hvgskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska * Hvgskolan and its contributors. - * + * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -2,27 +2,27 @@ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Hvgskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska * Hvgskolan and its contributors. - * + * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -97,7 +97,7 @@ enum nss_status _nss_ldap_dn2uid (const char *dn, #define NSS_LDAP_KEY_CONNECT_POLICY "nss_connect_policy" /* - * support separate naming contexts for each map + * support separate naming contexts for each map * eventually this will support the syntax defined in * the DUAConfigProfile searchDescriptor attribute */ |