projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lowercasing hashed sudo passwords in ud-mailgate not considered smart
[mirror/userdir-ldap.git]
/
ud-mailgate
diff --git
a/ud-mailgate
b/ud-mailgate
index
d72cb9e
..
b743c8b
100755
(executable)
--- a/
ud-mailgate
+++ b/
ud-mailgate
@@
-7,8
+7,6
@@
import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, commands
import pwd, tempfile
import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, commands
import pwd, tempfile
-import hmac
-import sha as sha1_module
from userdir_gpg import *
from userdir_ldap import *
from userdir_gpg import *
from userdir_ldap import *
@@
-455,7
+453,7
@@
def DoRBL(Str,Attrs):
# Handle a ConfirmSudoPassword request
def DoConfirmSudopassword(Str):
# Handle a ConfirmSudoPassword request
def DoConfirmSudopassword(Str):
- Match = re.compile('^confirm sudopassword ('+UUID_FORMAT+') ([a-z0-9,*]+) ([0-9a-f]{40})$').match(Str
.lower()
)
+ Match = re.compile('^confirm sudopassword ('+UUID_FORMAT+') ([a-z0-9,*]+) ([0-9a-f]{40})$').match(Str)
if Match == None:
return None
if Match == None:
return None
@@
-481,7
+479,7
@@
def FinishConfirmSudopassword(l, uid, Attrs):
newldap = []
for entry in inldap:
newldap = []
for entry in inldap:
- Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry
.lower()
)
+ Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry)
if Match == None:
raise Error, "Could not parse existing sudopasswd entry"
uuid = Match.group(1)
if Match == None:
raise Error, "Could not parse existing sudopasswd entry"
uuid = Match.group(1)