10 files changed, 129 insertions, 20 deletions
diff --git a/AUTHORS b/AUTHORS
index 418c1a4..ddc3d60 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -121,3 +121,6 @@ Chris Hiestand <chiestand@salk.edu>
 Jon Severinsson <jon@severinsson.net>
 John Sullivan <jsrhbz@kanargh.force9.co.uk>
 Bersl <bersl2@bersl2.info>
+Caleb Callaway <enlightened.despot@gmail.com>
+Joshua Shire <jshire@hyduke.com>
+Lukas Slebodnik <lslebodn@redhat.com>
diff --git a/ChangeLog b/ChangeLog
index f00bc8f..778ae9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,93 @@
+2014-03-15 20:35  arthur
+
+	* [r2077] README: update README (mostly from 0.9 branch)
+
+2014-03-15 20:24  arthur
+
+	* [r2076] INSTALL, config.guess, config.sub, missing, test-driver:
+	  update from latest automake
+
+2014-03-15 20:07  arthur
+
+	* [r2075] common/tio.c: also support poll() returning EAGAIN
+	  (2f088ec from 0.9)
+
+2014-03-15 19:36  arthur
+
+	* [r2074] configure.ac: fix usage of AC_LANG_PROGRAM (933bf8e from
+	  0.9)
+
+2014-03-02 21:40  arthur
+
+	* [r2067] nss/hosts.c, nss/networks.c: fix crash when retrieving
+	  large networks entries (8532f40 from 0.9, thanks Lukas Slebodnik)
+
+2014-01-26 18:40  arthur
+
+	* [r2066] tests/nslcd-test.conf, tests/test_nsscmds.sh: update test
+	  script and configuration from 0.9 branch
+
+2014-01-26 17:05  arthur
+
+	* [r2065] nslcd/shadow.c: fix pwdLastSet calcuation (2181cca from
+	  0.9, thanks Joshua Shire)
+
+2013-12-08 16:01  arthur
+
+	* [r2058] .gitignore, INSTALL, Makefile.am, ar-lib, autogen.sh,
+	  compile, config.guess, config.sub, configure.ac, depcomp,
+	  install-sh, missing, mkinstalldirs, py-compile, test-driver,
+	  tests, tests/Makefile.am: upgrade to automake 1.14 (eefe25d,
+	  2a5d37e, 5b78508, 4fc4197, 8ae8b9a and 6be316e from 0.9)
+
+2013-12-07 22:07  arthur
+
+	* [r2057] ldapns.ldif: reformat LDIF file to follow OpenLDAP format
+	  (ce95b41 from 0.9)
+
+2013-12-07 22:04  arthur
+
+	* [r2056] AUTHORS, nslcd/group.c, nslcd/passwd.c, nslcd/shadow.c:
+	  increase password buffer size (thanks Bersl) (7140d21 from 0.9)
+
+2013-12-07 22:00  arthur
+
+	* [r2055] NEWS, README, common/dict.c, compat/attrs.h,
+	  compat/nss_compat.h, nslcd/myldap.c: fix for common spelling
+	  mistake (8571bc1 from 0.9)
+
+2013-10-06 14:14  arthur
+
+	* [r2032] nslcd/common.h: in nslcd, log EPIPE only on debug level
+	  (4897033 from 0.9)
+
+2013-10-06 14:11  arthur
+
+	* [r2031] common/tio.c, common/tio.h, nss/common.h: use a timeout
+	  when skipping remaining result data (c9e2f97 from 0.9)
+
+2013-09-01 09:47  arthur
+
+	* [r2029] AUTHORS, common/tio.c: fix buffer overflow on interrupted
+	  read (thanks John Sullivan) (07a8170 from 0.9)
+
+2013-08-23 21:58  arthur
+
+	* [r2021] nslcd/nslcd.c: ignore SIGUSR1 and SIGUSR2 for future
+	  compatibility
+
+2013-08-18 13:12  arthur
+
+	* [r2020] man/nslcd.8.xml, man/pynslcd.8.xml, nslcd/nslcd.c,
+	  pynslcd/pynslcd.py: implement a -n, --nofork option to run in the
+	  foreground (cda6dcd from 0.9)
+
+2013-05-05 15:34  arthur
+
+	* [r1959] ChangeLog, NEWS, configure.ac, man/nslcd.8.xml,
+	  man/nslcd.conf.5.xml, man/pam_ldap.8.xml, man/pynslcd.8.xml: get
+	  files ready for 0.8.13 release
+
 2013-05-05 11:50  arthur
 
 	* [r1958] ., compat/ldap_initialize.c: remove not needed define
diff --git a/NEWS b/NEWS
index 154cf38..4b410fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+changes from 0.8.13 to 0.8.14
+-----------------------------
+
+* implement an -n switch to not daemonise (by Caleb Callaway)
+* increase password value buffer size (by Bersl)
+* fix for pwdLastSet attribute value handling (thanks Joshua Shire)
+* fix buffer overflow on interrupted read that is hard to trigger (thanks
+  John Sullivan)
+* fix a possible crash in the NSS module when retrieving large networks
+  entries (thanks Lukas Slebodnik)
+* avoid more broken pipe errors by using a low timeout when aborting reading
+  requested information from nslcd (thanks John Sullivan)
+* only log broken pipe errors in debugging mode
+* ignore SIGUSR1 and SIGUSR2 for future compatibility
+
+
 changes from 0.8.12 to 0.8.13
 -----------------------------
 
diff --git a/configure.ac b/configure.ac
index 9839a94..dc39f4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006 Luke Howard
 # Copyright (C) 2006 West Consulting
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+# Copyright (C) 2006-2014 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,7 @@ AC_PREREQ(2.61)
 AC_COPYRIGHT(
 [Copyright (C) 2006 Luke Howard
 Copyright (C) 2006 West Consulting
-Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+Copyright (C) 2006-2014 Arthur de Jong
 
 This configure script is derived from configure.ac which is free software;
 you can redistribute it and/or modify it under the terms of the GNU Lesser
@@ -33,10 +33,10 @@ configure.ac file for more details.])
 
 # initialize and set version and bugreport address
 AC_INIT([nss-pam-ldapd],
-        [0.8.13],
+        [0.8.14],
         [nss-pam-ldapd-users@lists.arthurdejong.org],,
         [http://arthurdejong.org/nss-pam-ldapd/])
-RELEASE_MONTH="May 2013"
+RELEASE_MONTH="Mar 2014"
 AC_SUBST(RELEASE_MONTH)
 AC_CONFIG_SRCDIR([nslcd.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/man/nslcd.8.xml b/man/nslcd.8.xml
index 77da48d..a464edc 100644
--- a/man/nslcd.8.xml
+++ b/man/nslcd.8.xml
@@ -6,7 +6,7 @@
    nslcd.8.xml - docbook manual page for nslcd
 
    Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+   Copyright (C) 2006-2014 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@
  <refmeta>
   <refentrytitle>nslcd</refentrytitle>
   <manvolnum>8</manvolnum>
-  <refmiscinfo class="version">Version 0.8.13</refmiscinfo>
+  <refmiscinfo class="version">Version 0.8.14</refmiscinfo>
   <refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
-  <refmiscinfo class="date">May 2013</refmiscinfo>
+  <refmiscinfo class="date">Mar 2014</refmiscinfo>
  </refmeta>
 
  <refnamediv id="name">
diff --git a/man/nslcd.conf.5.xml b/man/nslcd.conf.5.xml
index 4116e12..768e931 100644
--- a/man/nslcd.conf.5.xml
+++ b/man/nslcd.conf.5.xml
@@ -6,7 +6,7 @@
    nslcd.conf.5.xml - docbook manual page for nslcd.conf
 
    Copyright (C) 1997-2005 Luke Howard
-   Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+   Copyright (C) 2007-2014 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@
  <refmeta>
   <refentrytitle>nslcd.conf</refentrytitle>
   <manvolnum>5</manvolnum>
-  <refmiscinfo class="version">Version 0.8.13</refmiscinfo>
+  <refmiscinfo class="version">Version 0.8.14</refmiscinfo>
   <refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
-  <refmiscinfo class="date">May 2013</refmiscinfo>
+  <refmiscinfo class="date">Mar 2014</refmiscinfo>
  </refmeta>
 
  <refnamediv id="name">
diff --git a/man/pam_ldap.8.xml b/man/pam_ldap.8.xml
index a540abf..4c51a8b 100644
--- a/man/pam_ldap.8.xml
+++ b/man/pam_ldap.8.xml
@@ -5,7 +5,7 @@
 <!--
    pam_ldap.8.xml - docbook manual page for pam_ldap PAM module
 
-   Copyright (C) 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+   Copyright (C) 2009-2014 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -35,9 +35,9 @@
  <refmeta>
   <refentrytitle>pam_ldap</refentrytitle>
   <manvolnum>8</manvolnum>
-  <refmiscinfo class="version">Version 0.8.13</refmiscinfo>
+  <refmiscinfo class="version">Version 0.8.14</refmiscinfo>
   <refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
-  <refmiscinfo class="date">May 2013</refmiscinfo>
+  <refmiscinfo class="date">Mar 2014</refmiscinfo>
  </refmeta>
 
  <refnamediv id="name">
diff --git a/man/pynslcd.8.xml b/man/pynslcd.8.xml
index abfc31b..e364b50 100644
--- a/man/pynslcd.8.xml
+++ b/man/pynslcd.8.xml
@@ -5,7 +5,7 @@
 <!--
    pynslcd.8.xml - docbook manual page for pynslcd
 
-   Copyright (C) 2012, 2013 Arthur de Jong
+   Copyright (C) 2012-2014 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -35,9 +35,9 @@
  <refmeta>
   <refentrytitle>pynslcd</refentrytitle>
   <manvolnum>8</manvolnum>
-  <refmiscinfo class="version">Version 0.8.13</refmiscinfo>
+  <refmiscinfo class="version">Version 0.8.14</refmiscinfo>
   <refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
-  <refmiscinfo class="date">May 2013</refmiscinfo>
+  <refmiscinfo class="date">Mar 2014</refmiscinfo>
  </refmeta>
 
  <refnamediv id="name">
diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c
index 7d188a5..e408a5c 100644
--- a/nslcd/nslcd.c
+++ b/nslcd/nslcd.c
@@ -2,7 +2,7 @@
    nslcd.c - ldap local connection daemon
 
    Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+   Copyright (C) 2006-2014 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -117,7 +117,7 @@ static void display_version(FILE *fp)
 {
   fprintf(fp,"%s\n",PACKAGE_STRING);
   fprintf(fp,"Written by Luke Howard and Arthur de Jong.\n\n");
-  fprintf(fp,"Copyright (C) 1997-2013 Luke Howard, Arthur de Jong and West Consulting\n"
+  fprintf(fp,"Copyright (C) 1997-2014 Luke Howard, Arthur de Jong and West Consulting\n"
              "This is free software; see the source for copying conditions.  There is NO\n"
              "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
 }
diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py
index 7d7056f..5284d66 100755
--- a/pynslcd/pynslcd.py
+++ b/pynslcd/pynslcd.py
@@ -2,7 +2,7 @@
 
 # pynslcd.py - main daemon module
 #
-# Copyright (C) 2010, 2011, 2012 Arthur de Jong
+# Copyright (C) 2010-2014 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -95,7 +95,7 @@ def display_version(fp):
     fp.write('%(PACKAGE_STRING)s\n'
              'Written by Arthur de Jong.\n'
              '\n'
-             'Copyright (C) 2010-2012 Arthur de Jong\n'
+             'Copyright (C) 2010-2014 Arthur de Jong\n'
              'This is free software; see the source for copying conditions.  There is NO\n'
              'warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n'
              % {'PACKAGE_STRING': config.PACKAGE_STRING, })