aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-06-10 21:34:15 +0000
committerDavid Shaw <[email protected]>2002-06-10 21:34:15 +0000
commitf1c38eea2aabe9103bcc6914a3709dd5c0cb0b13 (patch)
treec0c51b63e6bbc245cf4ec4635f9912b2023c53fa
parent* options.h, keyserver.c (keyserver_opts), g10.c (main): New keyserver (diff)
downloadgnupg-f1c38eea2aabe9103bcc6914a3709dd5c0cb0b13.tar.gz
gnupg-f1c38eea2aabe9103bcc6914a3709dd5c0cb0b13.zip
* gpgkeys_ldap.c (include_subkeys): Default "include-subkeys" to off,
since GnuPG now defaults it to on.
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/gpgkeys_ldap.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 7e5fe1fa1..306dcd892 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-10 David Shaw <[email protected]>
+
+ * gpgkeys_ldap.c (include_subkeys): Default "include-subkeys" to
+ off, since GnuPG now defaults it to on.
+
2002-06-06 David Shaw <[email protected]>
* gpgkeys_hkp.c (parse_hkp_index): Type tweaks.
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 0d85311c1..fa9edab8d 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -40,7 +40,7 @@
#define SEARCH 2
#define MAX_LINE 80
-int verbose=0,include_disabled=0,include_revoked=0,include_subkeys=1;
+int verbose=0,include_disabled=0,include_revoked=0,include_subkeys=0;
char *basekeyspacedn=NULL;
char host[80];
FILE *input=NULL,*output=NULL,*console=NULL;