diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/gpgv.c | 1 | ||||
| -rw-r--r-- | g10/keygen.c | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index fb274b337..c43067dfd 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -202,6 +202,7 @@ main( int argc, char **argv ) dotlock_disable (); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); additional_weak_digest("MD5"); + gnupg_initialize_compliance (GNUPG_MODULE_NAME_GPG); pargs.argc = &argc; pargs.argv = &argv; diff --git a/g10/keygen.c b/g10/keygen.c index 048a391c3..e959ee901 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3529,7 +3529,14 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname, if( s2 ) p = stpcpy(stpcpy(stpcpy(p," ("), s2 ),")"); if( s3 ) - p = stpcpy(stpcpy(stpcpy(p," <"), s3 ),">"); + { + /* If we have only the email part, do not add the space + * and the angle brackets. */ + if (*r->u.value) + p = stpcpy(stpcpy(stpcpy(p," <"), s3 ),">"); + else + p = stpcpy (p, s3); + } append_to_parameter (para, r); have_user_id=1; } |