From: Howard Chu <hyc@openldap.org>
Date: Fri, 6 Jun 2003 20:19:30 +0000 (+0000)
Subject: Fix berval len assignments
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~923
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=07287da277e1e2995d47341d5591576d3dc0c5f9;p=openldap

Fix berval len assignments
---

diff --git a/contrib/ldapsasl/ldapdb.c b/contrib/ldapsasl/ldapdb.c
index a373127b07..45a08ac426 100644
--- a/contrib/ldapsasl/ldapdb.c
+++ b/contrib/ldapsasl/ldapdb.c
@@ -204,6 +204,7 @@ static int ldapdb_auxprop_plug_init(const sasl_utils_t *utils,
 {
     ldapctx tmp, *p;
     const char *s;
+    unsigned len;
 
     if(!out_version || !plug) return SASL_BADPARAM;
 
@@ -213,11 +214,14 @@ static int ldapdb_auxprop_plug_init(const sasl_utils_t *utils,
     if(!tmp.uri) return SASL_BADPARAM;
 
     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_id",
-    	(const char **)&tmp.id.bv_val, (unsigned *)&tmp.id.bv_len);
+    	(const char **)&tmp.id.bv_val, &len);
+    tmp.id.bv_len = len;
     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_pw",
-    	(const char **)&tmp.pw.bv_val, (unsigned *)&tmp.pw.bv_len);
+    	(const char **)&tmp.pw.bv_val, &len);
+    tmp.pw.bv_len = len;
     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_mech",
-    	(const char **)&tmp.mech.bv_val, (unsigned *)&tmp.mech.bv_len);
+    	(const char **)&tmp.mech.bv_val, &len);
+    tmp.mech.bv_len = len;
     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_rc", &s, NULL);
     if(s && setenv("LDAPRC", s, 1)) return SASL_BADPARAM;