aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-07-01 13:40:56 +0000
committerWerner Koch <[email protected]>2016-07-01 14:27:43 +0000
commitf015552374d69e28292a12f2b91ab34d65c9b457 (patch)
tree979adb3705d08686360edb56b3c198f4e620a832
parentgpg: Make sure a user ID packet has always a terminating Nul in memory. (diff)
downloadgnupg-f015552374d69e28292a12f2b91ab34d65c9b457.tar.gz
gnupg-f015552374d69e28292a12f2b91ab34d65c9b457.zip
gpg: Allow to cache the mbox in a user id struct.
* g10/packet.h (PKT_user_id): Add field 'mbox'. * g10/free-packet.c (free_user_id): Free that. -- This will be required by the coming import filter. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--g10/free-packet.c1
-rw-r--r--g10/packet.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 3883f877a..516e9a145 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -311,6 +311,7 @@ free_user_id (PKT_user_id *uid)
free_attributes(uid);
xfree (uid->prefs);
xfree (uid->namehash);
+ xfree (uid->mbox);
xfree (uid);
}
diff --git a/g10/packet.h b/g10/packet.h
index a496c4b21..08e2cb7f6 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -291,6 +291,7 @@ typedef struct
unsigned int ks_modify:1;
unsigned int compacted:1;
} flags;
+ char *mbox; /* NULL or the result of mailbox_from_userid. */
/* The text contained in the user id packet, which is normally the
name and email address of the key holder (See RFC 4880 5.11).
(Serialized.). For convenience an extra Nul is always appended. */