normalize copyright headers

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

25 files changed, 66 insertions, 72 deletions

diff --git a/server/alias.c b/server/alias.c
index 62e29f3..4698f1b 100644
--- a/server/alias.c
+++ b/server/alias.c
@@ -1,6 +1,6 @@
 /*
    alias.c - alias entry lookup routines
-   This file was part of the nss-ldap library (as ldap-alias.c)
+   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
diff --git a/server/dnsconfig.c b/server/dnsconfig.c
index fd99b45..12b0997 100644
--- a/server/dnsconfig.c
+++ b/server/dnsconfig.c
@@ -1,24 +1,24 @@
 /*
+   dnsconfig.c - lookup code for DNS SRV records
+   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.
 
-   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/dnsconfig.h b/server/dnsconfig.h
index 675e883..479a717 100644
--- a/server/dnsconfig.h
+++ b/server/dnsconfig.h
@@ -1,24 +1,24 @@
 /*
+   dnsconfig.c - lookup code for DNS SRV records
+   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.
 
-   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_DNSCONFIG_H
diff --git a/server/ether.c b/server/ether.c
index 3ebd4fd..ab7b870 100644
--- a/server/ether.c
+++ b/server/ether.c
@@ -1,6 +1,6 @@
 /*
    ether.c - ethernet address entry lookup routines
-   This file was part of the nss-ldap library (as ldap-ethers.c)
+   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
diff --git a/server/group.c b/server/group.c
index c8b1b2b..e537e96 100644
--- a/server/group.c
+++ b/server/group.c
@@ -1,6 +1,6 @@
 /*
    group.c - group entry lookup routines
-   This file was part of the nss-ldap library (as ldap-grp.c) which
+   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
diff --git a/server/host.c b/server/host.c
index cadfce9..ec04bf2 100644
--- a/server/host.c
+++ b/server/host.c
@@ -1,6 +1,6 @@
 /*
    host.c - host name lookup routines
-   This file was part of the nss-ldap library (as ldap-hosts.c)
+   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
diff --git a/server/ldap-nss.c b/server/ldap-nss.c
index 7f72f4d..f442037 100644
--- a/server/ldap-nss.c
+++ b/server/ldap-nss.c
@@ -1,6 +1,6 @@
 /*
    ldap-nss.c - main file for NSS interface
-   This file was part of the nss-ldap library which has been
+   This file was part of the nss_ldap library which has been
    forked into the nss-ldapd library.
 
    Copyright (C) 1997-2006 Luke Howard
diff --git a/server/ldap-nss.h b/server/ldap-nss.h
index b48106e..b59d774 100644
--- a/server/ldap-nss.h
+++ b/server/ldap-nss.h
@@ -1,6 +1,6 @@
 /*
    ldap-nss.c - main file for NSS interface
-   This file was part of the nss-ldap library which has been
+   This file was part of the nss_ldap library which has been
    forked into the nss-ldapd library.
 
    Copyright (C) 1997-2005 Luke Howard
diff --git a/server/ldap-schema.c b/server/ldap-schema.c
index d63eb09..4ae95a5 100644
--- a/server/ldap-schema.c
+++ b/server/ldap-schema.c
@@ -1,6 +1,6 @@
 /*
    ldap-schema.c - LDAP schema information functions and definitions
-   This file was part of the nss-ldap library which has been
+   This file was part of the nss_ldap library which has been
    forked into the nss-ldapd library.
 
    Copyright (C) 1997-2005 Luke Howard
diff --git a/server/ldap-schema.h b/server/ldap-schema.h
index d6d87ba..558c1aa 100644
--- a/server/ldap-schema.h
+++ b/server/ldap-schema.h
@@ -1,6 +1,6 @@
 /*
    ldap-schema.h - LDAP schema information functions and definitions
-   This file was part of the nss-ldap library which has been
+   This file was part of the nss_ldap library which has been
    forked into the nss-ldapd library.
 
    Copyright (C) 1997-2005 Luke Howard
diff --git a/server/log.c b/server/log.c
index 72a28a3..c7370cf 100644
--- a/server/log.c
+++ b/server/log.c
@@ -1,7 +1,7 @@
 /*
    log.c - logging funtions
 
-   Copyright (C) 2002, 2003 Arthur de Jong.
+   Copyright (C) 2002, 2003 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/server/log.h b/server/log.h
index 0cadbeb..4124fbe 100644
--- a/server/log.h
+++ b/server/log.h
@@ -1,7 +1,7 @@
 /*
    log.h - definitions of logging funtions
 
-   Copyright (C) 2002, 2003 Arthur de Jong.
+   Copyright (C) 2002, 2003 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/server/netgroup.c b/server/netgroup.c
index a9975c9..e79657d 100644
--- a/server/netgroup.c
+++ b/server/netgroup.c
@@ -1,6 +1,6 @@
 /*
    netgroup.c - netgroup lookup routines
-   This file was part of the nss-ldap library (as ldap-netgrp.c)
+   This file was part of the nss_ldap library (as ldap-netgrp.c)
    which has been forked into the nss-ldapd library.
    This file also contains code that is taken from the GNU C
    Library (nss/nss_files/files-netgrp.c).
diff --git a/server/network.c b/server/network.c
index e818d4e..e44a3e1 100644
--- a/server/network.c
+++ b/server/network.c
@@ -1,6 +1,6 @@
 /*
    network.c - network address entry lookup routines
-   This file was part of the nss-ldap library (as ldap-network.c)
+   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
diff --git a/server/pagectrl.c b/server/pagectrl.c
index 7020b88..ca439dd 100644
--- a/server/pagectrl.c
+++ b/server/pagectrl.c
@@ -1,28 +1,26 @@
 /*
    pagectrl.c - provide a replacement ldap_create_page_control() function.
+   This file was part of the nss_ldap library which has been
+   forked into the nss-ldapd library.
 
-   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.
+   Copyright (C) 2002 Max Caines
    This software is not subject to any license of the University
    of Wolverhampton.
 
-   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
 */
 
 /* TODO: move this to compat/ and add it only when needed */
diff --git a/server/pagectrl.h b/server/pagectrl.h
index b282dfa..c678ca9 100644
--- a/server/pagectrl.h
+++ b/server/pagectrl.h
@@ -1,28 +1,24 @@
 /*
    pagectrl.h - provide a replacement ldap_create_page_control() function.
+   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.
-   (The author maintains a non-exclusive licence to distribute this file
-   under their own conditions.)
 
-   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_PAGECTRL_H
diff --git a/server/passwd.c b/server/passwd.c
index 859ac77..abdb104 100644
--- a/server/passwd.c
+++ b/server/passwd.c
@@ -1,6 +1,6 @@
 /*
    passwd.c - password entry lookup routines
-   This file was part of the nss-ldap library (as ldap-pwd.c)
+   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
diff --git a/server/protocol.c b/server/protocol.c
index f486c8f..71ce52d 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1,6 +1,6 @@
 /*
    protocol.c - network address entry lookup routines
-   This file was part of the nss-ldap library (as ldap-proto.c)
+   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
diff --git a/server/rpc.c b/server/rpc.c
index ff292a7..b58cca7 100644
--- a/server/rpc.c
+++ b/server/rpc.c
@@ -1,6 +1,6 @@
 /*
    rpc.c - rpc name lookup routines
-   This file was part of the nss-ldap library (as ldap-rpc.c) which
+   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
diff --git a/server/service.c b/server/service.c
index 291bae3..7739b8e 100644
--- a/server/service.c
+++ b/server/service.c
@@ -1,6 +1,6 @@
 /*
    service.c - service entry lookup routines
-   This file was part of the nss-ldap library (as ldap-service.c)
+   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
diff --git a/server/shadow.c b/server/shadow.c
index 673695a..d1b22bd 100644
--- a/server/shadow.c
+++ b/server/shadow.c
@@ -1,6 +1,6 @@
 /*
    shadow.c - service entry lookup routines
-   This file was part of the nss-ldap library (as ldap-spwd.c) which
+   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
diff --git a/server/util.c b/server/util.c
index 0530ef3..57d6a10 100644
--- a/server/util.c
+++ b/server/util.c
@@ -1,6 +1,6 @@
 /*
    util.c - LDAP utility functions
-   This file was part of the nss-ldap library which has been
+   This file was part of the nss_ldap library which has been
    forked into the nss-ldapd library.
 
    Copyright (C) 1997-2005 Luke Howard
diff --git a/server/util.h b/server/util.h
index ee66eda..f193916 100644
--- a/server/util.h
+++ b/server/util.h
@@ -1,6 +1,6 @@
 /*
    util.h - LDAP utility functions
-   This file was part of the nss-ldap library which has been
+   This file was part of the nss_ldap library which has been
    forked into the nss-ldapd library.
 
    Copyright (C) 1997-2005 Luke Howard
diff --git a/server/xmalloc.c b/server/xmalloc.c
index f316ad8..9dbd9a4 100644
--- a/server/xmalloc.c
+++ b/server/xmalloc.c
@@ -1,7 +1,7 @@
 /*
    xmalloc.c - malloc wrapper
 
-   Copyright (C) 2002, 2003, 2006 Arthur de Jong.
+   Copyright (C) 2002, 2003, 2006 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/server/xmalloc.h b/server/xmalloc.h
index a4a6238..04ad025 100644
--- a/server/xmalloc.h
+++ b/server/xmalloc.h
@@ -1,7 +1,7 @@
 /*
    xmalloc.h - malloc wrapper
 
-   Copyright (C) 2002 Arthur de Jong.
+   Copyright (C) 2002 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public