X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Foptions.c;h=d2371567e706a781d6b6ecc4c063bb26967e2c18;hb=afa2cd1893875266c58677cc640514c1d9eef41f;hp=8294a6f284a42d222671d6ac1755e33091e48aa3;hpb=ca12bb75c70bc403d642e5d18e0be54f2364a354;p=openldap

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 8294a6f284..d2371567e7 100644
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -10,8 +10,10 @@
 #include <ac/stdarg.h>
 #include "lber-int.h"
 
+char ber_pvt_opt_on;	/* used to get a non-NULL address for *_OPT_ON */
+
 struct lber_options ber_int_options = {
-	LBER_UNINITIALIZED, 0, 0 };
+	LBER_UNINITIALIZED, 0, 0, 0 };
 
 int
 ber_get_option(
@@ -211,7 +213,7 @@ ber_set_option(
 
 	case LBER_OPT_BER_MEMCTX:
 		assert( LBER_VALID( ber ) );
-		ber->ber_memctx = (void *)invalue;
+		ber->ber_memctx = *(void **)invalue;
 		return LBER_OPT_SUCCESS;
 
 	default: