~ubuntu-branches/ubuntu/karmic/openssl/karmic-proposed

« back to all changes in this revision

Viewing changes to crypto/conf/conf_sap.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-12-05 00:13:39 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071205001339-tazlol313zs8u6ec
Tags: 0.9.8g-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure: Add support for lpia.
  - Replace duplicate files in the doc directory with symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
88
88
 
89
89
 
90
90
        ERR_clear_error();
91
 
        if (CONF_modules_load_file(NULL, NULL,
92
 
                                        CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0)
 
91
        if (CONF_modules_load_file(NULL, config_name,
 
92
        CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0)
93
93
                {
94
94
                BIO *bio_err;
95
95
                ERR_load_crypto_strings();