[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freeradius-devel
Subject:    patch to fix rlm_ldap warnings.
From:       Russell Coker <russell () coker ! com ! au>
Date:       2001-11-19 15:17:08
[Download RAW message or body]

The attached patch fixes some warnings.

-- 
http://www.coker.com.au/bonnie++/     Bonnie++ hard drive benchmark
http://www.coker.com.au/postal/       Postal SMTP/POP benchmark
http://www.coker.com.au/projects.html Projects I am working on
http://www.coker.com.au/~russell/     My home page

["ldap.diff" (text/x-diff)]

--- radiusd/src/modules/rlm_ldap/rlm_ldap.c	Sun Nov 18 21:52:36 2001
+++ freerad/src/modules/rlm_ldap/rlm_ldap.c	Mon Nov 19 16:13:39 2001
@@ -302,7 +302,7 @@
 }
 
 static int 
-perform_search(void *instance, char *search_basedn, int scope, char *filter, char \
**attrs, LDAPMessage ** result) +perform_search(void *instance, char *search_basedn, \
int scope, char *filter, const char **attrs, LDAPMessage ** result)  {
 	int             res = RLM_MODULE_OK;
 	int		ldap_errno = 0;
@@ -322,7 +322,7 @@
 		inst->bound = 1;
 	}
 	DEBUG2("rlm_ldap: performing search in %s, with filter %s", search_basedn ? \
                search_basedn : "(null)" , filter);
-	switch (ldap_search_st(inst->ld, search_basedn, scope, filter, attrs, 0, \
&(inst->timeout), result)) { +	switch (ldap_search_st(inst->ld, search_basedn, scope, \
filter, (char **)attrs, 0, &(inst->timeout), result)) {  case LDAP_SUCCESS:
 		break;
 
@@ -735,7 +735,8 @@
 	LDAP           *ld_user;
 	LDAPMessage    *result, *msg;
 	ldap_instance  *inst = instance;
-	char           *user_dn, *attrs[] = {"uid", NULL};
+	char           *user_dn;
+	const char	*attrs[] = {"uid", NULL};
         char		filter[MAX_AUTH_QUERY_LEN];
 	char		basedn[1024];
 	int             res;
@@ -1063,7 +1064,7 @@
 
 				if (is_generic_attribute) {
 					/* this is a generic attribute */
-					int dummy; /* makes pairread happy */
+					LRAD_TOKEN dummy; /* makes pairread happy */
 					
 					/* not sure if using pairread here is ok ... */
 					if ( (newpair = pairread(&ptr, &dummy)) != NULL) {


- 
List info/subscribe/unsubscribe? See http://www.freeradius.org/list/devel.html


[prev in list] [next in list] [prev in thread] [next in thread]