← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnupg2/precise-proposed

« back to all changes in this revision

Viewing changes to agent/gpg-agent.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Urlichs
  • Date: 2005-04-07 10:13:19 UTC
  • Revision ID: james.westby@ubuntu.com-20050407101319-rgc8m274vudkrfb9
Tags: 1.9.15-6
http://bugs.debian.org/303492
http://bugs.debian.org/302692
* Move gpg-protect-tool to the gpgsm package.
  Closes: #303492.
  High urgency because this renders gpgsm unuseable for some people.
* gpg-agent: Override max-cache-ttl if a higher default is set.
  Closes: #302692.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/gpg-agent.c
388
388
    case oPinentryProgram: opt.pinentry_program = pargs->r.ret_str; break;
389
389
    case oScdaemonProgram: opt.scdaemon_program = pargs->r.ret_str; break;
390
390
 
391
 
    case oDefCacheTTL: opt.def_cache_ttl = pargs->r.ret_ulong; break;
 
391
        case oDefCacheTTL: opt.def_cache_ttl = pargs->r.ret_ulong;
 
392
                if (opt.max_cache_ttl < opt.def_cache_ttl)
 
393
                        opt.max_cache_ttl = opt.def_cache_ttl;
 
394
                break;
392
395
    case oMaxCacheTTL: opt.max_cache_ttl = pargs->r.ret_ulong; break;
393
396
      
394
397
    case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;