Empty merge

diff --git a/debian/changelog b/debian/changelog
index fd610c2..5d81ac5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,14 @@ 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].
+
+ -- Peter Palfrader <weasel@debian.org>  Tue, 25 Dec 2007 20:30:17 +0100
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

diff --git a/ud-fingerserv b/ud-fingerserv
index 42b8239..1c977d8 100755 (executable)
--- 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: $!";
   }