From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Jan 2008 09:05:11 +0000 (+0100)
Subject: Merge from alioth: note about more modern slapd configs
X-Git-Tag: userdir-ldap-0.3.16~20
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=34f8ee5cf2bae423a2db3bec2b0a1f52eb06b9fb;hp=fe66cb2a8ed7feb74119e353625d48a6a3fcff41

Merge from alioth: note about more modern slapd configs
---

diff --git a/debian/changelog b/debian/changelog
index fd610c2..ab3ed40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,18 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
   * Change the build dependency on python-support to be versioned >= 0.3.
   * ud-roleadd: Do not try to make role accounts of objectClass
     inetOrgPerson, that doesn't work.
-
- -- Peter Palfrader <weasel@debian.org>  Tue, 25 Dec 2007 13:08:50 +0100
+  * ud-fingerserv: implement daemonize() for non-inetd mode [sgran].
+  * ud-useradd: support usergroups [HE].
+  * ud-host/userdir-ldap.schema: Add 'purpose', 'physicalHost' to
+    debianServer schema and teach ud-host about [HE].
+  * ud-host: cleanup: Replace local copy HBaseDn of the centrally
+    configured HostBaseDn [HE].
+  * Add myself to uploaders.
+  * ud-generate: Set shadow expiry to 1 for locked accounts [mhy].
+  * update doc/slapd-config.txt: labeledURL was removed from the schema but
+    not the slapd.conf example.  Do that now [mhy].
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 26 Dec 2007 16:46:27 +0100
 
 userdir-ldap (0.3.15) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 869a526..4639a48 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Administration team <debian-admin@lists.debian.org>
 Build-Depends: debhelper (>= 5), python-support (>= 0.3)
 Standards-Version: 3.5.8.0
-Uploaders: Ryan Murray <rmurray@debian.org>
+Uploaders: Ryan Murray <rmurray@debian.org>, Peter Palfrader <weasel@debian.org>
 
 Package: userdir-ldap
 Architecture: all
diff --git a/ud-fingerserv b/ud-fingerserv
index 42b8239..1c977d8 100755
--- a/ud-fingerserv
+++ b/ud-fingerserv
@@ -61,9 +61,12 @@ if (!$use_inetd) {
     chdir '/' or die "Can't chdir to /: $!";
     open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
     open STDOUT, '>/dev/null' or die "Can't write to /dev/null: $!";
-    defined(my $pid = fork) or die "Can't fork: $!";
+    my $pid;
+    defined($pid = fork) or die "Can't fork: $!";
     exit if $pid;
     setsid or die "Can't start a new session: $!";
+    defined($pid = fork) or die "Can't fork: $!";
+    exit if $pid;
     open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
   }