Changeset 164352e for conf.c

Timestamp:

2011-12-24T18:02:39Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34ded90

Parents:

e306fbf (diff), 96f954d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -67 +67 @@
         conf->ft_listen = NULL;
         conf->protocols = NULL;
+        conf->cafile = NULL;
         proxytype = 0;
         
@@ -177 +178 @@
                 fprintf( stderr, "Warning: Unable to read configuration file `%s'.\n", global.conf_file );
         
+        if( conf->cafile && access( conf->cafile, R_OK ) != 0 )
+        {
+                /* Let's treat this as a serious problem so people won't think
+                   they're secure when in fact they're not. */
+                fprintf( stderr, "Error: Could not read CA file %s: %s\n", conf->cafile, strerror( errno ) );
+                return NULL;
+        }
+        
         return conf;
 }
@@ -340 +349 @@
                                 conf->protocols = g_strsplit_set( ini->value, " \t,;", -1 );
                         }
+                        else if( g_strcasecmp( ini->key, "cafile" ) == 0 )
+                        {
+                                g_free( conf->cafile );
+                                conf->cafile = g_strdup( ini->value );
+                        }
                         else
                         {