rpms/freeradius/devel freeradius-1.1.3-ldap.patch, NONE, 1.1 freeradius.spec, 1.35, 1.36

[fedora-cvs-commits at redhat.com]

Author: twoerner

Update of /cvs/dist/rpms/freeradius/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29378

Modified Files:
	freeradius.spec 
Added Files:
	freeradius-1.1.3-ldap.patch 
Log Message:
[tw]
- fixed ldap code to not use internals, added LDAP_DEPRECATED compile time flag
  (#210912)



freeradius-1.1.3-ldap.patch:
 rlm_ldap.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE freeradius-1.1.3-ldap.patch ---
--- freeradius-1.1.3/src/modules/rlm_ldap/rlm_ldap.c.ldap	2006-05-09 01:45:02.000000000 +0200
+++ freeradius-1.1.3/src/modules/rlm_ldap/rlm_ldap.c	2006-11-13 15:51:48.000000000 +0100
@@ -1013,7 +1013,7 @@
 		radlog(L_ERR, "rlm_ldap: Add ldap connections are in use");
 		return 1;
 	}
-	if ((res = perform_search(inst, conn, vp_user_dn->strvalue, LDAP_SCOPE_BASE,
+	if ((res = perform_search(inst, conn, (char *)vp_user_dn->strvalue, LDAP_SCOPE_BASE,
 					filter, group_attrs,&result)) != RLM_MODULE_OK){
 		DEBUG("rlm_ldap::ldap_groupcmp: Search returned error");
 		ldap_release_conn(conn_id, inst->conns);
@@ -1327,7 +1327,7 @@
 
 		strNcpy(filter,inst->base_filter,sizeof(filter));
 		if (user_profile)
-			profile = user_profile->strvalue;
+			profile = (char *)user_profile->strvalue;
 		if (profile && strlen(profile)){
 			if ((res = perform_search(instance, conn,
 				profile, LDAP_SCOPE_BASE,
@@ -1430,7 +1430,7 @@
 								return RLM_MODULE_FAIL;
 							}
 							passwd_len = strlen(passwd_val);
-							strncpy(passwd_item->strvalue,passwd_val,MAX_STRING_LEN - 1);
+							strncpy((char *)passwd_item->strvalue,passwd_val,MAX_STRING_LEN - 1);
 							passwd_item->length = (passwd_len > (MAX_STRING_LEN - 1)) ? (MAX_STRING_LEN - 1) : passwd_len;
 							pairadd(&request->config_items,passwd_item);
 							DEBUG("rlm_ldap: Added password %s in check items",passwd_item->strvalue);
@@ -1748,16 +1748,16 @@
 		ldap_msgfree(result);
 	}
 
-	user_dn = vp_user_dn->strvalue;
+	user_dn = (char *)vp_user_dn->strvalue;
 
 	DEBUG("rlm_ldap: user DN: %s", user_dn);
 
 #ifndef NOVELL
-	ld_user = ldap_connect(instance, user_dn, request->password->strvalue,
+	ld_user = ldap_connect(instance, user_dn, (char *)request->password->strvalue,
 			       1, &res, NULL);
 #else
 
-	ld_user = ldap_connect(instance, user_dn, request->password->strvalue,
+	ld_user = ldap_connect(instance, user_dn, (char *)request->password->strvalue,
 			1, &res, &err);
 
 	if(err != NULL){
@@ -2023,7 +2023,7 @@
 
 #ifdef HAVE_LDAP_INT_TLS_CONFIG
 
-	if ( ldap_int_tls_config( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT,
+	if ( ldap_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT,
 							  (inst->tls_require_cert) )
 		 != LDAP_OPT_SUCCESS) {
 		radlog(L_ERR, "rlm_ldap: could not set "
@@ -2430,7 +2430,7 @@
 				}
 				if (do_xlat) {
 					newpair->flags.do_xlat = 1;
-					strNcpy(newpair->strvalue, buf,
+					strNcpy((char *)newpair->strvalue, buf,
 						sizeof(newpair->strvalue));
 					newpair->length = 0;
 				}


Index: freeradius.spec
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- freeradius.spec	8 Sep 2006 12:36:59 -0000	1.35
+++ freeradius.spec	30 Nov 2006 14:28:18 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
 Version: 1.1.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -21,6 +21,7 @@
 Patch8: freeradius-1.0.0-samba3.patch
 Patch10: freeradius-1.1.3-build.patch
 Patch11: freeradius-1.1.2-no_sql_inc.patch
+Patch12: freeradius-1.1.3-ldap.patch
 
 %description
 The FreeRADIUS Server Project is a high performance and highly configurable 
@@ -77,6 +78,7 @@
 %patch8 -p1 -b .samba3
 %patch10 -p1 -b .build
 %patch11 -p1 -b .no_sql_inc
+%patch12 -p1 -b .ldap
 
 
 %build
@@ -280,6 +282,10 @@
 
 
 %changelog
+* Thu Nov 30 2006 Thomas Woerner <twoerner at redhat.com> 1.1.3-2
+- fixed ldap code to not use internals, added LDAP_DEPRECATED compile time flag
+  (#210912)
+
 * Tue Aug 15 2006 Thomas Woerner <twoerner at redhat.com> 1.1.3-1
 - new version 1.1.3 with lots of upstream bug fixes, some security fixes
   (#205654)