Add userdir-ldap-slapd.conf, a snipped to be included in slapd.conf to the package.

[mirror/userdir-ldap.git] / ud-generate

diff --git a/ud-generate b/ud-generate
index 773b746..774e032 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -38,8 +38,7 @@ CurrentHost = "";
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
 BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
 DNSZone = ".debian.net"
-Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg",
-             "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ]
+Keyrings = ConfModule.sync_keyrings.split(":")
 
 def safe_makedirs(dir):
     try:
@@ -183,12 +182,12 @@ def GenShadow(l,File):
           or GetAttr(x,"userPassword").startswith("!"):
          ShadowExpire = '1'
       else:
-         ShadowExpire = GetAttr(x,"shadowexpire")
+         ShadowExpire = GetAttr(x,"shadowExpire")
 
       Line = "%s:%s:%s:%s:%s:%s:%s:%s:" % (GetAttr(x,"uid"),\
               Pass,GetAttr(x,"shadowLastChange"),\
               GetAttr(x,"shadowMin"),GetAttr(x,"shadowMax"),\
-              GetAttr(x,"shadowWarning"),GetAttr(x,"shadowinactive"),\
+              GetAttr(x,"shadowWarning"),GetAttr(x,"shadowInactive"),\
               ShadowExpire);
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (I,Line));
@@ -849,7 +848,7 @@ def GenKeyrings(l,OutDir):
     shutil.copy(k, OutDir)
 
 # Connect to the ldap server
-l = ldap.open(LDAPServer);
+l = connectLDAP()
 F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
 Pass = F.readline().strip().split(" ")
 F.close();
@@ -870,8 +869,8 @@ for x in Attrs:
 PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
                 ["uid","uidNumber","gidNumber","supplementaryGid",\
                  "gecos","loginShell","userPassword","shadowLastChange",\
-                 "shadowMin","shadowMax","shadowWarning","shadowinactive",
-                "shadowexpire","emailForward","latitude","longitude",\
+                 "shadowMin","shadowMax","shadowWarning","shadowInactive",
+                "shadowExpire","emailForward","latitude","longitude",\
                  "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\
                 "keyFingerPrint","privateSub","mailDisableMessage",\
                  "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\