[Da-tools-commits] ./da-tools/userdir-ldap-common r361: merge

[Mark Hymers]

------------------------------------------------------------
revno: 361
committer: Mark Hymers <mark at hymers.org.uk>
branch nick: userdir-ldap-common
timestamp: Thu 2007-12-27 12:50:36 +0000
message:
  merge
modified:
  ud-generate
    ------------------------------------------------------------
    revno: 353.1.2
    committer: Marc 'HE' Brockschmidt <he at debian.org>
    branch nick: userdir-ldap-UIDShift+PasswordLessExport
    timestamp: Wed 2007-12-26 23:44:21 +0100
    message:
      Add 1000 to UIDs and GIDs if the ud-generate.conf contains '[UIDSHIFT]' as
      extra flag. This is useful if you want to preserve local accounts without
      ID conflicts.
    modified:
      ud-generate
    ------------------------------------------------------------
    revno: 353.1.3
    committer: Marc 'HE' Brockschmidt <he at debian.org>
    branch nick: userdir-ldap-UIDShift+PasswordLessExport
    timestamp: Thu 2007-12-27 09:39:32 +0100
    message:
      Sync with -common tree again
    modified:
      debian/changelog
      doc/slapd-config.txt
      gpgwrapper
      sigcheck
      ud-arbimport
      ud-echelon
      ud-emailmatcher
      ud-forwardlist
      ud-generate
      ud-gpgimport
      ud-gpgsigfetch
      ud-groupadd
      ud-homecheck
      ud-host
      ud-info
      ud-ldapshow
      ud-mailgate
      ud-passchk
      ud-roleadd
      ud-sshlist
      ud-useradd
      ud-userimport
      ud-xearth
      userdir_gpg.py
      userdir_ldap.py
-------------- next part --------------
=== modified file 'ud-generate'
--- a/ud-generate	2007-12-26 22:41:38 +0000
+++ b/ud-generate	2007-12-27 08:39:32 +0000
@@ -88,7 +88,7 @@
     os.rename(File + ".tdb.tmp",File+".tdb");
   
 # Generate the password list
-def GenPasswd(l,File,HomePrefix,PwdMarker):
+def GenPasswd(l,File,HomePrefix,PwdMarker,UidShift):
   F = None;
   try:
    F = open(File + ".tdb.tmp","w");
@@ -116,7 +116,7 @@
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (I,Line));
       F.write(".%s %s" % (GetAttr(x,"uid"),Line));
-      F.write("=%s %s" % (GetAttr(x,"uidNumber"),Line));
+      F.write("=%s %s" % ((int(GetAttr(x,"uidNumber"))+UidShift),Line));
       I = I + 1;
 
   # Oops, something unspeakable happened.
@@ -209,7 +209,7 @@
   Done(File,F,None);
 
 # Generate the group list
-def GenGroup(l,File):
+def GenGroup(l,File,UidShift):
   F = None;
   try:
    F = open(File + ".tdb.tmp","w");
@@ -242,7 +242,10 @@
    for x in GroupMap.keys():
       if GroupIDMap.has_key(x) == 0:
          continue;
-      Line = "%s:x:%u:" % (x,GroupIDMap[x]);
+      NewGid = int(GroupIDMap[x]);
+      if NewGid >= 500:
+         NewGid = NewGid + UidShift
+      Line = "%s:x:%u:" % (x,NewGid)
       Comma = '';
       for I in GroupMap[x]:
         Line = Line + ("%s%s" % (Comma,I));
@@ -250,7 +253,7 @@
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (J,Line));
       F.write(".%s %s" % (x,Line));
-      F.write("=%u %s" % (GroupIDMap[x],Line));
+      F.write("=%u %s" % (NewGid,Line));
       J = J + 1;
       
   # Oops, something unspeakable happened.
@@ -853,12 +856,14 @@
    DoLink(GlobalDir,OutDir,"disabled-accounts")
 
    sys.stdout.flush();
+   UidShift = 0
+   if ExtraList.has_key("[UIDSHIFT]"): UidShift=1000
    if ExtraList.has_key("[NOPASSWD]"):
-      GenPasswd(l,OutDir+"passwd",Split[1], "*");
+      GenPasswd(l,OutDir+"passwd",Split[1], "*", UidShift);
    else:
-      GenPasswd(l,OutDir+"passwd",Split[1], "x");
+      GenPasswd(l,OutDir+"passwd",Split[1], "x", UidShift);
    sys.stdout.flush();
-   GenGroup(l,OutDir+"group");
+   GenGroup(l,OutDir+"group", UidShift);
    if ExtraList.has_key("[UNTRUSTED]"):
 	continue;
    if not ExtraList.has_key("[NOPASSWD]"):