X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=misc%2Fud-update-sudopasswords;h=441acb822063a1bff0f9bba56a4d4415af5297c4;hb=c57441f9d922069df6dd31e0f1d2700a45c9d6d7;hp=8e7fea88ffef6e3a474c53cb0e23ef4af1f6967f;hpb=0539c19e661f05d992fdeb6e05ec9dcf99bb691d;p=mirror%2Fuserdir-ldap.git

diff --git a/misc/ud-update-sudopasswords b/misc/ud-update-sudopasswords
index 8e7fea8..441acb8 100755
--- a/misc/ud-update-sudopasswords
+++ b/misc/ud-update-sudopasswords
@@ -20,21 +20,21 @@
 # the hmac also includes purpose ("sudo") and userid that owns the
 # entry.  This little script updates an ldap from old to new.
 
-import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil, errno, tarfile, grp
-from userdir_ldap import *;
+import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, shutil, errno, tarfile, grp
+from userdir_ldap import *
 
 UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
 # Connect to the ldap server
 l = connectLDAP()
-F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
+F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r")
 Pass = F.readline().strip().split(" ")
-F.close();
-l.simple_bind_s("uid="+Pass[0]+","+BaseDn,Pass[1]);
+F.close()
+l.simple_bind_s("uid="+Pass[0]+","+BaseDn,Pass[1])
 
-PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"sudoPassword=*", ["uid","sudoPassword"]);
+PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"sudoPassword=*", ["uid","sudoPassword"])
 if PasswdAttrs == None:
-  raise "No Users";
+  raise Exception("No Users")
 
 for x in PasswdAttrs:
    if not x[1].has_key('sudoPassword'):
@@ -53,7 +53,7 @@ for x in PasswdAttrs:
 
       # ok old format
       oldformat = 'confirmed:'+make_hmac(':'.join(['password-is-confirmed', uuid, hosts, cryptedpass]))
-      newformat = 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', x[1]['uid'][0], uuid, hosts, cryptedpass);
+      newformat = 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', x[1]['uid'][0], uuid, hosts, cryptedpass)
 
       if status == oldformat:
          print "Updating sudo password entry for %s."%(uid)
@@ -69,6 +69,6 @@ for x in PasswdAttrs:
       else:
          Rec.append((ldap.MOD_ADD, 'sudoPassword', line))
 
-   Dn = "uid=" + uid + "," + BaseDn;
-   l.modify_s(Dn,Rec);
+   Dn = "uid=" + uid + "," + BaseDn
+   l.modify_s(Dn,Rec)