[Da-tools-commits] ./debian/userdir-ldap r367: Merge from alioth
Peter Palfrader
peter at palfrader.org
Thu Jan 10 14:33:29 UTC 2008
------------------------------------------------------------
revno: 367
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:33:29 +0100
message:
Merge from alioth
modified:
debian/changelog
ud-generate
------------------------------------------------------------
revno: 349.1.4.1.1
committer: Marc 'HE' Brockschmidt <he at debian.org>
branch nick: userdir-ldap-UIDShift+PasswordLessExport
timestamp: Wed 2007-12-26 23:38:22 +0100
message:
Mark that no passwords are exported also in the generated passwd file, not
only in the shadow file (by using a "*" as password (meaning "no password),
instead of "x" (meaning "do I look like a passwd from the nineties? Look
into /etc/shadow!")).
modified:
ud-generate
------------------------------------------------------------
revno: 349.1.10.1.1
committer: Marc 'HE' Brockschmidt <he at debian.org>
branch nick: userdir-ldap-common
timestamp: Wed 2007-12-26 23:41:38 +0100
message:
Merge passwordless export fix
modified:
ud-generate
------------------------------------------------------------
revno: 349.1.11
committer: Mark Hymers <mark at hymers.org.uk>
branch nick: userdir-ldap-common
timestamp: Wed 2007-12-26 22:47:26 +0000
message:
merge from upstream
modified:
ud-generate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-01-10 13:50:58 +0000
+++ b/debian/changelog 2008-01-10 14:33:29 +0000
@@ -21,6 +21,10 @@
* 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].
+ * ud-generate: Mark that no passwords are exported also in the
+ generated passwd file, not only in the shadow file (by using a "*"
+ as password (meaning "no password"), instead of "x" (meaning "do I
+ look like a passwd from the nineties? Look into /etc/shadow!")) [HE].
[ Mark Hymers ]
* ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:
@@ -28,10 +32,10 @@
ud-{user,group,role}add and abstract them out into userdir_ldap.py
* ud-useradd: Avoid a TypeError exception when constructing the template
filename
- * Remove use of deprecated functions from the string module
+ * Remove use of deprecated functions from the string module
* ud-arbimport: os.exit -> sys.exit
- -- Mark Hymers <mhy at debian.org> Wed, 26 Dec 2007 20:54:28 +0000
+ -- Peter Palfrader <weasel at debian.org> Thu, 10 Jan 2008 15:32:16 +0100
userdir-ldap (0.3.15) unstable; urgency=low
=== modified file 'ud-generate'
--- a/ud-generate 2007-12-26 20:49:42 +0000
+++ b/ud-generate 2007-12-26 22:41:38 +0000
@@ -88,7 +88,7 @@
os.rename(File + ".tdb.tmp",File+".tdb");
# Generate the password list
-def GenPasswd(l,File,HomePrefix):
+def GenPasswd(l,File,HomePrefix,PwdMarker):
F = None;
try:
F = open(File + ".tdb.tmp","w");
@@ -107,7 +107,8 @@
if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginShell")) > 50:
continue;
- Line = "%s:x:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\
+ Line = "%s:%s:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\
+ PwdMarker,\
GetAttr(x,"uidNumber"),GetAttr(x,"gidNumber"),\
GetAttr(x,"gecos"),HomePrefix,GetAttr(x,"uid"),\
GetAttr(x,"loginShell"));
@@ -852,7 +853,10 @@
DoLink(GlobalDir,OutDir,"disabled-accounts")
sys.stdout.flush();
- GenPasswd(l,OutDir+"passwd",Split[1]);
+ if ExtraList.has_key("[NOPASSWD]"):
+ GenPasswd(l,OutDir+"passwd",Split[1], "*");
+ else:
+ GenPasswd(l,OutDir+"passwd",Split[1], "x");
sys.stdout.flush();
GenGroup(l,OutDir+"group");
if ExtraList.has_key("[UNTRUSTED]"):
More information about the Da-tools-commits
mailing list