From 1cf63599feaf7f8aaf7a26de5e5ad11e6df73dea Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sun, 22 Nov 2009 19:09:24 +0000 Subject: [PATCH] revert previous commit --- servers/slapd/config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 66884926c0..7f91d5ec87 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -779,7 +779,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) rc = 1; goto done; - } else if ( (unsigned long)rc == ARG_BAD_CONF ) { + } else if ( rc == ARG_BAD_CONF ) { rc = 1; goto done; } @@ -1482,7 +1482,7 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 slap_verbmasks *aux = (slap_verbmasks *)tab->aux; for ( i = 0; !BER_BVISNULL( &aux[i].word ); i++ ) { - if ( (slap_mask_t)*iptr == aux[i].mask ) { + if ( *iptr == aux[i].mask ) { *ptr++ = ' '; ptr = lutil_strcopy( ptr, tab->key.bv_val ); ptr = lutil_strcopy( ptr, aux[i].word.bv_val ); @@ -1576,7 +1576,7 @@ slap_tls_get_config( LDAP *ld, int opt, char **val ) } ldap_pvt_tls_get_option( ld, opt, &ival ); for (i=0; !BER_BVISNULL(&keys[i].word); i++) { - if (keys[i].mask == (slap_mask_t)ival) { + if (keys[i].mask == ival) { *val = ch_strdup( keys[i].word.bv_val ); return 0; } -- 2.39.5