# in the directory but not in the key ring will be removed from the
# directory.
-import string, re, time, ldap, getopt, sys, pwd, os;
+import re, time, ldap, getopt, sys, pwd, os;
from userdir_ldap import *;
from userdir_gpg import *;
if Line == "":
break;
Split = re.split("[:\n]",Line);
- UnknownMap[Split[0]] = string.strip(Split[1]);
+ UnknownMap[Split[0]] = Split[1].strip()
# Process options
AdminUser = pwd.getpwuid(os.getuid())[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:
- l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
+ l = passwdAccessLDAP(BaseDn, AdminUser)
else:
- l = ldap.open(LDAPServer);
+ l = connectLDAP()
l.simple_bind_s("","");
# Download the existing key list and put it into a map
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:
- Args.append("--keyring");
- if string.find(x,"/") == -1:
- Args.append("./"+x);
- else:
- Args.append(x);
-Args = Args + GPGSearchOptions + [" 2> /dev/null"]
-Keys = os.popen(string.join(Args," "),"r");
+ if x.find("/") == -1:
+ x= "./"+x
+ SetKeyrings( [x] )
+
+Args = [GPGPath] + GPGBasicOptions + GPGKeyRings + GPGSearchOptions + [" 2> /dev/null"]
+Keys = os.popen(" ".join(Args),"r");
# Loop over the GPG key file
Outstanding = 0;
if Line == "":
break;
- Split = string.split(Line,":");
+ Split = Line.split(":")
if len(Split) < 8 or Split[0] != "pub":
continue;
Line2 = Keys.readline();
if Line2 == "":
break;
- Split2 = string.split(Line2,":");
+ Split2 = Line2.split(":");
if len(Split2) < 11 or Split2[0] != "fpr":
continue;
break;