[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib avoid nameclash - ca...

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

details:   https://anonhg.NetBSD.org/src/rev/a7df1be3fa13
branches:  trunk
changeset: 759209:a7df1be3fa13
user:      agc <agc%NetBSD.org@localhost>
date:      Wed Dec 01 22:14:52 2010 +0000

description:
avoid nameclash - call the generated user id variable "generated userid"

also keep the time of structure initialisation as an internal variable.

diffstat:

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

diffs (38 lines):

diff -r 3249e30e15ea -r a7df1be3fa13 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Wed Dec 01 22:06:19 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Wed Dec 01 22:14:52 2010 +0000
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.86 2010/12/01 22:01:41 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.87 2010/12/01 22:14:52 agc Exp $");
 #endif
 
 #include <sys/types.h>
@@ -755,6 +755,7 @@
 netpgp_init(netpgp_t *netpgp)
 {
        pgp_io_t        *io;
+       time_t           t;
        char             id[MAX_ID_LENGTH];
        char            *homedir;
        char            *userid;
@@ -870,6 +871,8 @@
                        (void) netpgp_setvar(netpgp, "userid", userid);
                }
        }
+       t = time(NULL);
+       netpgp_setvar(netpgp, "initialised", ctime(&t));
        return 1;
 }
 
@@ -1180,7 +1183,7 @@
        (void) fprintf(stdout, "%s", cp);
        /* write public key */
        cc = snprintf(dir, sizeof(dir), "%s/%.16s", netpgp_getvar(netpgp, "homedir"), &cp[ID_OFFSET]);
-       netpgp_setvar(netpgp, "userid", &dir[cc - 16]);
+       netpgp_setvar(netpgp, "generated userid", &dir[cc - 16]);
        if (mkdir(dir, 0700) < 0) {
                (void) fprintf(io->errs, "can't mkdir '%s'\n", dir);
                return 0;