X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=web%2FUtil.pm;h=89ef3fb8c6a982a94ff150bd910a61cd12015e1d;hb=5364d2c2f24115fd1c27a19099a2321fe93fa5d4;hp=4cbec32fb1bd5c1f0b8f1594ee6b1504e643283b;hpb=18a2afc4d3698f6f5d23e7de98699e3d27b5d8c4;p=mirror%2Fuserdir-ldap.git

diff --git a/web/Util.pm b/web/Util.pm
index 4cbec32..89ef3fb 100644
--- a/web/Util.pm
+++ b/web/Util.pm
@@ -6,6 +6,7 @@ use Crypt::Blowfish;
 
 my $blocksize = 8; # A blowfish block is 8 bytes
 my $configfile = "/etc/userdir-ldap/userdir-ldap.conf";
+#my $configfile = "./userdir-ldap.conf";
 
 my %config = &ReadConfigFile;
 
@@ -169,7 +170,7 @@ sub FormatFingerPrint {
 
 sub FetchKey {
   my $fingerprint = shift;
-  my ($out, $keyringparam);
+  my ($out, $keyringparam) = undef;
   
   foreach (split(/:/, $config{keyrings})) {
     $keyringparam .= "--keyring $_ ";
@@ -179,10 +180,10 @@ sub FetchKey {
   $fingerprint = "0x".$fingerprint;
 
   $/ = undef; # just suck it up ....
-  open(FP, "$config{gpg} $keyringparam --list-sigs --fingerprint $fingerprint|");
+  open(FP, "$config{gpg} --no-options --no-default-keyring $keyringparam --list-sigs --fingerprint $fingerprint|");
   $out = <FP>;
   close FP;
-  open(FP, "$config{gpg} $keyringparam --export -a $fingerprint|");
+  open(FP, "$config{gpg} --no-options --no-default-keyring $keyringparam --export -a $fingerprint|");
   $out .= <FP>;
   close FP;
   $/ = "\n";