projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give keyring-maint write access to keyFingerPrint
[mirror/userdir-ldap.git]
/
ud-gpgimport
diff --git
a/ud-gpgimport
b/ud-gpgimport
index
797aa5d
..
866563c
100755
(executable)
--- a/
ud-gpgimport
+++ b/
ud-gpgimport
@@
-3,6
+3,7
@@
# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2004 Joey Schulze <joey@debian.org>
# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2004 Joey Schulze <joey@debian.org>
+# Copyright (c) 2008, 2009, 2010 Peter Palfrader <peter@palfrader.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-62,17
+63,15
@@
for (switch, val) in options:
LoadOverride(val);
elif (switch == '-a'):
NoAct = 0;
LoadOverride(val);
elif (switch == '-a'):
NoAct = 0;
-if len(arguments) == 0:
- print "Give some keyrings to probe";
- sys.exit(0);
+
# Main program starts here
# Connect to the ldap server
if NoAct == 0:
# Main program starts here
# Connect to the ldap server
if NoAct == 0:
- l = passwdAccessLDAP(
LDAPServer,
BaseDn, AdminUser)
+ l = passwdAccessLDAP(BaseDn, AdminUser)
else:
else:
- l =
ldap.open(LDAPServer);
+ l =
connectLDAP()
l.simple_bind_s("","");
# Download the existing key list and put it into a map
l.simple_bind_s("","");
# Download the existing key list and put it into a map
@@
-105,14
+104,16
@@
Attrs = None;
print;
# Popen GPG with the correct magic special options
print;
# Popen GPG with the correct magic special options
-Args = [GPGPath] + GPGBasicOptions;
+ClearKeyrings()
+if len(arguments) == 0:
+ print "Using default keyrings: %s"%ConfModule.add_keyrings;
+ SetKeyrings(ConfModule.add_keyrings.split(":"))
for x in arguments:
for x in arguments:
- Args.append("--keyring");
if x.find("/") == -1:
if x.find("/") == -1:
- Args.append("./"+x);
- else:
- Args.append(x);
-Args =
Ar
gs + GPGSearchOptions + [" 2> /dev/null"]
+ x= "./"+x
+ SetKeyrings( [x] )
+
+Args =
[GPGPath] + GPGBasicOptions + GPGKeyRin
gs + GPGSearchOptions + [" 2> /dev/null"]
Keys = os.popen(" ".join(Args),"r");
# Loop over the GPG key file
Keys = os.popen(" ".join(Args),"r");
# Loop over the GPG key file
@@
-140,7
+141,7
@@
while(1):
break;
if SeenKeys.has_key(Split2[9]):
break;
if SeenKeys.has_key(Split2[9]):
- print "Dup key
0x
",Split2[9],"belonging to",KeyMap[Split2[9]][0];
+ print "Dup key ",Split2[9],"belonging to",KeyMap[Split2[9]][0];
continue;
SeenKeys[Split2[9]] = None;
continue;
SeenKeys[Split2[9]] = None;
@@
-155,13
+156,13
@@
while(1):
print "None for",SplitEmail(Split[9]),"'%s'"%(Split[9]);
if UID[1] != None:
for x in UID[1]: print x;
print "None for",SplitEmail(Split[9]),"'%s'"%(Split[9]);
if UID[1] != None:
for x in UID[1]: print x;
- print "MISSING
0x
" + Split2[9];
+ print "MISSING " + Split2[9];
continue;
UID = UID[0]
Rec = [(ldap.MOD_ADD,"keyFingerPrint",Split2[9])];
Dn = "uid=" + UID + "," + BaseDn;
continue;
UID = UID[0]
Rec = [(ldap.MOD_ADD,"keyFingerPrint",Split2[9])];
Dn = "uid=" + UID + "," + BaseDn;
- print "Adding key
0x
"+Split2[9],"to",UID;
+ print "Adding key "+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:
@@
-187,7
+188,7
@@
print Ignored,"keys already in the directory (ignored)";
# Look for unmatched keys
for x in KeyMap.keys():
if KeyMap[x][1] == 0:
# Look for unmatched keys
for x in KeyMap.keys():
if KeyMap[x][1] == 0:
- print "key
0x
%s belonging to %s removed"%(x,KeyMap[x][0]);
+ print "key %s belonging to %s removed"%(x,KeyMap[x][0]);
if KeyCount.has_key(KeyMap[x][0]) :
KeyCount[KeyMap[x][0]] = KeyCount[KeyMap[x][0]] - 1
if KeyCount[KeyMap[x][0]] <= 0:
if KeyCount.has_key(KeyMap[x][0]) :
KeyCount[KeyMap[x][0]] = KeyCount[KeyMap[x][0]] - 1
if KeyCount[KeyMap[x][0]] <= 0: