diff options
author | Werner Koch <wk@gnupg.org> | 2006-04-28 16:31:29 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2006-04-28 16:31:29 +0200 |
commit | 00ffc478de4940b9fbbb9f488f545a65ca7d1278 (patch) | |
tree | 9ec271f1c03397acbd3c6274931ca7a927ae907f /g10/options.h | |
parent | Still merging 1.4.3 code back (diff) | |
download | gnupg2-00ffc478de4940b9fbbb9f488f545a65ca7d1278.tar.xz gnupg2-00ffc478de4940b9fbbb9f488f545a65ca7d1278.zip |
Merged recent changes from 1.4
Diffstat (limited to 'g10/options.h')
-rw-r--r-- | g10/options.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/g10/options.h b/g10/options.h index f61cd4c9e..de5fa7920 100644 --- a/g10/options.h +++ b/g10/options.h @@ -170,7 +170,6 @@ struct STRLIST sig_keyserver_url; STRLIST cert_subpackets; STRLIST sig_subpackets; - int use_embedded_filename; int allow_non_selfsigned_uid; int allow_freeform_uid; int no_literal; @@ -222,6 +221,10 @@ struct made by signing subkeys. If not set, a missing backsig is not an error (but an invalid backsig still is). */ unsigned int require_cross_cert:1; + + unsigned int use_embedded_filename:1; + unsigned int utf8_filename:1; + unsigned int dsa2:1; } flags; /* Linked list of ways to find a key if the key isn't on the local |