fix ITS#3406 wrt/ dnattr; silence warning

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 23a5ee02d4a53514056a90189e30c1adc79e707f..7dc81b03f79ba78861e3aa7ad239cfc0ad21ddf6 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -319,7 +319,8 @@ extern int slap_inet4or6;
 
 typedef struct slap_oid_macro {
        struct berval som_oid;
-       char **som_names;
+       BerVarray som_names;
+       BerVarray som_subs;
        LDAP_SLIST_ENTRY(slap_oid_macro) som_next;
 } OidMacro;
 
@@ -1409,11 +1410,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 */
 };