← Back to branch summary

~ubuntu-branches/ubuntu/feisty/gnupg2/feisty

« back to all changes in this revision

Viewing changes to sm/gpgsm.c

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2006-07-11 11:38:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060711113813-zaw7unlbuh7gyxtl
Tags: 1.9.21-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
sm/gpgsm.c
1
1
/* gpgsm.c - GnuPG for S/MIME 
2
 
 * Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
2
 * Copyright (C) 2001, 2002, 2003, 2004, 2005,
 
3
 *               2006  Free Software Foundation, Inc.
3
4
 *
4
5
 * This file is part of GnuPG.
5
6
 *
15
16
 *
16
17
 * You should have received a copy of the GNU General Public License
17
18
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 
20
 * USA.
19
21
 */
20
22
 
21
23
#include <config.h>
461
463
/* Option --enable-special-filenames */
462
464
static int allow_special_filenames;
463
465
 
 
466
/* Default value for include-certs. */
 
467
static int default_include_certs = 1; /* Only include the signer's cert. */
 
468
 
 
469
 
464
470
 
465
471
static char *build_list (const char *text,
466
472
                         const char *(*mapf)(int), int (*chkf)(int));
998
1004
          ctrl.use_ocsp = opt.enable_ocsp = 1;
999
1005
          break;
1000
1006
 
1001
 
        case oIncludeCerts: ctrl.include_certs = pargs.r.ret_int; break;
 
1007
        case oIncludeCerts: 
 
1008
          ctrl.include_certs = default_include_certs = pargs.r.ret_int; 
 
1009
          break;
1002
1010
 
1003
1011
        case oPolicyFile:
1004
1012
          xfree (opt.policy_file);
1657
1665
void
1658
1666
gpgsm_init_default_ctrl (struct server_control_s *ctrl)
1659
1667
{
1660
 
  ctrl->include_certs = 1;  /* only include the signer's cert */
 
1668
  ctrl->include_certs = default_include_certs;
1661
1669
  ctrl->use_ocsp = opt.enable_ocsp;
1662
1670
}
1663
1671