security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-23 15:07:03 +01:00
Code Activity

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

Browse Source 
* Makefile.am: Calculate GNUPG_LIBEXECDIR directly.  Do not redefine
$libexecdir.
This commit is contained in:
David Shaw 2005-03-17 23:16:41 +00:00
parent e19aa2e3ea
commit 24a34eea61
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyserver/ChangeLog
View File

@ -1,5 +1,10 @@
2005-03-17 David Shaw <dshaw@jabberwocky.com> 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 * gpgkeys_curl.c, gpgkeys_finger.c, gpgkeys_ldap.c: Start using
parse_ks_options and remove a lot of common code. parse_ks_options and remove a lot of common code.

9
keyserver/Makefile.am
View 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. # This file is part of GnuPG.
# #
@ -21,10 +21,11 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_curl EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_curl
EXTRA_SCRIPTS = gpgkeys_mailto EXTRA_SCRIPTS = gpgkeys_mailto
libexecdir = @libexecdir@/@PACKAGE@
libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_HTTP@ @GPGKEYS_CURL@ gpglibexecdir = $(libexecdir)/@PACKAGE@
libexec_SCRIPTS = @GPGKEYS_MAILTO@
gpglibexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_HTTP@ @GPGKEYS_CURL@
gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@
noinst_SCRIPTS = gpgkeys_test noinst_SCRIPTS = gpgkeys_test
gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h

7
keyserver/ksutil.c
View File

@ -92,6 +92,7 @@ free_ks_options(struct ks_options *opt)
free(opt->scheme); free(opt->scheme);
free(opt->auth); free(opt->auth);
free(opt->path); free(opt->path);
free(opt->opaque);
free(opt->ca_cert_file); free(opt->ca_cert_file);
free(opt); free(opt);
} }
@ -205,10 +206,12 @@ parse_ks_options(char *line,struct ks_options *opt)
start=&option[3]; start=&option[3];
} }
if(strcasecmp(start,"verbose")==0) if(strncasecmp(start,"verbose",7)==0)
{ {
if(no) if(no)
opt->verbose--; opt->verbose=0;
else if(start[7]=='=')
opt->verbose=atoi(&start[8]);
else else
opt->verbose++; opt->verbose++;
} }