[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys + The interna...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cdead43a8493
branches:  trunk
changeset: 749764:cdead43a8493
user:      agc <agc%NetBSD.org@localhost>
date:      Mon Dec 07 16:18:44 2009 +0000

description:
+ The internal variable "sshetcdir" has been renamed to "sshkeydir"

+ Take advantage of the new regular expression searching methods

diffstat:

 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 72d66053df54 -r cdead43a8493 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
--- a/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c       Mon Dec 07 16:17:57 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c       Mon Dec 07 16:18:44 2009 +0000
@@ -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) {