]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
ITS#10171 - Explicitly cast private values
authorStephen Gallagher <sgallagh@redhat.com>
Wed, 7 Feb 2024 02:38:24 +0000 (21:38 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Thu, 15 Feb 2024 18:07:05 +0000 (18:07 +0000)
Fixes issues with -Werror=incompatible-pointer-types

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
servers/slapd/config.c
servers/slapd/overlays/constraint.c
servers/slapd/overlays/dyngroup.c
servers/slapd/overlays/valsort.c

index 8823c742c78e94a22255e45d133e2d2456f8d65b..a6cbadd5a115d291982ea42710caac0ec5c16abb 100644 (file)
@@ -150,7 +150,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) {
index c691f0b8075292fedc825054d073308eee92e4ef..44d95d51d0970a1eadfc3d90fb6a42799ea1a1b1 100644 (file)
@@ -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;
index 5d890d66503287c683c548f5afd23f9173faab5a..e0e70af2d91e8ad1d98c10f7888427e9bc0f39cd 100644 (file)
@@ -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;
index 3d998e2fcb6cb7cc5d1e1dbbdeef20c949ff5350..e251500d0b89b49009200e482ca822d6a3d68281 100644 (file)
@@ -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) );