diff options
| author | Werner Koch <[email protected]> | 2014-08-14 15:14:21 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-08-14 15:15:50 +0000 |
| commit | c4b60cdae8dbf68206fd105fd09adeb61a9dafe4 (patch) | |
| tree | e63d85f116ffdae27d76ff2bab4c32df9c323646 /sm/gpgsm.c | |
| parent | build: Yet another autogen.sh --find-version change. (diff) | |
| download | gnupg-c4b60cdae8dbf68206fd105fd09adeb61a9dafe4.tar.gz gnupg-c4b60cdae8dbf68206fd105fd09adeb61a9dafe4.zip | |
sm: Create homedir and lock empty keybox creation.
* sm/gpgsm.h (opt): Add field "no_homedir_creation".
* sm/gpgsm.c (main): Set it if --no-options is used.
* sm/keydb.c (try_make_homedir): New. Similar to the one from
g10/openfile.c.
(maybe_create_keybox): New. Similar to the one from g10/keydb.c.
(keydb_add_resource): Replace some code by maybe_create_keybox.
Diffstat (limited to 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index ded31986d..2faf203dd 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -969,7 +969,10 @@ main ( int argc, char **argv) default_config = 0; } else if (pargs.r_opt == oNoOptions) - default_config = 0; /* --no-options */ + { + default_config = 0; /* --no-options */ + opt.no_homedir_creation = 1; + } else if (pargs.r_opt == oHomedir) opt.homedir = pargs.r.ret_str; else if (pargs.r_opt == aCallProtectTool) @@ -1270,7 +1273,7 @@ main ( int argc, char **argv) goto next_pass; } break; - case oNoOptions: break; /* no-options */ + case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */ case oHomedir: opt.homedir = pargs.r.ret_str; break; case oAgentProgram: opt.agent_program = pargs.r.ret_str; break; |