merge r356 from alioth's userdir-ldap-common, and cherry pick that fix onto that:
committer: Mark Hymers <mhy@debian.org>
branch nick: userdir-ldap-common
timestamp: Thu 2008-01-10 12:58:39 +0000
message:
Fix mistake in ud-userimport add logic spotted by Peter Palfrader.
* 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:
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
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: $!";
}
if (DoAdd == 1):
try:
- AddRec = Rec
- Rec.append(("objectClass", UserObjectClasses))
+ AddRec = Rec[:]
+ AddRec.append(("objectClass", UserObjectClasses))
l.add_s(Dn,AddRec)
DoModify = False