Module Name: src
Committed By: agc
Date: Mon Dec 7 16:18:44 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c
Log Message:
+ The internal variable "sshetcdir" has been renamed to "sshkeydir"
+ Take advantage of the new regular expression searching methods
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.4 Sat Dec 5 07:08:19 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Mon Dec 7 16:18:44 2009
@@ -146,7 +146,7 @@
switch (p->cmd) {
case LIST_KEYS:
- return netpgp_list_keys(netpgp);
+ return (f == NULL) ? netpgp_list_keys(netpgp) : netpgp_match_list_keys(netpgp, f);
case FIND_KEY:
return netpgp_find_key(netpgp, netpgp_getvar(netpgp, "userid"));
case EXPORT_KEY:
@@ -235,7 +235,7 @@
}
/* set some defaults */
set_homedir(&netpgp, getenv("HOME"), "/.gnupg", *argv);
- netpgp_setvar(&netpgp, "sshetcdir", "/etc/ssh");
+ netpgp_setvar(&netpgp, "sshkeydir", "/etc/ssh");
optindex = 0;
while ((ch = getopt_long(argc, argv, "", options, &optindex)) != -1) {
switch (options[optindex].val) {
