projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Echelon
[mirror/userdir-ldap.git]
/
ud-gpgimport
diff --git
a/ud-gpgimport
b/ud-gpgimport
index
c85c9ba
..
a0f1764
100755
(executable)
--- a/
ud-gpgimport
+++ b/
ud-gpgimport
@@
-23,8
+23,6
@@
from userdir_gpg import *;
UnknownMap = {};
NoAct = 1;
UnknownMap = {};
NoAct = 1;
-AddressSplit = re.compile("(.*).*<([^@]*)@([^>]*)>");
-
# Read the override file into the unknown map. The override file is a list
# of colon delimited entires mapping PGP email addresess to local users
def LoadOverride(File):
# Read the override file into the unknown map. The override file is a list
# of colon delimited entires mapping PGP email addresess to local users
def LoadOverride(File):
@@
-203,7
+201,7
@@
while(1):
Rec = [(ldap.MOD_ADD,"keyfingerprint",Split2[9])];
Dn = "uid=" + UID + "," + BaseDn;
Rec = [(ldap.MOD_ADD,"keyfingerprint",Split2[9])];
Dn = "uid=" + UID + "," + BaseDn;
- print "Adding key 0x"
,
Split2[9],"to",UID;
+ print "Adding key 0x"
+
Split2[9],"to",UID;
if KeyCount.has_key(UID):
KeyCount[UID] = KeyCount[UID] + 1;
else:
if KeyCount.has_key(UID):
KeyCount[UID] = KeyCount[UID] + 1;
else: