Merge from alioth

Replace deprecated string.$foo($bar, $ARGS) calls with $bar.$foo($ARGS).
Also cherry pick two fixes on the patch from later in that tree:
  revno: 375
  committer: Mark Hymers <mhy@debian.org>
  branch nick: userdir-ldap-common
  timestamp: Thu 2008-01-10 13:44:07 +0000
  message:
    Don't convert strings to integers, just check that they could be converted.

    Noticed by Peter (again)
  --
  revno: 376
  committer: Mark Hymers <mhy@debian.org>
  branch nick: userdir-ldap-common
  timestamp: Thu 2008-01-10 13:48:43 +0000
  message:
    and some more old CheckNumber fixes

diff --git a/debian/changelog b/debian/changelog
index 86b09e6..b1917b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,16 @@ 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.
+  * 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].
 
   [ Mark Hymers ]
   * ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:

diff --git a/debian/control b/debian/control
index 869a526..4639a48 100644 (file)
--- 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 (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: $!";
   }
 

diff --git a/ud-userimport b/ud-userimport
index 3e926ec..4e044c7 100755 (executable)
--- a/ud-userimport
+++ b/ud-userimport
@@ -83,8 +83,10 @@ def DoPasswd(l,Passwd):
 
       Split = re.split("[:\n]",Line);
       (Split[4],cn,mn,sn) = ParseGecos(Split[4]);
-      Split[2] = int(Split[2])
-      Split[3] = int(Split[3])
+      # This just tests whether these are integers and throws an
+      # exception if not
+      int(Split[2])
+      int(Split[3])
       Rec = [("uid",Split[0]),
              ("uidNumber",Split[2]),
              ("gidNumber",Split[3]),
@@ -106,8 +108,8 @@ def DoPasswd(l,Passwd):
 
       if (DoAdd == 1):
          try:
-            AddRec = Rec
-            Rec.append(("objectClass", UserObjectClasses))
+            AddRec = Rec[:]
+            AddRec.append(("objectClass", UserObjectClasses))
             l.add_s(Dn,AddRec)
             DoModify = False
 
@@ -143,7 +145,7 @@ def DoShadow(l,Shadow):
          continue;
 
       for x in range(2,8):
-         Split[x] = int(Split[x])
+         int(Split[x])
 
       Rec = [(ldap.MOD_REPLACE,"shadowLastChange",Split[2]),
              (ldap.MOD_REPLACE,"shadowMin",Split[3]),
@@ -184,7 +186,7 @@ def DoGroup(l,Group):
       # Split up the group information
       Split = re.split("[:\n]",Line);
       Members = re.split("[, ]*",Split[3]);
-      Split[2] = int(Split[2])
+      int(Split[2])
 
       # Iterate over the membership list and add the membership information
       # To the directory