diff options
| author | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
| commit | 0868997e186cd847663668f9d7a29806a12da2d2 (patch) | |
| tree | 73645f778a2d16213723121a76d2b38ca90edfcc /scd/scdaemon.c | |
| parent | Add lost ChangeLog entry. (diff) | |
| parent | Silence gcc warning. (diff) | |
| download | gnupg-npth.tar.gz gnupg-npth.zip | |
Merge branch 'master' into npthnpth
Conflicts:
ChangeLog-2011
Makefile.am
agent/ChangeLog-2011
agent/gpg-agent.c
dirmngr/ChangeLog-2011
dirmngr/dirmngr.c
doc/HACKING
g13/g13.c
po/de.po
scd/ChangeLog-2011
scd/apdu.c
scd/command.c
scd/scdaemon.c
scripts/gitlog-to-changelog
tools/ChangeLog-2011
Diffstat (limited to 'scd/scdaemon.c')
| -rw-r--r-- | scd/scdaemon.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 5b24a09f8..f674cfc76 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -74,6 +74,7 @@ enum cmd_and_opt_values oDebugAllowCoreDump, oDebugCCIDDriver, oDebugLogTid, + oDebugAssuanLogCats, oNoGreeting, oNoOptions, oHomedir, @@ -123,6 +124,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oDebugCCIDDriver, "debug-ccid-driver", "@"), ARGPARSE_s_n (oDebugDisableTicker, "debug-disable-ticker", "@"), ARGPARSE_s_n (oDebugLogTid, "debug-log-tid", "@"), + ARGPARSE_p_u (oDebugAssuanLogCats, "debug-assuan-log-cats", "@"), ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")), ARGPARSE_s_s (oLogFile, "log-file", N_("|FILE|write a log to FILE")), ARGPARSE_s_s (oReaderPort, "reader-port", @@ -542,6 +544,9 @@ main (int argc, char **argv ) case oDebugLogTid: log_set_pid_suffix_cb (tid_log_callback); break; + case oDebugAssuanLogCats: + set_libassuan_log_cats (pargs.r.ret_ulong); + break; case oOptions: /* config files may not be nested (silently ignore them) */ @@ -826,7 +831,7 @@ main (int argc, char **argv ) if (csh_style) { *strchr (infostr, '=') = ' '; - es_printf ( "setenv %s\n", infostr); + es_printf ( "setenv %s;\n", infostr); } else { @@ -909,7 +914,7 @@ scd_exit (int rc) static void scd_init_default_ctrl (ctrl_t ctrl) { - ctrl->reader_slot = -1; + (void)ctrl; } static void |