fix naming and copyright headers

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

22 files changed, 237 insertions, 201 deletions

diff --git a/server/Makefile.am b/server/Makefile.am
index 72d004a..eba28d1 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -21,8 +21,8 @@
 noinst_LIBRARIES = libserver.a
 
 libserver_a_SOURCES = common.c common.h \
-                      aliases.c automount.c ethers.c group.c hosts.c netgroup.c \
-                      networks.c passwd.c protocols.c rpc.c services.c shadow.c \
+                      alias.c automount.c ether.c group.c host.c netgroup.c \
+                      network.c passwd.c protocol.c rpc.c service.c shadow.c \
                       dnsconfig.c dnsconfig.h ldap-nss.c ldap-nss.h ldap-parse.h \
                       ldap-schema.c ldap-schema.h pagectrl.c pagectrl.h \
                       resolve.c resolve.h util.c util.h
diff --git a/server/aliases.c b/server/alias.c
index d7031fd..d1fc842 100644
--- a/server/aliases.c
+++ b/server/alias.c
@@ -1,5 +1,7 @@
 /*
-   aliases.c - alias entry lookup routines
+   alias.c - alias entry lookup routines
+   This file was part of the nss-ldap library (as ldap-alias.c)
+   which has been forked into the nss-ldapd library.
 
    Copyright (C) 1997-2005 Luke Howard
    Copyright (C) 2006 West Consulting
diff --git a/server/automount.c b/server/automount.c
index 1b7b4cb..e81ce59 100644
--- a/server/automount.c
+++ b/server/automount.c
@@ -1,24 +1,26 @@
 /*
+   automount.c - automounter maps lookup routines
+   This file was part of the nss-ldap library (as ldap-automount.c)
+   which has been forked into the nss-ldapd library.
+
    Copyright (C) 2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 2005.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
diff --git a/server/common.c b/server/common.c
index 9ada651..f4be471 100644
--- a/server/common.c
+++ b/server/common.c
@@ -1,5 +1,6 @@
 /*
    common.c - common server code routines
+   This file is part of the nss-ldapd library.
 
    Copyright (C) 2006 West Consulting
    Copyright (C) 2006 Arthur de Jong
diff --git a/server/common.h b/server/common.h
index 65d5f49..69b1732 100644
--- a/server/common.h
+++ b/server/common.h
@@ -1,5 +1,6 @@
 /*
    common.h - common server code routines
+   This file is part of the nss-ldapd library.
 
    Copyright (C) 2006 West Consulting
    Copyright (C) 2006 Arthur de Jong
diff --git a/server/ethers.c b/server/ether.c
index a6dafe9..cf96437 100644
--- a/server/ethers.c
+++ b/server/ether.c
@@ -1,24 +1,26 @@
 /*
+   ether.c - ethernet address entry lookup routines
+   This file was part of the nss-ldap library (as ldap-ethers.c)
+   which has been forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
diff --git a/server/group.c b/server/group.c
index 38a1c78..13139ce 100644
--- a/server/group.c
+++ b/server/group.c
@@ -1,5 +1,7 @@
 /*
    group.c - group entry lookup routines
+   This file was part of the nss-ldap library (as ldap-grp.c) which
+   has been forked into the nss-ldapd library.
 
    Copyright (C) 1997-2006 Luke Howard
    Copyright (C) 2006 West Consulting
diff --git a/server/hosts.c b/server/host.c
index 935c857..fbd2f62 100644
--- a/server/hosts.c
+++ b/server/host.c
@@ -1,24 +1,26 @@
 /*
+   host.c - host name lookup routines
+   This file was part of the nss-ldap library (as ldap-hosts.c)
+   which has been forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
diff --git a/server/ldap-nss.c b/server/ldap-nss.c
index 73b5a29..ee0538d 100644
--- a/server/ldap-nss.c
+++ b/server/ldap-nss.c
@@ -1,26 +1,26 @@
 /*
    ldap-nss.c - main file for NSS interface
-   This file is part of the nss_ldap library.
+   This file was part of the nss-ldap library which has been
+   forked into the nss-ldapd library.
 
    Copyright (C) 1997-2006 Luke Howard
+   Copyright (C) 2006 West Consulting
    Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
diff --git a/server/ldap-nss.h b/server/ldap-nss.h
index 02963a1..723e573 100644
--- a/server/ldap-nss.h
+++ b/server/ldap-nss.h
@@ -1,24 +1,26 @@
 /*
+   ldap-nss.c - main file for NSS interface
+   This file was part of the nss-ldap library which has been
+   forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #ifndef _LDAP_NSS_LDAP_LDAP_NSS_H
diff --git a/server/ldap-parse.h b/server/ldap-parse.h
index c1e1f1f..4fa94aa 100644
--- a/server/ldap-parse.h
+++ b/server/ldap-parse.h
@@ -1,27 +1,28 @@
 /*
+   ldap-parse.h - helper macros for lookup functions
+   This file was part of the nss-ldap library which has been
+   forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
-
 #ifndef _LDAP_NSS_LDAP_LDAP_PARSE_H
 #define _LDAP_NSS_LDAP_LDAP_PARSE_H
 
diff --git a/server/ldap-schema.c b/server/ldap-schema.c
index a0354eb..3956dc6 100644
--- a/server/ldap-schema.c
+++ b/server/ldap-schema.c
@@ -1,24 +1,26 @@
 /*
+   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
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 2000.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
diff --git a/server/ldap-schema.h b/server/ldap-schema.h
index b7cfd14..6044f1e 100644
--- a/server/ldap-schema.h
+++ b/server/ldap-schema.h
@@ -1,24 +1,26 @@
 /*
+   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
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1999.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #ifndef _LDAP_NSS_LDAP_LDAP_SCHEMA_H
diff --git a/server/netgroup.c b/server/netgroup.c
index b5b93cb..5d5e5a1 100644
--- a/server/netgroup.c
+++ b/server/netgroup.c
@@ -1,25 +1,26 @@
 /*
-   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.
-   Solaris support contributed by Luke Howard, <lukeh@padl.com>, 2004.
+   netgroup.c - netgroup lookup routines
+   This file was part of the nss-ldap library (as ldap-netgrp.c)
+   which has been forked into the nss-ldapd library.
 
-   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.
+   Copyright (C) 1997-2005 Luke Howard
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
@@ -50,10 +51,10 @@
 static struct ent_context *_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.
+ * I (Luke Howard) 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.
  *
  * The rest of the code is modeled on various other _nss_ldap functions.
  */
diff --git a/server/networks.c b/server/network.c
index 959c531..507eaee 100644
--- a/server/networks.c
+++ b/server/network.c
@@ -1,24 +1,26 @@
 /*
+   network.c - network address entry lookup routines
+   This file was part of the nss-ldap library (as ldap-network.c)
+   which has been forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 /* parts based on nss_nis */
diff --git a/server/passwd.c b/server/passwd.c
index 8b50dc3..da17a3a 100644
--- a/server/passwd.c
+++ b/server/passwd.c
@@ -1,5 +1,7 @@
 /*
    passwd.c - password entry lookup routines
+   This file was part of the nss-ldap library (as ldap-pwd.c)
+   which has been forked into the nss-ldapd library.
 
    Copyright (C) 1997-2005 Luke Howard
    Copyright (C) 2006 West Consulting
diff --git a/server/protocols.c b/server/protocol.c
index d601c40..2300535 100644
--- a/server/protocols.c
+++ b/server/protocol.c
@@ -1,24 +1,26 @@
 /*
+   protocol.c - network address entry lookup routines
+   This file was part of the nss-ldap library (as ldap-proto.c)
+   which has been forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 /*
diff --git a/server/rpc.c b/server/rpc.c
index 3a12026..2f33f1c 100644
--- a/server/rpc.c
+++ b/server/rpc.c
@@ -1,24 +1,26 @@
 /*
+   rpc.c - rpc name lookup routines
+   This file was part of the nss-ldap library (as ldap-rpc.c) which
+   has been forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 /*
diff --git a/server/services.c b/server/service.c
index ffe9b62..8e3d49f 100644
--- a/server/services.c
+++ b/server/service.c
@@ -1,24 +1,26 @@
 /*
+   service.c - service entry lookup routines
+   This file was part of the nss-ldap library (as ldap-service.c)
+   which has been forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 /*
diff --git a/server/shadow.c b/server/shadow.c
index 5319ade..7a2e407 100644
--- a/server/shadow.c
+++ b/server/shadow.c
@@ -1,24 +1,26 @@
 /*
+   shadow.c - service entry lookup routines
+   This file was part of the nss-ldap library (as ldap-spwd.c) which
+   has been forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
diff --git a/server/util.c b/server/util.c
index e2888f6..6372c1f 100644
--- a/server/util.c
+++ b/server/util.c
@@ -1,24 +1,26 @@
 /*
+   util.c - LDAP utility functions
+   This file was part of the nss-ldap library which has been
+   forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #include "config.h"
diff --git a/server/util.h b/server/util.h
index 1a90b52..77c6487 100644
--- a/server/util.h
+++ b/server/util.h
@@ -1,24 +1,26 @@
 /*
+   util.h - LDAP utility functions
+   This file was part of the nss-ldap library which has been
+   forked into the nss-ldapd library.
+
    Copyright (C) 1997-2005 Luke Howard
-   This file is part of the nss_ldap library.
-   Contributed by Luke Howard, <lukeh@padl.com>, 1997.
+   Copyright (C) 2006 West Consulting
+   Copyright (C) 2006 Arthur de Jong
 
-   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.
+   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.
 
-   The nss_ldap library is distributed in the hope that it will be useful,
+   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 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$
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301 USA
 */
 
 #ifndef _LDAP_NSS_LDAP_UTIL_H