ITS#10171 - Explicitly cast private values

Fixes issues with -Werror=incompatible-pointer-types

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 80333f359c6f3e2fc74ee643e8eda6647de46e54..987c862d917d6746edf285d26e657c3c204136dc 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
        int rc, arg_user, arg_type, arg_syn, iarg;
        unsigned uiarg;
        long larg;
-       size_t ularg;
+       unsigned long ularg;
        ber_len_t barg;
        
        if(Conf->arg_type == ARG_IGNORED) {

diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
index f939b37762b947d82b917c0bde7af0c1afba1e42..0d6156af4d8ff63fd04f1a03c610c48556b36b92 100644 (file)
--- a/servers/slapd/overlays/constraint.c
+++ b/servers/slapd/overlays/constraint.c
@@ -557,7 +557,7 @@ done:;
                                a2->restrict_filter = ap.restrict_filter;
                                a2->restrict_val = ap.restrict_val;
 
-                               for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+                               for ( app = (constraint **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
                                        /* Get to the end */ ;
 
                                a2->ap_next = *app;

diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
index 5d890d66503287c683c548f5afd23f9173faab5a..e0e70af2d91e8ad1d98c10f7888427e9bc0f39cd 100644 (file)
--- a/servers/slapd/overlays/dyngroup.c
+++ b/servers/slapd/overlays/dyngroup.c
@@ -111,7 +111,7 @@ static int dgroup_cf( ConfigArgs *c )
                 */
                a2 = ch_malloc( sizeof(adpair) );
 
-               for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+               for ( app = (adpair **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
                        /* Get to the end */ ;
 
                a2->ap_mem = ap.ap_mem;

diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
index 3d998e2fcb6cb7cc5d1e1dbbdeef20c949ff5350..e251500d0b89b49009200e482ca822d6a3d68281 100644 (file)
--- a/servers/slapd/overlays/valsort.c
+++ b/servers/slapd/overlays/valsort.c
@@ -201,7 +201,7 @@ valsort_cf_func(ConfigArgs *c) {
                return(1);
        }
 
-       for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
+       for ( vip = (valsort_info **)&on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
                /* Get to the end */ ;
 
        vi = ch_malloc( sizeof(valsort_info) );