From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 23 Jun 2015 02:38:59 +0000 (-0400)
Subject: Minor formatting fixes
X-Git-Tag: release_3_0_9~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba562c247baa1053e92efc428fa18eb8d212d454;p=thirdparty%2Ffreeradius-server.git

Minor formatting fixes
---

diff --git a/src/modules/rlm_ldap/ldap.c b/src/modules/rlm_ldap/ldap.c
index ee6773e34aa..8343cfaeb20 100644
--- a/src/modules/rlm_ldap/ldap.c
+++ b/src/modules/rlm_ldap/ldap.c
@@ -945,9 +945,7 @@ finish:
 	 *	it to where our caller said.
 	 */
 	if (!result) {
-		if (our_result) {
-			ldap_msgfree(our_result);
-		}
+		if (our_result) ldap_msgfree(our_result);
 	} else {
 		*result = our_result;
 	}
@@ -1015,7 +1013,6 @@ ldap_rcode_t rlm_ldap_modify(rlm_ldap_t const *inst, REQUEST *request, ldap_hand
 				RWDEBUG("Modify failed: %s. Got new socket, retrying...", error);
 
 				talloc_free(extra); /* don't leak debug info */
-
 				continue;
 			}
 
diff --git a/src/modules/rlm_ldap/ldap.h b/src/modules/rlm_ldap/ldap.h
index d77a19dda4e..bf0eaa77c14 100644
--- a/src/modules/rlm_ldap/ldap.h
+++ b/src/modules/rlm_ldap/ldap.h
@@ -143,7 +143,7 @@ typedef struct ldap_instance {
 	/*
 	 *	RADIUS attribute to LDAP attribute maps
 	 */
-	vp_map_t *user_map; 			//!< Attribute map applied to users and profiles.
+	vp_map_t	*user_map; 			//!< Attribute map applied to users and profiles.
 
 	/*
 	 *	User object attributes and filters
diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index bee0a83f9c7..7a49eb43eed 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -224,7 +224,6 @@ static const CONF_PARSER module_config[] = {
 	{ "identity", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_ldap_t, admin_identity), NULL },
 	{ "password", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_SECRET, rlm_ldap_t, admin_password), NULL },
 
-	/* Should be deprecated */
 	{ "sasl", FR_CONF_OFFSET(PW_TYPE_SUBSECTION, rlm_ldap_t, admin_sasl), (void const *) sasl_mech_static },
 
 	{ "valuepair_attribute", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_ldap_t, valuepair_attr), NULL },
diff --git a/src/modules/rlm_ldap/sasl.c b/src/modules/rlm_ldap/sasl.c
index 00a3ded5f6b..d71e5b102e1 100644
--- a/src/modules/rlm_ldap/sasl.c
+++ b/src/modules/rlm_ldap/sasl.c
@@ -113,8 +113,8 @@ ldap_rcode_t rlm_ldap_sasl_interactive(rlm_ldap_t const *inst, REQUEST *request,
 	rlm_ldap_sasl_ctx_t	sasl_ctx;		/* SASL defaults */
 
 	/* rlm_ldap_result may not be called */
-	*error = NULL;
-	*extra = NULL;
+	if (error) *error = NULL;
+	if (extra) *extra = NULL;
 
 	sasl_ctx.inst = inst;
 	sasl_ctx.request = request;