Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2010-10-29 18:15:30 +0200
committerArthur de Jong <arthur@arthurdejong.org>2010-10-29 18:15:30 +0200
commita3ed4e965757f9f131b73b05ea3e851d52e70aa9 (patch)
tree5fd6d4a19f540b2e518642a7949dde2436013eb3
parente014f1e17fc81cd049816be7cc1f3a22c3e65b12 (diff)
get files ready for 0.7.12 release0.7.12
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-0.7@1292 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--ChangeLog12
-rw-r--r--NEWS9
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog8
-rw-r--r--man/nslcd.8.xml2
-rw-r--r--man/nslcd.conf.5.xml2
-rw-r--r--man/pam_ldap.8.xml2
7 files changed, 32 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 266d378..74bcf72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-29 15:03 arthur
+
+ * [r1291] ., nslcd/myldap.c: set a short socket timeout when
+ shutting down the connection to the LDAP server (part of r1276
+ from trunk)
+
+2010-10-15 13:35 arthur
+
+ * [r1284] ChangeLog, NEWS, configure.ac, debian/changelog,
+ man/nslcd.8.xml, man/nslcd.conf.5.xml, man/pam_ldap.8.xml: get
+ files ready for 0.7.11 release
+
2010-10-13 20:01 arthur
* [r1268] nslcd/pam.c: grow ruser buffer (small part of r1267 from
diff --git a/NEWS b/NEWS
index ac66b69..aa50c94 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,15 @@
+changes from 0.7.11 to 0.7.12
+-----------------------------
+
+* set a short socket timeout when shutting down the connection to the LDAP
+ server to avoid disconnect problems when using TLS
+
+
changes from 0.7.10 to 0.7.11
-----------------------------
* grow the buffer for the PAM ruser to not reject logins for users with
- a ruser including a domain part (closes: #600065)
+ a ruser including a domain part
* Debian packaging improvements
diff --git a/configure.ac b/configure.ac
index c051202..ad97eec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ version 2.1 of the License, or (at your option) any later version. See the
configure.ac file for more details.])
# initialize and set version and bugreport address
-AC_INIT([nss-pam-ldapd],[0.7.11],[nss-pam-ldapd-users@lists.arthurdejong.org])
+AC_INIT([nss-pam-ldapd],[0.7.12],[nss-pam-ldapd-users@lists.arthurdejong.org])
RELEASE_MONTH="Oct 2010"
AC_SUBST(RELEASE_MONTH)
AC_CONFIG_SRCDIR([nslcd.h])
diff --git a/debian/changelog b/debian/changelog
index 43f87ec..6f9079e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nss-pam-ldapd (0.7.12) unstable; urgency=low
+
+ * set a short socket timeout when shutting down the connection to the LDAP
+ server to avoid disconnect problems when using TLS
+ (addresses part of #596983)
+
+ -- Arthur de Jong <adejong@debian.org> Fri, 29 Oct 2010 18:00:00 +0200
+
nss-pam-ldapd (0.7.11) unstable; urgency=low
* updated Vietnamese debconf translation by Clytie Siddall (closes: #598500)
diff --git a/man/nslcd.8.xml b/man/nslcd.8.xml
index 5b44a43..625a02c 100644
--- a/man/nslcd.8.xml
+++ b/man/nslcd.8.xml
@@ -36,7 +36,7 @@
<refmeta>
<refentrytitle>nslcd</refentrytitle>
<manvolnum>8</manvolnum>
- <refmiscinfo class="version">Version 0.7.11</refmiscinfo>
+ <refmiscinfo class="version">Version 0.7.12</refmiscinfo>
<refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
<refmiscinfo class="date">Oct 2010</refmiscinfo>
</refmeta>
diff --git a/man/nslcd.conf.5.xml b/man/nslcd.conf.5.xml
index 4cc3c43..ca3df6c 100644
--- a/man/nslcd.conf.5.xml
+++ b/man/nslcd.conf.5.xml
@@ -36,7 +36,7 @@
<refmeta>
<refentrytitle>nslcd.conf</refentrytitle>
<manvolnum>5</manvolnum>
- <refmiscinfo class="version">Version 0.7.11</refmiscinfo>
+ <refmiscinfo class="version">Version 0.7.12</refmiscinfo>
<refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
<refmiscinfo class="date">Oct 2010</refmiscinfo>
</refmeta>
diff --git a/man/pam_ldap.8.xml b/man/pam_ldap.8.xml
index 7615ef8..78fe21f 100644
--- a/man/pam_ldap.8.xml
+++ b/man/pam_ldap.8.xml
@@ -35,7 +35,7 @@
<refmeta>
<refentrytitle>pam_ldap</refentrytitle>
<manvolnum>8</manvolnum>
- <refmiscinfo class="version">Version 0.7.11</refmiscinfo>
+ <refmiscinfo class="version">Version 0.7.12</refmiscinfo>
<refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
<refmiscinfo class="date">Oct 2010</refmiscinfo>
</refmeta>