projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the build dependency to WML since the WML part has been split off
[mirror/userdir-ldap.git]
/
userdir_gpg.py
diff --git
a/userdir_gpg.py
b/userdir_gpg.py
index
1f3b1cb
..
455ba3f
100644
(file)
--- a/
userdir_gpg.py
+++ b/
userdir_gpg.py
@@
-1,4
+1,5
@@
# Copyright (c) 1999-2001 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 1999-2001 Jason Gunthorpe <jgg@debian.org>
+# Copyright (c) 2005 Joey Schulze <joey@infodrom.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
@@
-31,8
+32,12
@@
import rfc822, time, fcntl, FCNTL, anydbm
# General GPG options
GPGPath = "gpg"
# "--load-extension","rsa",
# General GPG options
GPGPath = "gpg"
# "--load-extension","rsa",
-GPGBasicOptions = ["--no-options","--batch",
- "--no-default-keyring","--always-trust"];
+GPGBasicOptions = [
+ "--no-options",
+ "--batch",
+ "--no-default-keyring",
+ "--secret-keyring", "/dev/null",
+ "--always-trust"];
GPGKeyRings = [];
GPGSigOptions = ["--output","-"];
GPGSearchOptions = ["--dry-run","--with-colons","--fingerprint"];
GPGKeyRings = [];
GPGSigOptions = ["--output","-"];
GPGSearchOptions = ["--dry-run","--with-colons","--fingerprint"];
@@
-420,6
+425,11
@@
def GPGKeySearch(SearchCriteria):
Owner = "";
KeyID = "";
Hits = {};
Owner = "";
KeyID = "";
Hits = {};
+
+ dir = os.path.expanduser("~/.gnupg")
+ if not os.path.isdir(dir):
+ os.mkdir(dir, 0700)
+
try:
Strm = os.popen(string.join(Args," "),"r");
try:
Strm = os.popen(string.join(Args," "),"r");