From 2ecb28c51b8da6717132095c2fd0112d12f236e6 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sun, 15 Feb 2004 15:54:02 +0000 Subject: * build-packet.c (do_user_id): Do not force a header for attribute packets as they require a new CTB, and we don't support forced headers for new CTBs yet. --- g10/ChangeLog | 6 ++++++ g10/build-packet.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 7a1a8b871..fe7145fb4 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2004-02-15 David Shaw + + * build-packet.c (do_user_id): Do not force a header for attribute + packets as they require a new CTB, and we don't support forced + headers for new CTBs yet. + 2004-02-14 David Shaw * build-packet.c (write_header2): If a suggested header length is diff --git a/g10/build-packet.c b/g10/build-packet.c index fd61e4ad5..5ae2869bb 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -208,9 +208,7 @@ do_user_id( IOBUF out, int ctb, PKT_user_id *uid ) { if( uid->attrib_data ) { - /* Shouldn't be necessary to force a header here since attribs - can't be of zero length, but it doesn't hurt either. */ - write_header2(out, ctb, uid->attrib_len, 1, 1); + write_header(out, ctb, uid->attrib_len); if( iobuf_write( out, uid->attrib_data, uid->attrib_len ) ) return G10ERR_WRITE_FILE; } -- cgit v1.2.3