projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4eaa444
)
ud-update-sudopasswords: drop trailing semicolons
author
Julien Cristau
<jcristau@debian.org>
Fri, 11 Oct 2019 13:37:06 +0000
(15:37 +0200)
committer
Julien Cristau
<jcristau@debian.org>
Fri, 11 Oct 2019 13:37:06 +0000
(15:37 +0200)
misc/ud-update-sudopasswords
patch
|
blob
|
history
diff --git
a/misc/ud-update-sudopasswords
b/misc/ud-update-sudopasswords
index
292b282
..
c5585b8
100755
(executable)
--- a/
misc/ud-update-sudopasswords
+++ b/
misc/ud-update-sudopasswords
@@
-21,20
+21,20
@@
# entry. This little script updates an ldap from old to new.
import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, shutil, errno, tarfile, grp
# entry. This little script updates an ldap from old to new.
import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, shutil, errno, tarfile, grp
-from userdir_ldap import *
;
+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()
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(" ")
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:
if PasswdAttrs == None:
- raise "No Users"
;
+ raise "No Users"
for x in PasswdAttrs:
if not x[1].has_key('sudoPassword'):
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]))
# 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)
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))
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)