Fix compiler error and warnings.

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 6df509dfb21795b3da6697540cd39b5ff3698543..4d60f6ef08cefca0756225a16acc79f86cdbe93b 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1226,12 +1226,12 @@ config_generic(ConfigArgs *c) {
                        break;
 
                case CFG_LOGFILE: {
-                       if ( logfileName ) ch_free( logfileName );
-                       logfileName = c->value_string;
-                       FILE *logfile = fopen(logfileName, "w");
-                       if(logfile) lutil_debug_file(logfile);
-                       break;
-                       }
+                               FILE *logfile;
+                               if ( logfileName ) ch_free( logfileName );
+                               logfileName = c->value_string;
+                               logfile = fopen(logfileName, "w");
+                               if(logfile) lutil_debug_file(logfile);
+                       } break;
 
                case CFG_LASTMOD:
                        if(SLAP_NOLASTMODCMD(c->be)) {

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 23a5ee02d4a53514056a90189e30c1adc79e707f..08e336ef709de554c0329396fffd804518edc8b9 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1409,11 +1409,11 @@ typedef struct slap_bindconf {
 } slap_bindconf;
 
 struct slap_replica_info {
-       char *ri_uri;                           /* supersedes be_replica */
-       char *ri_host;                          /* points to host part of uri */
-       BerVarray ri_nsuffix;   /* array of suffixes this replica accepts */
+       const char *ri_uri;                     /* supersedes be_replica */
+       const char *ri_host;            /* points to host part of uri */
+       BerVarray ri_nsuffix;           /* array of suffixes this replica accepts */
        AttributeName *ri_attrs;        /* attrs to replicate, NULL=all */
-       int ri_exclude;                 /* 1 => exclude ri_attrs */
+       int ri_exclude;                         /* 1 => exclude ri_attrs */
        slap_bindconf ri_bindconf;      /* for back-config */
 };