projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a lie from welcome-message-60000 - not that it's the only one.
[mirror/userdir-ldap.git]
/
ud-gpgimport
diff --git
a/ud-gpgimport
b/ud-gpgimport
index
fd1a052
..
0ad4fc9
100755
(executable)
--- a/
ud-gpgimport
+++ b/
ud-gpgimport
@@
-32,7
+32,7
@@
# in the directory but not in the key ring will be removed from the
# directory.
# 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 *;
from userdir_ldap import *;
from userdir_gpg import *;
@@
-50,7
+50,7
@@
def LoadOverride(File):
if Line == "":
break;
Split = re.split("[:\n]",Line);
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];
# Process options
AdminUser = pwd.getpwuid(os.getuid())[0];
@@
-70,9
+70,9
@@
if len(arguments) == 0:
# Connect to the ldap server
if NoAct == 0:
# 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
@@
-108,12
+108,12
@@
print;
Args = [GPGPath] + GPGBasicOptions;
for x in arguments:
Args.append("--keyring");
Args = [GPGPath] + GPGBasicOptions;
for x in arguments:
Args.append("--keyring");
- if
string.find(x,
"/") == -1:
+ if
x.find(
"/") == -1:
Args.append("./"+x);
else:
Args.append(x);
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
Args.append("./"+x);
else:
Args.append(x);
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
-Keys = os.popen(
string.join(Args," "
),"r");
+Keys = os.popen(
" ".join(Args
),"r");
# Loop over the GPG key file
Outstanding = 0;
# Loop over the GPG key file
Outstanding = 0;
@@
-124,7
+124,7
@@
while(1):
if Line == "":
break;
if Line == "":
break;
- Split =
string.split(Line,":");
+ Split =
Line.split(":")
if len(Split) < 8 or Split[0] != "pub":
continue;
if len(Split) < 8 or Split[0] != "pub":
continue;
@@
-132,7
+132,7
@@
while(1):
Line2 = Keys.readline();
if Line2 == "":
break;
Line2 = Keys.readline();
if Line2 == "":
break;
- Split2 =
string.split(Line2,
":");
+ Split2 =
Line2.split(
":");
if len(Split2) < 11 or Split2[0] != "fpr":
continue;
break;
if len(Split2) < 11 or Split2[0] != "fpr":
continue;
break;