Commit 40027148 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

added aditional check for the directory specified with SSL_DIR, and fall back... 

added aditional check for the directory specified with SSL_DIR, and fall back to hardcoded directory if not a valid directory.
parent 61ea058d

lib/nss.c

+14 −7
Original line number Diff line number Diff line
@@ -964,14 +964,21 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex) 
  /* FIXME. NSS doesn't support multiple databases open at the same time. */

  PR_Lock(nss_initlock);

  if(!initialized) {

    struct_stat st;



    certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */

    /* First we check if $SSL_DIR points to a valid dir */

    certDir = getenv("SSL_DIR");

    if(certDir) {

      if((stat(certDir, &st) != 0) ||

              (!S_ISDIR(st.st_mode))) {

        certDir = NULL;

      }

    }



    /* Now we check if the default location is a valid dir */

    if(!certDir) {

      struct_stat st;



      if(stat(SSL_DIR, &st) == 0)

        if(S_ISDIR(st.st_mode)) {

      if((stat(SSL_DIR, &st) == 0) &&

              (S_ISDIR(st.st_mode))) {

        certDir = (char *)SSL_DIR;

      }

    }