Standardise debugging in rlm_ldap and rlm_cache

FreeRADIUS · Apr 27, 2014 · 55b30e7 · 55b30e7
1 parent c9e1302
commit 55b30e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
@@ -459,7 +459,7 @@ static rlm_cache_entry_t *cache_add(rlm_cache_t *inst, REQUEST *request,
 						pairfree(&found);
 						return NULL;
 					}
-					RDEBUG("\t%s %s %s (%s)", map->dst->name,
+					RDEBUG("\t%s %s %s:%s", map->dst->name,
 					       fr_int2str(fr_tokens, map->op, "<INVALID>"),
 					       map->src->name, vp->da->name);
 					vp->op = map->op;

diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
@@ -288,7 +288,6 @@ rlm_rcode_t rlm_ldap_cacheable_userobj(ldap_instance_t const *inst, REQUEST *req
 			if (is_dn) {
 				pairmake(request, &request->config_items, inst->cache_da->name, vals[i], T_OP_ADD);
 				RDEBUG("Added %s with value \"%s\" to control list", inst->cache_da->name, vals[i]);
-
 			/*
 			 *	We were told to cache DNs but we got a name, we now need to resolve
 			 *	this to a DN. Store all the group names in an array so we can do one query.
@@ -304,7 +303,7 @@ rlm_rcode_t rlm_ldap_cacheable_userobj(ldap_instance_t const *inst, REQUEST *req
 			 */
 			if (!is_dn) {
 				pairmake(request, &request->config_items, inst->cache_da->name, vals[i], T_OP_ADD);
-				RDEBUG("Added %s with value \"%s\" to control list", inst->cache_da->name, vals[i]);
+				RDEBUG("Added control:%s with value \"%s\"", inst->cache_da->name, vals[i]);
 			/*
 			 *	We were told to cache names but we got a DN, we now need to resolve
 			 *	this to a name.
@@ -320,7 +319,7 @@ rlm_rcode_t rlm_ldap_cacheable_userobj(ldap_instance_t const *inst, REQUEST *req
 				}
 
 				pairmake(request, &request->config_items, inst->cache_da->name, name, T_OP_ADD);
-				RDEBUG("Added %s with value \"%s\" to control list", inst->cache_da->name, name);
+				DEBUG("Added control:%s with value \"%s\"", inst->cache_da->name, name);
 				talloc_free(name);
 			}
 		}
@@ -338,7 +337,7 @@ rlm_rcode_t rlm_ldap_cacheable_userobj(ldap_instance_t const *inst, REQUEST *req
 	dn_p = group_dn;
 	while(*dn_p) {
 		pairmake(request, &request->config_items, inst->cache_da->name, *dn_p, T_OP_ADD);
-		RDEBUG("Added %s with value \"%s\" to control list", inst->cache_da->name, *dn_p);
+		RDEBUG("Added control:%s with value \"%s\"", inst->cache_da->name, *dn_p);
 		ldap_memfree(*dn_p);
 
 		dn_p++;
@@ -416,7 +415,7 @@ rlm_rcode_t rlm_ldap_cacheable_groupobj(ldap_instance_t const *inst, REQUEST *re
 		if (inst->cacheable_group_dn) {
 			dn = ldap_get_dn((*pconn)->handle, entry);
 			pairmake(request, &request->config_items, inst->cache_da->name, dn, T_OP_ADD);
-			RDEBUG("Added %s with value \"%s\" to control list", inst->cache_da->name, dn);
+			RDEBUG("Added control:%s with value \"%s\"", inst->cache_da->name, dn);
 			ldap_memfree(dn);
 		}
 
@@ -427,7 +426,7 @@ rlm_rcode_t rlm_ldap_cacheable_groupobj(ldap_instance_t const *inst, REQUEST *re
 			}
 
 			pairmake(request, &request->config_items, inst->cache_da->name, *vals, T_OP_ADD);
-			RDEBUG("Added %s with value \"%s\" to control list", inst->cache_da->name, *vals);
+			RDEBUG("Added control:%s with value \"%s\"", inst->cache_da->name, *vals);
 
 			ldap_value_free(vals);
 		}