Import from samosa: case sensitive spelling of fields

diff --git a/ud-gpgimport b/ud-gpgimport
index de79b71..1229e57 100755 (executable)
--- a/ud-gpgimport
+++ b/ud-gpgimport
@@ -63,22 +63,22 @@ else:
 # Download the existing key list and put it into a map
 print "Fetching key list..",
 sys.stdout.flush();
-Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyfingerprint=*",["keyfingerprint","uid"]);
+Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=*",["keyFingerPrint","uid"]);
 KeyMap = {};
 KeyCount = {};
 for x in Attrs:
   try:
      # Sense a bad fingerprint.. Slapd has problems, it will store a null
      # value that ldapsearch doesn't show up.. detect and remove
-     if len(x[1]["keyfingerprint"]) == 0 or x[1]["keyfingerprint"][0] == "":
+     if len(x[1]["keyFingerPrint"]) == 0 or x[1]["keyFingerPrint"][0] == "":
        print;
        print "Fixing bad fingerprint for",x[1]["uid"][0],
        sys.stdout.flush();
        if NoAct == 0:
          l.modify_s("uid="+x[1]["uid"][0]+","+BaseDn,\
-                     [(ldap.MOD_DELETE,"keyfingerprint",None)]);
+                     [(ldap.MOD_DELETE,"keyFingerPrint",None)]);
      else:
-       for I in x[1]["keyfingerprint"]:
+       for I in x[1]["keyFingerPrint"]:
          KeyMap[I] = [x[1]["uid"][0],0];
          if KeyCount.has_key(x[1]["uid"][0]):
             KeyCount[x[1]["uid"][0]] = KeyCount[x[1]["uid"][0]] + 1;
@@ -144,7 +144,7 @@ while(1):
       continue;
 
    UID = UID[0]
-   Rec = [(ldap.MOD_ADD,"keyfingerprint",Split2[9])];
+   Rec = [(ldap.MOD_ADD,"keyFingerPrint",Split2[9])];
    Dn = "uid=" + UID + "," + BaseDn;
    print "Adding key 0x"+Split2[9],"to",UID;
    if KeyCount.has_key(UID):
@@ -179,5 +179,5 @@ for x in KeyMap.keys():
             print "**",KeyMap[x][0],"no longer has any keys";
       if NoAct == 0:
          l.modify_s("uid="+KeyMap[x][0]+","+BaseDn,\
-                     [(ldap.MOD_DELETE,"keyfingerprint",x)]);
+                     [(ldap.MOD_DELETE,"keyFingerPrint",x)]);
       

diff --git a/ud-ldapshow b/ud-ldapshow
index 6447283..0c54cb4 100755 (executable)
--- a/ud-ldapshow
+++ b/ud-ldapshow
@@ -9,15 +9,15 @@ from userdir_ldap import *;
 
 def ShowDups(Attrs,Len):
    for x in Attrs:
-      if x[1].has_key("keyfingerprint") == 0:
+      if x[1].has_key("keyFingerPrint") == 0:
          continue;
         
       Count = 0;
-      for I in x[1]["keyfingerprint"]:
+      for I in x[1]["keyFingerPrint"]:
          if len(I) == Len:
             Count = Count + 1;
       if Count > 1:
-         for I in x[1]["keyfingerprint"]:
+         for I in x[1]["keyFingerPrint"]:
            if len(I) == Len:
               print "%s: %s" % (EmailAddress(x),I);
 
@@ -35,48 +35,48 @@ l = ldap.open(LDAPServer);
 l.simple_bind_s("","");
 
 if arguments[0] == "nokey":
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(!(keyfingerprint=*))",\
-           ["uid","cn","sn","emailforward","comment"]);
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(!(keyFingerPrint=*))",\
+           ["uid","cn","sn","emailForward","comment"]);
    Attrs.sort();
    for x in Attrs:
       print "Key Missing:",EmailAddress(x);
-      if GetAttr(x,"emailforward") != "":
-         print "  ->",GetAttr(x,"emailforward");
+      if GetAttr(x,"emailForward") != "":
+         print "  ->",GetAttr(x,"emailForward");
       if GetAttr(x,"comment") != "":
          print "  :",GetAttr(x,"comment");
 
 if arguments[0] == "noforward":
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(!(emailforward=*))",\
-           ["uid","cn","sn","emailforward","comment"]);
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(!(emailForward=*))",\
+           ["uid","cn","sn","emailForward","comment"]);
    Attrs.sort();
    for x in Attrs:
       print "No Forward:",EmailAddress(x);
 
 if arguments[0] == "badpriv":
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(!(keyfingerprint=*))(privatesub=*))",\
-           ["uid","cn","sn","privatesub"]);
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(!(keyFingerPrint=*))(privateSub=*))",\
+           ["uid","cn","sn","privateSub"]);
    Attrs.sort();
    for x in Attrs:
-      print EmailAddress(x)+": "+GetAttr(x,"privatesub");
+      print EmailAddress(x)+": "+GetAttr(x,"privateSub");
 
 if arguments[0] == "nopriv":
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyfingerprint=*)(!(privatesub=*)))",\
-           ["uid","cn","sn","privatesub"]);
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyFingerPrint=*)(!(privateSub=*)))",\
+           ["uid","cn","sn","privateSub"]);
    Attrs.sort();
    for x in Attrs:
-      print "  ",EmailAddress(x)+": "+GetAttr(x,"privatesub");
+      print "  ",EmailAddress(x)+": "+GetAttr(x,"privateSub");
 
 if arguments[0] == "keymap":
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
-           ["uid","cn","sn","keyfingerprint"]);
+           ["uid","cn","sn","keyFingerPrint"]);
    Attrs.sort();
    for x in Attrs:
-      if x[1].has_key("keyfingerprint"):
-         for I in x[1]["keyfingerprint"]:
+      if x[1].has_key("keyFingerPrint"):
+         for I in x[1]["keyFingerPrint"]:
            print "%s: %s" % (EmailAddress(x),I);
 
 if arguments[0] == "devcount":
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyfingerprint=*)(gidnumber=800))",\
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyFingerPrint=*)(gidNumber=800))",\
            ["uid"]);
    Count = 0;
    for x in Attrs:
@@ -85,7 +85,7 @@ if arguments[0] == "devcount":
 
 if arguments[0] == "echelon":
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
-   "(&(|(activity-pgp=*)(activity-from=*))(&(keyfingerprint=*)(gidnumber=800)))",\
+   "(&(|(activity-pgp=*)(activity-from=*))(&(keyFingerPrint=*)(gidNumber=800)))",\
            ["activity-pgp","activity-from"]);
    Count = 0;
    PGPCount = 0;
@@ -97,21 +97,21 @@ if arguments[0] == "echelon":
 
 if arguments[0] == "missing":
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
-   "(&(!(|(activity-pgp=*)(activity-from=*)))(&(keyfingerprint=*)(gidnumber=800)))",\
+   "(&(!(|(activity-pgp=*)(activity-from=*)))(&(keyFingerPrint=*)(gidNumber=800)))",\
            ["uid","cn","sn","mn"]);
    Attrs.sort();
    for x in Attrs:
       print EmailAddress(x);
 
 if arguments[0] == "keystat":
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyfingerprint=*",\
-           ["keyfingerprint"]);
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=*",\
+           ["keyFingerPrint"]);
    KeyCount = 0;
    GPGCount = 0;
    for x in Attrs:
-      if x[1].has_key("keyfingerprint"):
+      if x[1].has_key("keyFingerPrint"):
          KeyCount = KeyCount + 1;
-         for I in x[1]["keyfingerprint"]:
+         for I in x[1]["keyFingerPrint"]:
            if len(I) == 40:
               GPGCount = GPGCount + 1;
               break;
@@ -119,7 +119,7 @@ if arguments[0] == "keystat":
 
 if arguments[0] == "multikeys":
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
-           ["uid","cn","sn","keyfingerprint"]);
+           ["uid","cn","sn","keyFingerPrint"]);
    Attrs.sort();
    
    

diff --git a/ud-passchk b/ud-passchk
index 6929f4f..e7c3cb7 100755 (executable)
--- a/ud-passchk
+++ b/ud-passchk
@@ -10,7 +10,7 @@ def PassCheck(l,File,HomePrefix):
    
    # Fetch all the users and generate a map out of them
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
-           ["uid","uidnumber","gidnumber","loginshell"]);
+           ["uid","uidNumber","gidNumber","loginShell"]);
    UIDMap = {};
    for x in Attrs:
       if x[1].has_key("uid") == 0:
@@ -30,11 +30,11 @@ def PassCheck(l,File,HomePrefix):
 
       Ats = UIDMap[Split[0]];
       Miss = [];
-      if Ats.has_key("uidnumber") and Ats["uidnumber"][0] != Split[2]: 
+      if Ats.has_key("uidNumber") and Ats["uidNumber"][0] != Split[2]: 
          Miss.append("UID");
-      if Ats.has_key("uidnumber") and Ats["gidnumber"][0] != Split[3]: 
+      if Ats.has_key("uidNumber") and Ats["gidNumber"][0] != Split[3]: 
          Miss.append("GID");
-      if Ats.has_key("homedirectory") and \
+      if Ats.has_key("homeDirectory") and \
          split[5] != HomePrefix + Split[0]:
          Miss.append("Home");
       if len(Miss) != 0:

diff --git a/ud-userimport b/ud-userimport
index 2e6f903..cbb6bac 100755 (executable)
--- a/ud-userimport
+++ b/ud-userimport
@@ -89,11 +89,11 @@ def DoPasswd(l,Passwd):
       if (DoAdd == 1):
          try:
             l.add_s(Dn,[("uid",Split[0]),
-                        ("objectclass","top"),
-                        ("objectclass","account"),
-                        ("objectclass","posixAccount"),
-                        ("objectclass","shadowAccount"),
-                        ("objectclass","debiandeveloper")]);
+                        ("objectClass","top"),
+                        ("objectClass","account"),
+                        ("objectClass","posixAccount"),
+                        ("objectClass","shadowAccount"),
+                        ("objectClass","debiandeveloper")]);
          except ldap.ALREADY_EXISTS:
             print "exists",;
 
@@ -162,7 +162,7 @@ def DoGroup(l,Group):
 
       # Iterate over the membership list and add the membership information
       # To the directory
-      Rec = [(ldap.MOD_ADD,"supplementarygid",Split[0])];
+      Rec = [(ldap.MOD_ADD,"supplementaryGid",Split[0])];
       Counter = 0;
       for x in Members:
         if x == "":
@@ -191,8 +191,8 @@ def DoGroup(l,Group):
       if (DoAdd == 1):
          try:
             l.add_s(Dn,[("gid",Split[0]),
-                        ("objectclass","top"),
-                        ("objectclass","posixGroup")]);
+                        ("objectClass","top"),
+                        ("objectClass","posixGroup")]);
          except ldap.ALREADY_EXISTS:
             print "exists",;