|
 |
1b64b7d |
diff -up freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c.ldap freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c
|
|
|
1b64b7d |
--- freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c.ldap 2007-06-18 11:00:27.000000000 +0200
|
|
|
1b64b7d |
+++ freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c 2007-08-06 14:40:31.000000000 +0200
|
|
|
1b64b7d |
@@ -1041,7 +1041,7 @@ static int ldap_groupcmp(void *instance,
|
|
|
c7ab4f8 |
radlog(L_ERR, "rlm_ldap: Add ldap connections are in use");
|
|
|
c7ab4f8 |
return 1;
|
|
|
c7ab4f8 |
}
|
|
|
c7ab4f8 |
- if ((res = perform_search(inst, conn, vp_user_dn->strvalue, LDAP_SCOPE_BASE,
|
|
|
c7ab4f8 |
+ if ((res = perform_search(inst, conn, (char *)vp_user_dn->strvalue, LDAP_SCOPE_BASE,
|
|
|
c7ab4f8 |
filter, group_attrs,&result)) != RLM_MODULE_OK){
|
|
|
c7ab4f8 |
DEBUG("rlm_ldap::ldap_groupcmp: Search returned error");
|
|
|
c7ab4f8 |
ldap_release_conn(conn_id, inst->conns);
|
|
|
1b64b7d |
@@ -1356,7 +1356,7 @@ ldap_authorize(void *instance, REQUEST *
|
|
|
c7ab4f8 |
|
|
|
c7ab4f8 |
strNcpy(filter,inst->base_filter,sizeof(filter));
|
|
|
c7ab4f8 |
if (user_profile)
|
|
|
c7ab4f8 |
- profile = user_profile->strvalue;
|
|
|
c7ab4f8 |
+ profile = (char *)user_profile->strvalue;
|
|
|
c7ab4f8 |
if (profile && strlen(profile)){
|
|
|
c7ab4f8 |
if ((res = perform_search(instance, conn,
|
|
|
c7ab4f8 |
profile, LDAP_SCOPE_BASE,
|
|
|
1b64b7d |
@@ -1460,7 +1460,7 @@ ldap_authorize(void *instance, REQUEST *
|
|
|
c7ab4f8 |
}
|
|
|
1b64b7d |
added_known_password = 1;
|
|
|
c7ab4f8 |
passwd_len = strlen(passwd_val);
|
|
|
c7ab4f8 |
- strncpy(passwd_item->strvalue,passwd_val,MAX_STRING_LEN - 1);
|
|
|
c7ab4f8 |
+ strncpy((char *)passwd_item->strvalue,passwd_val,MAX_STRING_LEN - 1);
|
|
|
c7ab4f8 |
passwd_item->length = (passwd_len > (MAX_STRING_LEN - 1)) ? (MAX_STRING_LEN - 1) : passwd_len;
|
|
|
c7ab4f8 |
pairadd(&request->config_items,passwd_item);
|
|
|
c7ab4f8 |
DEBUG("rlm_ldap: Added password %s in check items",passwd_item->strvalue);
|
|
|
1b64b7d |
@@ -1804,12 +1804,12 @@ ldap_authenticate(void *instance, REQUES
|
|
|
c7ab4f8 |
ldap_msgfree(result);
|
|
|
c7ab4f8 |
}
|
|
|
c7ab4f8 |
|
|
|
c7ab4f8 |
- user_dn = vp_user_dn->strvalue;
|
|
|
c7ab4f8 |
+ user_dn = (char *)vp_user_dn->strvalue;
|
|
|
c7ab4f8 |
|
|
|
c7ab4f8 |
DEBUG("rlm_ldap: user DN: %s", user_dn);
|
|
|
c7ab4f8 |
|
|
|
c7ab4f8 |
#ifndef NOVELL
|
|
|
c7ab4f8 |
- ld_user = ldap_connect(instance, user_dn, request->password->strvalue,
|
|
|
c7ab4f8 |
+ ld_user = ldap_connect(instance, user_dn, (char *)request->password->strvalue,
|
|
|
c7ab4f8 |
1, &res, NULL);
|
|
|
c7ab4f8 |
#else
|
|
|
c7ab4f8 |
|
|
|
1b64b7d |
@@ -1954,7 +1954,7 @@ retry:
|
|
|
1b64b7d |
}
|
|
|
1b64b7d |
}
|
|
|
1b64b7d |
|
|
|
c7ab4f8 |
- ld_user = ldap_connect(instance, user_dn, request->password->strvalue,
|
|
|
c7ab4f8 |
+ ld_user = ldap_connect(instance, user_dn, (char *)request->password->strvalue,
|
|
|
c7ab4f8 |
1, &res, &err;;
|
|
|
c7ab4f8 |
|
|
|
c7ab4f8 |
if(err != NULL){
|
|
|
1b64b7d |
@@ -2208,7 +2208,7 @@ ldap_connect(void *instance, const char
|
|
|
c7ab4f8 |
|
|
|
c7ab4f8 |
#ifdef HAVE_LDAP_INT_TLS_CONFIG
|
|
|
c7ab4f8 |
|
|
|
c7ab4f8 |
- if ( ldap_int_tls_config( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT,
|
|
|
c7ab4f8 |
+ if ( ldap_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT,
|
|
|
c7ab4f8 |
(inst->tls_require_cert) )
|
|
|
c7ab4f8 |
!= LDAP_OPT_SUCCESS) {
|
|
|
c7ab4f8 |
radlog(L_ERR, "rlm_ldap: could not set "
|
|
|
1b64b7d |
@@ -2622,7 +2622,7 @@ ldap_pairget(LDAP * ld, LDAPMessage * en
|
|
|
1b64b7d |
|
|
|
c7ab4f8 |
if (do_xlat) {
|
|
|
c7ab4f8 |
newpair->flags.do_xlat = 1;
|
|
|
c7ab4f8 |
- strNcpy(newpair->strvalue, buf,
|
|
|
c7ab4f8 |
+ strNcpy((char *)newpair->strvalue, buf,
|
|
|
c7ab4f8 |
sizeof(newpair->strvalue));
|
|
|
c7ab4f8 |
newpair->length = 0;
|
|
|
c7ab4f8 |
}
|