Pass CFLAG to dependency makers, so non-standard system include paths are

[openssl.git] / crypto / conf / conf_def.c

diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 87335a9daa1a34e860f5426184d7d8e709718dfd..31f2766246a19f33a7539c69e95d2ae1a932a55f 100644 (file)
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -83,9 +83,9 @@ static int def_destroy(CONF *conf);
 static int def_destroy_data(CONF *conf);
 static int def_load(CONF *conf, const char *name, long *eline);
 static int def_load_bio(CONF *conf, BIO *bp, long *eline);
-static int def_dump(CONF *conf, BIO *bp);
-static int def_is_number(CONF *conf, char c);
-static int def_to_int(CONF *conf, char c);
+static int def_dump(const CONF *conf, BIO *bp);
+static int def_is_number(const CONF *conf, char c);
+static int def_to_int(const CONF *conf, char c);
 
 const char *CONF_def_version="CONF_def" OPENSSL_VERSION_PTEXT;
 
@@ -192,7 +192,10 @@ static int def_load(CONF *conf, const char *name, long *line)
 #endif
        if (in == NULL)
                {
-               CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);
+               if (ERR_GET_REASON(ERR_peek_last_error()) == BIO_R_NO_SUCH_FILE)
+                       CONFerr(CONF_F_CONF_LOAD,CONF_R_NO_SUCH_FILE);
+               else
+                       CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);
                return 0;
                }
 
@@ -443,7 +446,11 @@ err:
        if (line != NULL) *line=eline;
        sprintf(btmp,"%ld",eline);
        ERR_add_error_data(2,"line ",btmp);
-       if ((h != conf->data) && (conf->data != NULL)) CONF_free(conf->data);
+       if ((h != conf->data) && (conf->data != NULL))
+               {
+               CONF_free(conf->data);
+               conf->data=NULL;
+               }
        if (v != NULL)
                {
                if (v->name != NULL) OPENSSL_free(v->name);
@@ -712,18 +719,18 @@ static void dump_value(CONF_VALUE *a, BIO *out)
 
 static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE *, BIO *)
 
-static int def_dump(CONF *conf, BIO *out)
+static int def_dump(const CONF *conf, BIO *out)
        {
        lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_value), out);
        return 1;
        }
 
-static int def_is_number(CONF *conf, char c)
+static int def_is_number(const CONF *conf, char c)
        {
        return IS_NUMBER(conf,c);
        }
 
-static int def_to_int(CONF *conf, char c)
+static int def_to_int(const CONF *conf, char c)
        {
        return c - '0';
        }