projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Delete unmaintained/gpgwrapper. 8 years of non-maintenance ought to be enough.
[mirror/userdir-ldap.git]
/
ud-emailmatcher
diff --git
a/ud-emailmatcher
b/ud-emailmatcher
index
bae8fd9
..
b6e054d
100755
(executable)
--- a/
ud-emailmatcher
+++ b/
ud-emailmatcher
@@
-52,8
+52,7
@@
for x in arguments:
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
Keys = os.popen(" ".join(Args),"r")
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
Keys = os.popen(" ".join(Args),"r")
-l = ldap.open(LDAPServer);
-l.simple_bind_s("","");
+l = connectLDAP()
# Fetch the key list and map to email address
PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyfingerprint=*",\
# Fetch the key list and map to email address
PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyfingerprint=*",\
@@
-82,10
+81,10
@@
while(1):
Split = Line.split(":")
if len(Split) >= 8 and Split[0] == "pub":
Split = Line.split(":")
if len(Split) >= 8 and Split[0] == "pub":
- if FingerPrint
!= None and UID !=
None:
+ if FingerPrint
is not None and UID is not
None:
for x in Emails:
Match = AddressSplit.match(x);
for x in Emails:
Match = AddressSplit.match(x);
- if Match
==
None:
+ if Match
is
None:
continue;
Groups = Match.groups();
Email = Groups[1]+'@'+Groups[2];
continue;
Groups = Match.groups();
Email = Groups[1]+'@'+Groups[2];