File openldap-strict-aliasing.dif of Package evolution-exchange-2.6

Overview Repositories Revisions Requests Users Attributes Meta

File openldap-strict-aliasing.dif of Package evolution-exchange-2.6

--- servers/slapd/entry.c	2004/04/30 12:16:04	1.1
+++ servers/slapd/entry.c	2004/04/30 12:23:34
@@ -36,9 +36,9 @@
 #include "slap.h"
 #include "ldif.h"
 
-static unsigned char	*ebuf;	/* buf returned by entry2str		 */
-static unsigned char	*ecur;	/* pointer to end of currently used ebuf */
-static int		emaxsize;/* max size of ebuf			 */
+static char	*ebuf;	/* buf returned by entry2str		 */
+static char	*ecur;	/* pointer to end of currently used ebuf */
+static int	emaxsize;/* max size of ebuf			 */
 
 /*
  * Empty root entry
--- libraries/libldap/cyrus.c	2004/04/30 12:57:08	1.1
+++ libraries/libldap/cyrus.c	2004/04/30 13:19:21
@@ -556,11 +556,20 @@
 	LDAP_SASL_INTERACT_PROC *interact,
 	void * defaults )
 {
-	char *data;
+        union data_u {
+            char* c;
+            void* v;
+        } data;
+
 	const char *mech = NULL;
 	const char *pmech = NULL;
 	int			saslrc, rc;
-	sasl_ssf_t		*ssf = NULL;
+
+        union ssf_u {
+            sasl_ssf_t *ssf;
+            void* v;
+        } ssf;
+	ssf.ssf = NULL;
 	sasl_conn_t	*ctx, *oldctx = NULL;
 	sasl_interact_t *prompts = NULL;
 	unsigned credlen;
@@ -792,27 +801,27 @@
 	}
 
 	if( flags != LDAP_SASL_QUIET ) {
-		saslrc = sasl_getprop( ctx, SASL_USERNAME, (SASL_CONST void **) &data );
-		if( saslrc == SASL_OK && data && *data ) {
-			fprintf( stderr, "SASL username: %s\n", data );
+		saslrc = sasl_getprop( ctx, SASL_USERNAME, (SASL_CONST void **) &data.v );
+		if( saslrc == SASL_OK && data.c && *data.c ) {
+			fprintf( stderr, "SASL username: %s\n", data.c );
 		}
 
 #if SASL_VERSION_MAJOR < 2
-		saslrc = sasl_getprop( ctx, SASL_REALM, (SASL_CONST void **) &data );
-		if( saslrc == SASL_OK && data && *data ) {
-			fprintf( stderr, "SASL realm: %s\n", data );
+		saslrc = sasl_getprop( ctx, SASL_REALM, (SASL_CONST void **) &data.v );
+		if( saslrc == SASL_OK && data.c && *data.c ) {
+			fprintf( stderr, "SASL realm: %s\n", data.c );
 		}
 #endif
 	}
 
-	saslrc = sasl_getprop( ctx, SASL_SSF, (SASL_CONST void **) &ssf );
+	saslrc = sasl_getprop( ctx, SASL_SSF, (SASL_CONST void **) &ssf.v );
 	if( saslrc == SASL_OK ) {
 		if( flags != LDAP_SASL_QUIET ) {
 			fprintf( stderr, "SASL SSF: %lu\n",
-				(unsigned long) *ssf );
+				(unsigned long) *ssf.ssf );
 		}
 
-		if( ssf && *ssf ) {
+		if( ssf.ssf && *ssf.ssf ) {
 			if( flags != LDAP_SASL_QUIET ) {
 				fprintf( stderr, "SASL installing layers\n" );
 			}
@@ -1017,7 +1026,11 @@
 
 		case LDAP_OPT_X_SASL_SSF: {
 			int sc;
-			sasl_ssf_t	*ssf;
+                        union ssf_u {
+                            sasl_ssf_t *ssf;
+                            void* v;
+                        } ssf;
+                        ssf.ssf = NULL;
 			sasl_conn_t *ctx;
 
 			if( ld->ld_defconn == NULL ) {
@@ -1031,13 +1044,13 @@
 			}
 
 			sc = sasl_getprop( ctx, SASL_SSF,
-				(SASL_CONST void **) &ssf );
+				(SASL_CONST void **) &ssf.v );
 
 			if ( sc != SASL_OK ) {
 				return -1;
 			}
 
-			*(ber_len_t *)arg = *ssf;
+			*(ber_len_t *)arg = *ssf.ssf;
 		} break;
 
 		case LDAP_OPT_X_SASL_SSF_EXTERNAL:
--- servers/slapd/acl.c	2004/08/03 08:46:44	1.1
+++ servers/slapd/acl.c	2004/08/03 09:38:41
@@ -1781,7 +1781,10 @@
 {
 	struct berval set = BER_BVNULL;
 	int rc = 0;
-	AciSetCookie cookie;
+	union set_cookie_u {
+		AciSetCookie asc;
+		SetCookie sc;
+	} cookie;
 	Operation op2 = *op;
 
 	op2.o_conn = NULL;
@@ -1828,9 +1831,9 @@
 	}
 
 	if (set.bv_val != NULL) {
-		cookie.op = &op2;
-		cookie.e = e;
-		rc = (slap_set_filter(aci_set_gather, (SetCookie *)&cookie, &set,
+		cookie.asc.op = &op2;
+		cookie.asc.e = e;
+		rc = (slap_set_filter(aci_set_gather, &cookie.sc, &set,
 			&op2.o_ndn, &e->e_nname, NULL) > 0);
 		sl_free(set.bv_val, op2.o_tmpmemctx);
 	}
--- servers/slapd/sl_malloc.c	2004/08/03 10:05:41	1.1
+++ servers/slapd/sl_malloc.c	2004/08/03 11:52:31
@@ -64,33 +64,37 @@
 	void *ctx
 )
 {
-	struct slab_heap *sh = NULL;
+	union slab_heap_u {
+		struct slab_heap *sh;
+		void *v;
+	} sh;
+	sh.sh=NULL;
 	int pad = 2*sizeof(int)-1;
 
 #ifdef NO_THREADS
 	sh = slheap;
 #else
-	ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
+	ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, &sh.v, NULL );
 #endif
 
 	/* round up to doubleword boundary */
 	size += pad;
 	size &= ~pad;
 
-	if (!sh) {
-		sh = ch_malloc( sizeof(struct slab_heap) );
-		sh->h_base = ch_malloc( size );
+	if (!sh.sh) {
+		sh.sh = ch_malloc( sizeof(struct slab_heap) );
+		sh.sh->h_base = ch_malloc( size );
 #ifdef NO_THREADS
 		slheap = sh;
 #else
-		ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, (void *)sh, sl_mem_destroy );
+		ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, sh.v, sl_mem_destroy );
 #endif
-	} else if ( size > (char *) sh->h_end - (char *) sh->h_base ) {
-		sh->h_base = ch_realloc( sh->h_base, size );
+	} else if ( size > (char *) sh.sh->h_end - (char *) sh.sh->h_base ) {
+		sh.sh->h_base = ch_realloc( sh.sh->h_base, size );
 	}
-	sh->h_last = sh->h_base;
-	sh->h_end = (char *) sh->h_base + size;
-	return sh;
+	sh.sh->h_last = sh.sh->h_base;
+	sh.sh->h_end = (char *) sh.sh->h_base + size;
+	return sh.sh;
 }
 
 void
@@ -225,19 +229,23 @@
 void *
 sl_context( void *ptr )
 {
-	struct slab_heap *sh = NULL;
+	union slab_heap_u {
+		struct slab_heap *sh;
+		void *v;
+	} sh;
 	void *ctx;
+	sh.sh = NULL;
 
 #ifdef NO_THREADS
 	sh = slheap;
 #else
 	ctx = ldap_pvt_thread_pool_context();
 
-	ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
+	ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, &sh.v, NULL );
 #endif
 
-	if ( sh && ptr >= sh->h_base && ptr <= sh->h_end ) {
-		return sh;
+	if ( sh.sh && ptr >= sh.sh->h_base && ptr <= sh.sh->h_end ) {
+		return sh.sh;
 	}
 	return NULL;
 }

Places

File openldap-strict-aliasing.dif of Package evolution-exchange-2.6

Places