* ksutil.c (parse_ks_options): Handle verbose=nnn.
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 17 Mar 2005 23:16:41 +0000 (23:16 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 17 Mar 2005 23:16:41 +0000 (23:16 +0000)
* Makefile.am: Calculate GNUPG_LIBEXECDIR directly.  Do not redefine
$libexecdir.

keyserver/ChangeLog
keyserver/Makefile.am
keyserver/ksutil.c

index e95067c..e27e9e8 100644 (file)
@@ -1,5 +1,10 @@
 2005-03-17  David Shaw  <dshaw@jabberwocky.com>
 
+       * ksutil.c (parse_ks_options): Handle verbose=nnn.
+
+       * Makefile.am: Calculate GNUPG_LIBEXECDIR directly.  Do not
+       redefine $libexecdir.
+
        * gpgkeys_curl.c, gpgkeys_finger.c, gpgkeys_ldap.c: Start using
        parse_ks_options and remove a lot of common code.
 
index 0b045e4..7d328b2 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_curl
 EXTRA_SCRIPTS = gpgkeys_mailto
-libexecdir = @libexecdir@/@PACKAGE@
 
-libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_HTTP@ @GPGKEYS_CURL@
-libexec_SCRIPTS = @GPGKEYS_MAILTO@
+gpglibexecdir = $(libexecdir)/@PACKAGE@
+
+gpglibexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_HTTP@ @GPGKEYS_CURL@
+gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@
 noinst_SCRIPTS = gpgkeys_test
 
 gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h
index c0dc5f6..0a5d779 100644 (file)
@@ -92,6 +92,7 @@ free_ks_options(struct ks_options *opt)
       free(opt->scheme);
       free(opt->auth);
       free(opt->path);
+      free(opt->opaque);
       free(opt->ca_cert_file);
       free(opt);
     }
@@ -205,10 +206,12 @@ parse_ks_options(char *line,struct ks_options *opt)
          start=&option[3];
        }
 
-      if(strcasecmp(start,"verbose")==0)
+      if(strncasecmp(start,"verbose",7)==0)
        {
          if(no)
-           opt->verbose--;
+           opt->verbose=0;
+         else if(start[7]=='=')
+           opt->verbose=atoi(&start[8]);
          else
            opt->verbose++;
        }