gnupg/keyserver (ChangeLog Makefile.am ksutil.c)

[cvs user dshaw]

    Date: Friday, March 18, 2005 @ 00:16:41
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog Makefile.am ksutil.c

* ksutil.c (parse_ks_options): Handle verbose=nnn.

* Makefile.am: Calculate GNUPG_LIBEXECDIR directly.  Do not redefine
$libexecdir.


-------------+
 ChangeLog   |    5 +++++
 Makefile.am |    9 +++++----
 ksutil.c    |    7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.117 gnupg/keyserver/ChangeLog:1.118
--- gnupg/keyserver/ChangeLog:1.117	Thu Mar 17 17:42:41 2005
+++ gnupg/keyserver/ChangeLog	Fri Mar 18 00:16:41 2005
@@ -1,5 +1,10 @@
 2005-03-17  David Shaw  <dshaw at 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: gnupg/keyserver/Makefile.am
diff -u gnupg/keyserver/Makefile.am:1.26 gnupg/keyserver/Makefile.am:1.27
--- gnupg/keyserver/Makefile.am:1.26	Fri Feb 11 19:05:13 2005
+++ gnupg/keyserver/Makefile.am	Fri Mar 18 00:16:41 2005
@@ -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.
 #
@@ -21,10 +21,11 @@
 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: gnupg/keyserver/ksutil.c
diff -u gnupg/keyserver/ksutil.c:1.4 gnupg/keyserver/ksutil.c:1.5
--- gnupg/keyserver/ksutil.c:1.4	Thu Mar 17 17:42:41 2005
+++ gnupg/keyserver/ksutil.c	Fri Mar 18 00:16:41 2005
@@ -92,6 +92,7 @@
       free(opt->scheme);
       free(opt->auth);
       free(opt->path);
+      free(opt->opaque);
       free(opt->ca_cert_file);
       free(opt);
     }
@@ -205,10 +206,12 @@
 	  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++;
 	}