Fix some blank line endings

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Jun 21 19:57:06 CEST 2013 on sn-devel-104

1 files changed, 287 insertions, 292 deletions

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index bdd0777757..b2e3c1dfe3 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -7,17 +7,17 @@
 
    Copyright (C) Andrew Tridgell 2004
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-2008
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -72,9 +72,9 @@ struct lsa_trusted_domain_state {
   this is based on the samba3 function make_lsa_object_sd()
   It uses the same logic, but with samba4 helper functions
  */
-static NTSTATUS dcesrv_build_lsa_sd(TALLOC_CTX *mem_ctx, 
+static NTSTATUS dcesrv_build_lsa_sd(TALLOC_CTX *mem_ctx,
 				    struct security_descriptor **sd,
-				    struct dom_sid *sid, 
+				    struct dom_sid *sid,
 				    uint32_t sid_access)
 {
 	NTSTATUS status;
@@ -91,25 +91,25 @@ static NTSTATUS dcesrv_build_lsa_sd(TALLOC_CTX *mem_ctx,
 
 	domain_admins_sid_str = dom_sid_string(tmp_ctx, domain_admins_sid);
 	NT_STATUS_HAVE_NO_MEMORY_AND_FREE(domain_admins_sid_str, tmp_ctx);
-	
+
 	sidstr = dom_sid_string(tmp_ctx, sid);
 	NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sidstr, tmp_ctx);
-						      
+
 	*sd = security_descriptor_dacl_create(mem_ctx,
 					      0, sidstr, NULL,
 
 					      SID_WORLD,
 					      SEC_ACE_TYPE_ACCESS_ALLOWED,
 					      SEC_GENERIC_EXECUTE | SEC_GENERIC_READ, 0,
-					      
+
 					      SID_BUILTIN_ADMINISTRATORS,
 					      SEC_ACE_TYPE_ACCESS_ALLOWED,
 					      SEC_GENERIC_ALL, 0,
-					      
+
 					      SID_BUILTIN_ACCOUNT_OPERATORS,
 					      SEC_ACE_TYPE_ACCESS_ALLOWED,
 					      SEC_GENERIC_ALL, 0,
-					      
+
 					      domain_admins_sid_str,
 					      SEC_ACE_TYPE_ACCESS_ALLOWED,
 					      SEC_GENERIC_ALL, 0,
@@ -127,19 +127,19 @@ static NTSTATUS dcesrv_build_lsa_sd(TALLOC_CTX *mem_ctx,
 }
 
 
-static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call,
 				      TALLOC_CTX *mem_ctx,
 				      struct lsa_EnumAccountRights *r);
 
-static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_call,
 					   TALLOC_CTX *mem_ctx,
 					   struct lsa_policy_state *state,
 					   int ldb_flag,
 					   struct dom_sid *sid,
 					   const struct lsa_RightSet *rights);
 
-/* 
-  lsa_Close 
+/*
+  lsa_Close
 */
 static NTSTATUS dcesrv_lsa_Close(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			  struct lsa_Close *r)
@@ -163,8 +163,8 @@ static NTSTATUS dcesrv_lsa_Close(struct dcesrv_call_state *dce_call, TALLOC_CTX
 }
 
 
-/* 
-  lsa_Delete 
+/*
+  lsa_Delete
 */
 static NTSTATUS dcesrv_lsa_Delete(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			   struct lsa_Delete *r)
@@ -173,7 +173,7 @@ static NTSTATUS dcesrv_lsa_Delete(struct dcesrv_call_state *dce_call, TALLOC_CTX
 }
 
 
-/* 
+/*
   lsa_DeleteObject
 */
 static NTSTATUS dcesrv_lsa_DeleteObject(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -198,7 +198,7 @@ static NTSTATUS dcesrv_lsa_DeleteObject(struct dcesrv_call_state *dce_call, TALL
 			return NT_STATUS_ACCESS_DENIED;
 		}
 
-		ret = ldb_delete(secret_state->sam_ldb, 
+		ret = ldb_delete(secret_state->sam_ldb,
 				 secret_state->secret_dn);
 		if (ret != LDB_SUCCESS) {
 			return NT_STATUS_INVALID_HANDLE;
@@ -209,14 +209,14 @@ static NTSTATUS dcesrv_lsa_DeleteObject(struct dcesrv_call_state *dce_call, TALL
 		return NT_STATUS_OK;
 
 	} else if (h->wire_handle.handle_type == LSA_HANDLE_TRUSTED_DOMAIN) {
-		struct lsa_trusted_domain_state *trusted_domain_state = 
+		struct lsa_trusted_domain_state *trusted_domain_state =
 			talloc_get_type(h->data, struct lsa_trusted_domain_state);
 		ret = ldb_transaction_start(trusted_domain_state->policy->sam_ldb);
 		if (ret != LDB_SUCCESS) {
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
 
-		ret = ldb_delete(trusted_domain_state->policy->sam_ldb, 
+		ret = ldb_delete(trusted_domain_state->policy->sam_ldb,
 				 trusted_domain_state->trusted_domain_dn);
 		if (ret != LDB_SUCCESS) {
 			ldb_transaction_cancel(trusted_domain_state->policy->sam_ldb);
@@ -224,7 +224,7 @@ static NTSTATUS dcesrv_lsa_DeleteObject(struct dcesrv_call_state *dce_call, TALL
 		}
 
 		if (trusted_domain_state->trusted_domain_user_dn) {
-			ret = ldb_delete(trusted_domain_state->policy->sam_ldb, 
+			ret = ldb_delete(trusted_domain_state->policy->sam_ldb,
 					 trusted_domain_state->trusted_domain_user_dn);
 			if (ret != LDB_SUCCESS) {
 				ldb_transaction_cancel(trusted_domain_state->policy->sam_ldb);
@@ -250,7 +250,7 @@ static NTSTATUS dcesrv_lsa_DeleteObject(struct dcesrv_call_state *dce_call, TALL
 		rights = talloc(mem_ctx, struct lsa_RightSet);
 
 		DCESRV_PULL_HANDLE(h, r->in.handle, LSA_HANDLE_ACCOUNT);
-		
+
 		astate = h->data;
 
 		r2.in.handle = &astate->policy->handle->wire_handle;
@@ -269,7 +269,7 @@ static NTSTATUS dcesrv_lsa_DeleteObject(struct dcesrv_call_state *dce_call, TALL
 			return status;
 		}
 
-		status = dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy, 
+		status = dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy,
 						    LDB_FLAG_MOD_DELETE, astate->account_sid,
 						    r2.out.rights);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
@@ -283,14 +283,14 @@ static NTSTATUS dcesrv_lsa_DeleteObject(struct dcesrv_call_state *dce_call, TALL
 		ZERO_STRUCTP(r->out.handle);
 
 		return NT_STATUS_OK;
-	} 
-	
+	}
+
 	return NT_STATUS_INVALID_HANDLE;
 }
 
 
-/* 
-  lsa_EnumPrivs 
+/*
+  lsa_EnumPrivs
 */
 static NTSTATUS dcesrv_lsa_EnumPrivs(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			      struct lsa_EnumPrivs *r)
@@ -312,8 +312,8 @@ static NTSTATUS dcesrv_lsa_EnumPrivs(struct dcesrv_call_state *dce_call, TALLOC_
 		struct lsa_PrivEntry *e;
 		privname = sec_privilege_name(priv);
 		r->out.privs->privs = talloc_realloc(r->out.privs,
-						       r->out.privs->privs, 
-						       struct lsa_PrivEntry, 
+						       r->out.privs->privs,
+						       struct lsa_PrivEntry,
 						       r->out.privs->count+1);
 		if (r->out.privs->privs == NULL) {
 			return NT_STATUS_NO_MEMORY;
@@ -332,8 +332,8 @@ static NTSTATUS dcesrv_lsa_EnumPrivs(struct dcesrv_call_state *dce_call, TALLOC_
 }
 
 
-/* 
-  lsa_QuerySecObj 
+/*
+  lsa_QuerySecObj
 */
 static NTSTATUS dcesrv_lsa_QuerySecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					 struct lsa_QuerySecurity *r)
@@ -350,7 +350,7 @@ static NTSTATUS dcesrv_lsa_QuerySecurity(struct dcesrv_call_state *dce_call, TAL
 	if (h->wire_handle.handle_type == LSA_HANDLE_POLICY) {
 		status = dcesrv_build_lsa_sd(mem_ctx, &sd, sid, 0);
 	} else 	if (h->wire_handle.handle_type == LSA_HANDLE_ACCOUNT) {
-		status = dcesrv_build_lsa_sd(mem_ctx, &sd, sid, 
+		status = dcesrv_build_lsa_sd(mem_ctx, &sd, sid,
 					     LSA_ACCOUNT_ALL_ACCESS);
 	} else {
 		return NT_STATUS_INVALID_HANDLE;
@@ -361,13 +361,13 @@ static NTSTATUS dcesrv_lsa_QuerySecurity(struct dcesrv_call_state *dce_call, TAL
 	NT_STATUS_HAVE_NO_MEMORY(*r->out.sdbuf);
 
 	(*r->out.sdbuf)->sd = sd;
-	
+
 	return NT_STATUS_OK;
 }
 
 
-/* 
-  lsa_SetSecObj 
+/*
+  lsa_SetSecObj
 */
 static NTSTATUS dcesrv_lsa_SetSecObj(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			      struct lsa_SetSecObj *r)
@@ -376,8 +376,8 @@ static NTSTATUS dcesrv_lsa_SetSecObj(struct dcesrv_call_state *dce_call, TALLOC_
 }
 
 
-/* 
-  lsa_ChangePassword 
+/*
+  lsa_ChangePassword
 */
 static NTSTATUS dcesrv_lsa_ChangePassword(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				   struct lsa_ChangePassword *r)
@@ -385,13 +385,13 @@ static NTSTATUS dcesrv_lsa_ChangePassword(struct dcesrv_call_state *dce_call, TA
 	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }
 
-/* 
-  dssetup_DsRoleGetPrimaryDomainInformation 
+/*
+  dssetup_DsRoleGetPrimaryDomainInformation
 
   This is not an LSA call, but is the only call left on the DSSETUP
   pipe (after the pipe was truncated), and needs lsa_get_policy_state
 */
-static WERROR dcesrv_dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_call_state *dce_call, 
+static WERROR dcesrv_dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_call_state *dce_call,
 						 TALLOC_CTX *mem_ctx,
 						 struct dssetup_DsRoleGetPrimaryDomainInformation *r)
 {
@@ -450,7 +450,7 @@ static WERROR dcesrv_dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_cal
 			if (state->mixed_domain == 1) {
 				flags	|= DS_ROLE_PRIMARY_DS_MIXED_MODE;
 			}
-			
+
 			domain		= state->domain_name;
 			dns_domain	= state->domain_dns;
 			forest		= state->forest_dns;
@@ -460,7 +460,7 @@ static WERROR dcesrv_dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_cal
 			break;
 		}
 
-		info->basic.role        = role; 
+		info->basic.role        = role;
 		info->basic.flags       = flags;
 		info->basic.domain      = domain;
 		info->basic.dns_domain  = dns_domain;
@@ -517,7 +517,7 @@ static NTSTATUS dcesrv_lsa_info_DNS(struct lsa_policy_state *state, TALLOC_CTX *
 	return NT_STATUS_OK;
 }
 
-/* 
+/*
   lsa_QueryInfoPolicy2
 */
 static NTSTATUS dcesrv_lsa_QueryInfoPolicy2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -588,8 +588,8 @@ static NTSTATUS dcesrv_lsa_QueryInfoPolicy2(struct dcesrv_call_state *dce_call,
 	return NT_STATUS_INVALID_INFO_CLASS;
 }
 
-/* 
-  lsa_QueryInfoPolicy 
+/*
+  lsa_QueryInfoPolicy
 */
 static NTSTATUS dcesrv_lsa_QueryInfoPolicy(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				    struct lsa_QueryInfoPolicy *r)
@@ -602,14 +602,14 @@ static NTSTATUS dcesrv_lsa_QueryInfoPolicy(struct dcesrv_call_state *dce_call, T
 	r2.in.handle = r->in.handle;
 	r2.in.level = r->in.level;
 	r2.out.info = r->out.info;
-	
+
 	status = dcesrv_lsa_QueryInfoPolicy2(dce_call, mem_ctx, &r2);
 
 	return status;
 }
 
-/* 
-  lsa_SetInfoPolicy 
+/*
+  lsa_SetInfoPolicy
 */
 static NTSTATUS dcesrv_lsa_SetInfoPolicy(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				  struct lsa_SetInfoPolicy *r)
@@ -619,8 +619,8 @@ static NTSTATUS dcesrv_lsa_SetInfoPolicy(struct dcesrv_call_state *dce_call, TAL
 }
 
 
-/* 
-  lsa_ClearAuditLog 
+/*
+  lsa_ClearAuditLog
 */
 static NTSTATUS dcesrv_lsa_ClearAuditLog(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				  struct lsa_ClearAuditLog *r)
@@ -629,8 +629,8 @@ static NTSTATUS dcesrv_lsa_ClearAuditLog(struct dcesrv_call_state *dce_call, TAL
 }
 
 
-/* 
-  lsa_CreateAccount 
+/*
+  lsa_CreateAccount
 
   This call does not seem to have any long-term effects, hence no database operations
 
@@ -665,7 +665,7 @@ static NTSTATUS dcesrv_lsa_CreateAccount(struct dcesrv_call_state *dce_call, TAL
 		talloc_free(astate);
 		return NT_STATUS_NO_MEMORY;
 	}
-	
+
 	astate->policy = talloc_reference(astate, state);
 	astate->access_mask = r->in.access_mask;
 
@@ -683,8 +683,8 @@ static NTSTATUS dcesrv_lsa_CreateAccount(struct dcesrv_call_state *dce_call, TAL
 }
 
 
-/* 
-  lsa_EnumAccounts 
+/*
+  lsa_EnumAccounts
 */
 static NTSTATUS dcesrv_lsa_EnumAccounts(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				 struct lsa_EnumAccounts *r)
@@ -701,9 +701,9 @@ static NTSTATUS dcesrv_lsa_EnumAccounts(struct dcesrv_call_state *dce_call, TALL
 	state = h->data;
 
 	/* NOTE: This call must only return accounts that have at least
-	   one privilege set 
+	   one privilege set
 	*/
-	ret = gendb_search(state->pdb, mem_ctx, NULL, &res, attrs, 
+	ret = gendb_search(state->pdb, mem_ctx, NULL, &res, attrs,
 			   "(&(objectSid=*)(privilege=*))");
 	if (ret < 0) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -728,8 +728,8 @@ static NTSTATUS dcesrv_lsa_EnumAccounts(struct dcesrv_call_state *dce_call, TALL
 	}
 
 	for (i=0;i<count;i++) {
-		r->out.sids->sids[i].sid = 
-			samdb_result_dom_sid(r->out.sids->sids, 
+		r->out.sids->sids[i].sid =
+			samdb_result_dom_sid(r->out.sids->sids,
 					     res[i + *r->in.resume_handle],
 					     "objectSid");
 		NT_STATUS_HAVE_NO_MEMORY(r->out.sids->sids[i].sid);
@@ -739,7 +739,6 @@ static NTSTATUS dcesrv_lsa_EnumAccounts(struct dcesrv_call_state *dce_call, TALL
 	*r->out.resume_handle = count + *r->in.resume_handle;
 
 	return NT_STATUS_OK;
-	
 }
 
 /* This decrypts and returns Trusted Domain Auth Information Internal data */
@@ -1155,8 +1154,8 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomainEx(struct dcesrv_call_state *dce_c
 	return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, &r2, NDR_LSA_CREATETRUSTEDDOMAINEX, r->in.auth_info);
 }
 
-/* 
-  lsa_CreateTrustedDomain 
+/*
+  lsa_CreateTrustedDomain
 */
 static NTSTATUS dcesrv_lsa_CreateTrustedDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					struct lsa_CreateTrustedDomain *r)
@@ -1175,22 +1174,21 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain(struct dcesrv_call_state *dce_cal
 	r2.in.info->trust_direction = LSA_TRUST_DIRECTION_OUTBOUND;
 	r2.in.info->trust_type = LSA_TRUST_TYPE_DOWNLEVEL;
 	r2.in.info->trust_attributes = 0;
-	
+
 	r2.in.access_mask = r->in.access_mask;
 	r2.out.trustdom_handle = r->out.trustdom_handle;
 
 	return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, &r2, NDR_LSA_CREATETRUSTEDDOMAIN, NULL);
-			 
 }
 
-/* 
+/*
   lsa_OpenTrustedDomain
 */
 static NTSTATUS dcesrv_lsa_OpenTrustedDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				      struct lsa_OpenTrustedDomain *r)
 {
 	struct dcesrv_handle *policy_handle;
-	
+
 	struct lsa_policy_state *policy_state;
 	struct lsa_trusted_domain_state *trusted_domain_state;
 	struct dcesrv_handle *handle;
@@ -1222,12 +1220,12 @@ static NTSTATUS dcesrv_lsa_OpenTrustedDomain(struct dcesrv_call_state *dce_call,
 	/* search for the trusted_domain record */
 	ret = gendb_search(trusted_domain_state->policy->sam_ldb,
 			   mem_ctx, policy_state->system_dn, &msgs, attrs,
-			   "(&(securityIdentifier=%s)(objectclass=trustedDomain))", 
+			   "(&(securityIdentifier=%s)(objectclass=trustedDomain))",
 			   sid_string);
 	if (ret == 0) {
 		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	}
-	
+
 	if (ret != 1) {
 		DEBUG(0,("Found %d records matching DN %s\n", ret,
 			 ldb_dn_get_linearized(policy_state->system_dn)));
@@ -1253,14 +1251,14 @@ static NTSTATUS dcesrv_lsa_OpenTrustedDomain(struct dcesrv_call_state *dce_call,
 	if (!handle) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	
+
 	handle->data = talloc_steal(handle, trusted_domain_state);
-	
+
 	trusted_domain_state->access_mask = r->in.access_mask;
 	trusted_domain_state->policy = talloc_reference(trusted_domain_state, policy_state);
-	
+
 	*r->out.trustdom_handle = handle->wire_handle;
-	
+
 	return NT_STATUS_OK;
 }
 
@@ -1336,7 +1334,7 @@ static NTSTATUS dcesrv_lsa_OpenTrustedDomainByName(struct dcesrv_call_state *dce
 
 
 
-/* 
+/*
   lsa_SetTrustedDomainInfo
 */
 static NTSTATUS dcesrv_lsa_SetTrustedDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -1939,7 +1937,7 @@ static NTSTATUS dcesrv_lsa_SetInformationTrustedDomain(
 }
 
 
-/* 
+/*
   lsa_DeleteTrustedDomain
 */
 static NTSTATUS dcesrv_lsa_DeleteTrustedDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -1974,26 +1972,26 @@ static NTSTATUS dcesrv_lsa_DeleteTrustedDomain(struct dcesrv_call_state *dce_cal
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS fill_trust_domain_ex(TALLOC_CTX *mem_ctx, 
-				     struct ldb_message *msg, 
-				     struct lsa_TrustDomainInfoInfoEx *info_ex) 
+static NTSTATUS fill_trust_domain_ex(TALLOC_CTX *mem_ctx,
+				     struct ldb_message *msg,
+				     struct lsa_TrustDomainInfoInfoEx *info_ex)
 {
 	info_ex->domain_name.string
 		= ldb_msg_find_attr_as_string(msg, "trustPartner", NULL);
 	info_ex->netbios_name.string
 		= ldb_msg_find_attr_as_string(msg, "flatname", NULL);
-	info_ex->sid 
+	info_ex->sid
 		= samdb_result_dom_sid(mem_ctx, msg, "securityIdentifier");
 	info_ex->trust_direction
 		= ldb_msg_find_attr_as_int(msg, "trustDirection", 0);
 	info_ex->trust_type
 		= ldb_msg_find_attr_as_int(msg, "trustType", 0);
 	info_ex->trust_attributes
-		= ldb_msg_find_attr_as_int(msg, "trustAttributes", 0);	
+		= ldb_msg_find_attr_as_int(msg, "trustAttributes", 0);
 	return NT_STATUS_OK;
 }
 
-/* 
+/*
   lsa_QueryTrustedDomainInfo
 */
 static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2006,12 +2004,12 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_
 	int ret;
 	struct ldb_message **res;
 	const char *attrs[] = {
-		"flatname", 
+		"flatname",
 		"trustPartner",
 		"securityIdentifier",
 		"trustDirection",
 		"trustType",
-		"trustAttributes", 
+		"trustAttributes",
 		"msDs-supportedEncryptionTypes",
 		NULL
 	};
@@ -2027,7 +2025,7 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 	msg = res[0];
-	
+
 	info = talloc_zero(mem_ctx, union lsa_TrustedDomainInfo);
 	if (!info) {
 		return NT_STATUS_NO_MEMORY;
@@ -2045,7 +2043,7 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_
 		break;
 #if 0  /* Win2k3 doesn't implement this */
 	case LSA_TRUSTED_DOMAIN_INFO_BASIC:
-		r->out.info->info_basic.netbios_name.string 
+		r->out.info->info_basic.netbios_name.string
 			= ldb_msg_find_attr_as_string(msg, "flatname", NULL);
 		r->out.info->info_basic.sid
 			= samdb_result_dom_sid(mem_ctx, msg, "securityIdentifier");
@@ -2062,7 +2060,7 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_
 		info->full_info2_internal.posix_offset.posix_offset
 			= ldb_msg_find_attr_as_uint(msg, "posixOffset", 0);
 		return fill_trust_domain_ex(mem_ctx, msg, &info->full_info2_internal.info.info_ex);
-		
+
 	case LSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES:
 		info->enc_types.enc_types
 			= ldb_msg_find_attr_as_uint(msg, "msDs-supportedEncryptionTypes", KERB_ENCTYPE_RC4_HMAC_MD5);
@@ -2085,7 +2083,7 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_
 }
 
 
-/* 
+/*
   lsa_QueryTrustedDomainInfoBySid
 */
 static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfoBySid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2156,7 +2154,7 @@ static NTSTATUS dcesrv_lsa_SetTrustedDomainInfoByName(struct dcesrv_call_state *
 					 msgs[0], r->in.level, r->in.info);
 }
 
-/* 
+/*
    lsa_QueryTrustedDomainInfoByName
 */
 static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfoByName(struct dcesrv_call_state *dce_call,
@@ -2179,7 +2177,7 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfoByName(struct dcesrv_call_state
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
-	
+
 	/* Ensure this handle goes away at the end of this call */
 	DCESRV_PULL_HANDLE(h, opn.out.trustdom_handle, DCESRV_HANDLE_ANY);
 	talloc_steal(mem_ctx, h);
@@ -2191,12 +2189,12 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfoByName(struct dcesrv_call_state
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
-	
+
 	return NT_STATUS_OK;
 }
 
 /*
-  lsa_CloseTrustedDomainEx 
+  lsa_CloseTrustedDomainEx
 */
 static NTSTATUS dcesrv_lsa_CloseTrustedDomainEx(struct dcesrv_call_state *dce_call,
 					 TALLOC_CTX *mem_ctx,
@@ -2217,8 +2215,8 @@ static int compare_DomainInfo(struct lsa_DomainInfo *e1, struct lsa_DomainInfo *
 	return strcasecmp_m(e1->name.string, e2->name.string);
 }
 
-/* 
-  lsa_EnumTrustDom 
+/*
+  lsa_EnumTrustDom
 */
 static NTSTATUS dcesrv_lsa_EnumTrustDom(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				 struct lsa_EnumTrustDom *r)
@@ -2228,7 +2226,7 @@ static NTSTATUS dcesrv_lsa_EnumTrustDom(struct dcesrv_call_state *dce_call, TALL
 	struct lsa_policy_state *policy_state;
 	struct ldb_message **domains;
 	const char *attrs[] = {
-		"flatname", 
+		"flatname",
 		"securityIdentifier",
 		NULL
 	};
@@ -2245,9 +2243,9 @@ static NTSTATUS dcesrv_lsa_EnumTrustDom(struct dcesrv_call_state *dce_call, TALL
 
 	policy_state = policy_handle->data;
 
-	/* search for all users in this domain. This could possibly be cached and 
+	/* search for all users in this domain. This could possibly be cached and
 	   resumed based on resume_key */
-	count = gendb_search(policy_state->sam_ldb, mem_ctx, policy_state->system_dn, &domains, attrs, 
+	count = gendb_search(policy_state->sam_ldb, mem_ctx, policy_state->system_dn, &domains, attrs,
 			     "objectclass=trustedDomain");
 	if (count < 0) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -2272,10 +2270,10 @@ static NTSTATUS dcesrv_lsa_EnumTrustDom(struct dcesrv_call_state *dce_call, TALL
 		return NT_STATUS_NO_MORE_ENTRIES;
 	}
 
-	/* return the rest, limit by max_size. Note that we 
+	/* return the rest, limit by max_size. Note that we
 	   use the w2k3 element size value of 60 */
 	r->out.domains->count = count - *r->in.resume_handle;
-	r->out.domains->count = MIN(r->out.domains->count, 
+	r->out.domains->count = MIN(r->out.domains->count,
 				 1+(r->in.max_size/LSA_ENUM_TRUST_DOMAIN_MULTIPLIER));
 
 	r->out.domains->domains = entries + *r->in.resume_handle;
@@ -2306,8 +2304,8 @@ static int compare_TrustDomainInfoInfoEx(struct lsa_TrustDomainInfoInfoEx *e1, s
 	return strcasecmp_m(e1->netbios_name.string, e2->netbios_name.string);
 }
 
-/* 
-  lsa_EnumTrustedDomainsEx 
+/*
+  lsa_EnumTrustedDomainsEx
 */
 static NTSTATUS dcesrv_lsa_EnumTrustedDomainsEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					struct lsa_EnumTrustedDomainsEx *r)
@@ -2317,12 +2315,12 @@ static NTSTATUS dcesrv_lsa_EnumTrustedDomainsEx(struct dcesrv_call_state *dce_ca
 	struct lsa_policy_state *policy_state;
 	struct ldb_message **domains;
 	const char *attrs[] = {
-		"flatname", 
+		"flatname",
 		"trustPartner",
 		"securityIdentifier",
 		"trustDirection",
 		"trustType",
-		"trustAttributes", 
+		"trustAttributes",
 		NULL
 	};
 	NTSTATUS nt_status;
@@ -2338,9 +2336,9 @@ static NTSTATUS dcesrv_lsa_EnumTrustedDomainsEx(struct dcesrv_call_state *dce_ca
 
 	policy_state = policy_handle->data;
 
-	/* search for all users in this domain. This could possibly be cached and 
+	/* search for all users in this domain. This could possibly be cached and
 	   resumed based on resume_key */
-	count = gendb_search(policy_state->sam_ldb, mem_ctx, policy_state->system_dn, &domains, attrs, 
+	count = gendb_search(policy_state->sam_ldb, mem_ctx, policy_state->system_dn, &domains, attrs,
 			     "objectclass=trustedDomain");
 	if (count < 0) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -2367,10 +2365,10 @@ static NTSTATUS dcesrv_lsa_EnumTrustedDomainsEx(struct dcesrv_call_state *dce_ca
 		return NT_STATUS_NO_MORE_ENTRIES;
 	}
 
-	/* return the rest, limit by max_size. Note that we 
+	/* return the rest, limit by max_size. Note that we
 	   use the w2k3 element size value of 60 */
 	r->out.domains->count = count - *r->in.resume_handle;
-	r->out.domains->count = MIN(r->out.domains->count, 
+	r->out.domains->count = MIN(r->out.domains->count,
 				 1+(r->in.max_size/LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER));
 
 	r->out.domains->domains = entries + *r->in.resume_handle;
@@ -2385,8 +2383,8 @@ static NTSTATUS dcesrv_lsa_EnumTrustedDomainsEx(struct dcesrv_call_state *dce_ca
 }
 
 
-/* 
-  lsa_OpenAccount 
+/*
+  lsa_OpenAccount
 */
 static NTSTATUS dcesrv_lsa_OpenAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				struct lsa_OpenAccount *r)
@@ -2411,7 +2409,7 @@ static NTSTATUS dcesrv_lsa_OpenAccount(struct dcesrv_call_state *dce_call, TALLO
 		talloc_free(astate);
 		return NT_STATUS_NO_MEMORY;
 	}
-	
+
 	astate->policy = talloc_reference(astate, state);
 	astate->access_mask = r->in.access_mask;
 
@@ -2429,10 +2427,10 @@ static NTSTATUS dcesrv_lsa_OpenAccount(struct dcesrv_call_state *dce_call, TALLO
 }
 
 
-/* 
-  lsa_EnumPrivsAccount 
+/*
+  lsa_EnumPrivsAccount
 */
-static NTSTATUS dcesrv_lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call,
 				     TALLOC_CTX *mem_ctx,
 				     struct lsa_EnumPrivsAccount *r)
 {
@@ -2465,7 +2463,7 @@ static NTSTATUS dcesrv_lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ret = gendb_search(astate->policy->pdb, mem_ctx, NULL, &res, attrs, 
+	ret = gendb_search(astate->policy->pdb, mem_ctx, NULL, &res, attrs,
 			   "objectSid=%s", sidstr);
 	if (ret < 0) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -2503,10 +2501,10 @@ static NTSTATUS dcesrv_lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call,
 	return NT_STATUS_OK;
 }
 
-/* 
-  lsa_EnumAccountRights 
+/*
+  lsa_EnumAccountRights
 */
-static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call,
 				      TALLOC_CTX *mem_ctx,
 				      struct lsa_EnumAccountRights *r)
 {
@@ -2528,13 +2526,13 @@ static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ret = gendb_search(state->pdb, mem_ctx, NULL, &res, attrs, 
+	ret = gendb_search(state->pdb, mem_ctx, NULL, &res, attrs,
 			   "(&(objectSid=%s)(privilege=*))", sidstr);
 	if (ret == 0) {
 		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	}
 	if (ret != 1) {
-		DEBUG(3, ("searching for account rights for SID: %s failed: %s", 
+		DEBUG(3, ("searching for account rights for SID: %s failed: %s",
 			  dom_sid_string(mem_ctx, r->in.sid),
 			  ldb_errstring(state->pdb)));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -2546,7 +2544,7 @@ static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call,
 	}
 
 	r->out.rights->count = el->num_values;
-	r->out.rights->names = talloc_array(r->out.rights, 
+	r->out.rights->names = talloc_array(r->out.rights,
 					    struct lsa_StringLarge, r->out.rights->count);
 	if (r->out.rights->names == NULL) {
 		return NT_STATUS_NO_MEMORY;
@@ -2561,10 +2559,10 @@ static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call,
 
 
 
-/* 
+/*
   helper for lsa_AddAccountRights and lsa_RemoveAccountRights
 */
-static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_call,
 					   TALLOC_CTX *mem_ctx,
 					   struct lsa_policy_state *state,
 					   int ldb_flag,
@@ -2629,7 +2627,7 @@ static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_
 		if (LDB_FLAG_MOD_TYPE(ldb_flag) == LDB_FLAG_MOD_ADD) {
 			uint32_t j;
 			for (j=0;j<r2.out.rights->count;j++) {
-				if (strcasecmp_m(r2.out.rights->names[j].string, 
+				if (strcasecmp_m(r2.out.rights->names[j].string,
 					       rights->names[i].string) == 0) {
 					break;
 				}
@@ -2659,14 +2657,14 @@ static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_
 			return NT_STATUS_NO_MEMORY;
 		}
 		ldb_msg_add_string(msg, "comment", "added via LSA");
-		ret = ldb_add(state->pdb, msg);		
+		ret = ldb_add(state->pdb, msg);
 	}
 	if (ret != LDB_SUCCESS) {
 		if (LDB_FLAG_MOD_TYPE(ldb_flag) == LDB_FLAG_MOD_DELETE && ret == LDB_ERR_NO_SUCH_ATTRIBUTE) {
 			talloc_free(msg);
 			return NT_STATUS_OK;
 		}
-		DEBUG(3, ("Could not %s attributes from %s: %s", 
+		DEBUG(3, ("Could not %s attributes from %s: %s",
 			  LDB_FLAG_MOD_TYPE(ldb_flag) == LDB_FLAG_MOD_DELETE ? "delete" : "add",
 			  ldb_dn_get_linearized(msg->dn), ldb_errstring(state->pdb)));
 		talloc_free(msg);
@@ -2677,7 +2675,7 @@ static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_
 	return NT_STATUS_OK;
 }
 
-/* 
+/*
   lsa_AddPrivilegesToAccount
 */
 static NTSTATUS dcesrv_lsa_AddPrivilegesToAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2708,13 +2706,13 @@ static NTSTATUS dcesrv_lsa_AddPrivilegesToAccount(struct dcesrv_call_state *dce_
 		}
 	}
 
-	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy, 
+	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy,
 					  LDB_FLAG_MOD_ADD, astate->account_sid,
 					  &rights);
 }
 
 
-/* 
+/*
   lsa_RemovePrivilegesFromAccount
 */
 static NTSTATUS dcesrv_lsa_RemovePrivilegesFromAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2731,7 +2729,7 @@ static NTSTATUS dcesrv_lsa_RemovePrivilegesFromAccount(struct dcesrv_call_state
 
 	rights = talloc(mem_ctx, struct lsa_RightSet);
 
-	if (r->in.remove_all == 1 && 
+	if (r->in.remove_all == 1 &&
 	    r->in.privs == NULL) {
 		struct lsa_EnumAccountRights r2;
 		NTSTATUS status;
@@ -2745,7 +2743,7 @@ static NTSTATUS dcesrv_lsa_RemovePrivilegesFromAccount(struct dcesrv_call_state
 			return status;
 		}
 
-		return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy, 
+		return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy,
 						  LDB_FLAG_MOD_DELETE, astate->account_sid,
 						  r2.out.rights);
 	}
@@ -2770,13 +2768,13 @@ static NTSTATUS dcesrv_lsa_RemovePrivilegesFromAccount(struct dcesrv_call_state
 		}
 	}
 
-	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy, 
+	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, astate->policy,
 					  LDB_FLAG_MOD_DELETE, astate->account_sid,
 					  rights);
 }
 
 
-/* 
+/*
   lsa_GetQuotasForAccount
 */
 static NTSTATUS dcesrv_lsa_GetQuotasForAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2786,7 +2784,7 @@ static NTSTATUS dcesrv_lsa_GetQuotasForAccount(struct dcesrv_call_state *dce_cal
 }
 
 
-/* 
+/*
   lsa_SetQuotasForAccount
 */
 static NTSTATUS dcesrv_lsa_SetQuotasForAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2796,7 +2794,7 @@ static NTSTATUS dcesrv_lsa_SetQuotasForAccount(struct dcesrv_call_state *dce_cal
 }
 
 
-/* 
+/*
   lsa_GetSystemAccessAccount
 */
 static NTSTATUS dcesrv_lsa_GetSystemAccessAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2822,7 +2820,7 @@ static NTSTATUS dcesrv_lsa_GetSystemAccessAccount(struct dcesrv_call_state *dce_
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ret = gendb_search(astate->policy->pdb, mem_ctx, NULL, &res, attrs, 
+	ret = gendb_search(astate->policy->pdb, mem_ctx, NULL, &res, attrs,
 			   "objectSid=%s", sidstr);
 	if (ret < 0) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -2849,7 +2847,7 @@ static NTSTATUS dcesrv_lsa_GetSystemAccessAccount(struct dcesrv_call_state *dce_
 }
 
 
-/* 
+/*
   lsa_SetSystemAccessAccount
 */
 static NTSTATUS dcesrv_lsa_SetSystemAccessAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -2859,8 +2857,8 @@ static NTSTATUS dcesrv_lsa_SetSystemAccessAccount(struct dcesrv_call_state *dce_
 }
 
 
-/* 
-  lsa_CreateSecret 
+/*
+  lsa_CreateSecret
 */
 static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				 struct lsa_CreateSecret *r)
@@ -2880,7 +2878,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 
 	DCESRV_PULL_HANDLE(policy_handle, r->in.handle, LSA_HANDLE_POLICY);
 	ZERO_STRUCTP(r->out.sec_handle);
-	
+
 	switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
 	{
 	case SECURITY_SYSTEM:
@@ -2896,7 +2894,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 	if (!r->in.name.string) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
-	
+
 	secret_state = talloc(mem_ctx, struct lsa_secret_state);
 	NT_STATUS_HAVE_NO_MEMORY(secret_state);
 	secret_state->policy = policy_state;
@@ -2930,14 +2928,14 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 		/* search for the secret record */
 		ret = gendb_search(secret_state->sam_ldb,
 				   mem_ctx, policy_state->system_dn, &msgs, attrs,
-				   "(&(cn=%s)(objectclass=secret))", 
+				   "(&(cn=%s)(objectclass=secret))",
 				   name2);
 		if (ret > 0) {
 			return NT_STATUS_OBJECT_NAME_COLLISION;
 		}
-		
+
 		if (ret < 0) {
-			DEBUG(0,("Failure searching for CN=%s: %s\n", 
+			DEBUG(0,("Failure searching for CN=%s: %s\n",
 				 name2, ldb_errstring(secret_state->sam_ldb)));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -2958,7 +2956,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 
-		secret_state->sam_ldb = talloc_reference(secret_state, 
+		secret_state->sam_ldb = talloc_reference(secret_state,
 							 secrets_db_connect(mem_ctx, dce_call->conn->dce_ctx->lp_ctx));
 		NT_STATUS_HAVE_NO_MEMORY(secret_state->sam_ldb);
 
@@ -2966,14 +2964,14 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 		ret = gendb_search(secret_state->sam_ldb, mem_ctx,
 				   ldb_dn_new(mem_ctx, secret_state->sam_ldb, "cn=LSA Secrets"),
 				   &msgs, attrs,
-				   "(&(cn=%s)(objectclass=secret))", 
+				   "(&(cn=%s)(objectclass=secret))",
 				   ldb_binary_encode_string(mem_ctx, name));
 		if (ret > 0) {
 			return NT_STATUS_OBJECT_NAME_COLLISION;
 		}
-		
+
 		if (ret < 0) {
-			DEBUG(0,("Failure searching for CN=%s: %s\n", 
+			DEBUG(0,("Failure searching for CN=%s: %s\n",
 				 name, ldb_errstring(secret_state->sam_ldb)));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -2983,11 +2981,11 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 		NT_STATUS_HAVE_NO_MEMORY(msg->dn);
 		ret = ldb_msg_add_string(msg, "cn", name);
 		if (ret != LDB_SUCCESS) return NT_STATUS_NO_MEMORY;
-	} 
+	}
 
 	ret = ldb_msg_add_string(msg, "objectClass", "secret");
 	if (ret != LDB_SUCCESS) return NT_STATUS_NO_MEMORY;
-	
+
 	secret_state->secret_dn = talloc_reference(secret_state, msg->dn);
 	NT_STATUS_HAVE_NO_MEMORY(secret_state->secret_dn);
 
@@ -2995,7 +2993,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 	ret = ldb_add(secret_state->sam_ldb, msg);
 	if (ret != LDB_SUCCESS) {
 		DEBUG(0,("Failed to create secret record %s: %s\n",
-			 ldb_dn_get_linearized(msg->dn), 
+			 ldb_dn_get_linearized(msg->dn),
 			 ldb_errstring(secret_state->sam_ldb)));
 		return NT_STATUS_ACCESS_DENIED;
 	}
@@ -3004,25 +3002,25 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 	NT_STATUS_HAVE_NO_MEMORY(handle);
 
 	handle->data = talloc_steal(handle, secret_state);
-	
+
 	secret_state->access_mask = r->in.access_mask;
 	secret_state->policy = talloc_reference(secret_state, policy_state);
 	NT_STATUS_HAVE_NO_MEMORY(secret_state->policy);
-	
+
 	*r->out.sec_handle = handle->wire_handle;
-	
+
 	return NT_STATUS_OK;
 }
 
 
-/* 
-  lsa_OpenSecret 
+/*
+  lsa_OpenSecret
 */
 static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			       struct lsa_OpenSecret *r)
 {
 	struct dcesrv_handle *policy_handle;
-	
+
 	struct lsa_policy_state *policy_state;
 	struct lsa_secret_state *secret_state;
 	struct dcesrv_handle *handle;
@@ -3042,7 +3040,7 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
 	if (!r->in.name.string) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
-	
+
 	switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
 	{
 	case SECURITY_SYSTEM:
@@ -3062,7 +3060,7 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
 	if (strncmp("G$", r->in.name.string, 2) == 0) {
 		name = &r->in.name.string[2];
 		/* We need to connect to the database as system, as this is one of the rare RPC calls that must read the secrets (and this is denied otherwise) */
-		secret_state->sam_ldb = talloc_reference(secret_state, 
+		secret_state->sam_ldb = talloc_reference(secret_state,
 							 samdb_connect(mem_ctx, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, system_session(dce_call->conn->dce_ctx->lp_ctx), 0));
 		secret_state->global = true;
 
@@ -3073,21 +3071,20 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
 		/* search for the secret record */
 		ret = gendb_search(secret_state->sam_ldb,
 				   mem_ctx, policy_state->system_dn, &msgs, attrs,
-				   "(&(cn=%s Secret)(objectclass=secret))", 
+				   "(&(cn=%s Secret)(objectclass=secret))",
 				   ldb_binary_encode_string(mem_ctx, name));
 		if (ret == 0) {
 			return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 		}
-		
+
 		if (ret != 1) {
 			DEBUG(0,("Found %d records matching DN %s\n", ret,
 				 ldb_dn_get_linearized(policy_state->system_dn)));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
-	
 	} else {
 		secret_state->global = false;
-		secret_state->sam_ldb = talloc_reference(secret_state, 
+		secret_state->sam_ldb = talloc_reference(secret_state,
 							 secrets_db_connect(mem_ctx, dce_call->conn->dce_ctx->lp_ctx));
 
 		name = r->in.name.string;
@@ -3099,39 +3096,39 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
 		ret = gendb_search(secret_state->sam_ldb, mem_ctx,
 				   ldb_dn_new(mem_ctx, secret_state->sam_ldb, "cn=LSA Secrets"),
 				   &msgs, attrs,
-				   "(&(cn=%s)(objectclass=secret))", 
+				   "(&(cn=%s)(objectclass=secret))",
 				   ldb_binary_encode_string(mem_ctx, name));
 		if (ret == 0) {
 			return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 		}
-		
+
 		if (ret != 1) {
-			DEBUG(0,("Found %d records matching CN=%s\n", 
+			DEBUG(0,("Found %d records matching CN=%s\n",
 				 ret, ldb_binary_encode_string(mem_ctx, name)));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
-	} 
+	}
 
 	secret_state->secret_dn = talloc_reference(secret_state, msgs[0]->dn);
-	
+
 	handle = dcesrv_handle_new(dce_call->context, LSA_HANDLE_SECRET);
 	if (!handle) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	
+
 	handle->data = talloc_steal(handle, secret_state);
-	
+
 	secret_state->access_mask = r->in.access_mask;
 	secret_state->policy = talloc_reference(secret_state, policy_state);
-	
+
 	*r->out.sec_handle = handle->wire_handle;
-	
+
 	return NT_STATUS_OK;
 }
 
 
-/* 
-  lsa_SetSecret 
+/*
+  lsa_SetSecret
 */
 static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			      struct lsa_SetSecret *r)
@@ -3171,24 +3168,24 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
 		/* Decrypt */
 		crypt_secret.data = r->in.old_val->data;
 		crypt_secret.length = r->in.old_val->size;
-		
+
 		status = sess_decrypt_blob(mem_ctx, &crypt_secret, &session_key, &secret);
 		if (!NT_STATUS_IS_OK(status)) {
 			return status;
 		}
-		
+
 		val.data = secret.data;
 		val.length = secret.length;
-		
+
 		/* set value */
 		if (ldb_msg_add_value(msg, "priorValue", &val, NULL) != LDB_SUCCESS) {
-			return NT_STATUS_NO_MEMORY; 
+			return NT_STATUS_NO_MEMORY;
 		}
-		
+
 		/* set old value mtime */
-		if (samdb_msg_add_uint64(secret_state->sam_ldb, 
+		if (samdb_msg_add_uint64(secret_state->sam_ldb,
 					 mem_ctx, msg, "priorSetTime", nt_now) != LDB_SUCCESS) {
-			return NT_STATUS_NO_MEMORY; 
+			return NT_STATUS_NO_MEMORY;
 		}
 
 	} else {
@@ -3202,47 +3199,46 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
 			"lastSetTime",
 			NULL
 		};
-		
+
 		/* search for the secret record */
 		ret = gendb_search_dn(secret_state->sam_ldb,mem_ctx,
 				      secret_state->secret_dn, &res, attrs);
 		if (ret == 0) {
 			return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 		}
-		
+
 		if (ret != 1) {
 			DEBUG(0,("Found %d records matching dn=%s\n", ret,
 				 ldb_dn_get_linearized(secret_state->secret_dn)));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
-		
+
 		old_val = ldb_msg_find_ldb_val(res[0], "currentValue");
 		last_set_time = ldb_msg_find_attr_as_uint64(res[0], "lastSetTime", 0);
-		
+
 		if (old_val) {
 			/* set old value */
 			if (ldb_msg_add_value(msg, "priorValue",
 					      old_val, NULL) != LDB_SUCCESS) {
-				return NT_STATUS_NO_MEMORY; 
+				return NT_STATUS_NO_MEMORY;
 			}
 		} else {
-			if (samdb_msg_add_delete(secret_state->sam_ldb, 
+			if (samdb_msg_add_delete(secret_state->sam_ldb,
 						 mem_ctx, msg, "priorValue") != LDB_SUCCESS) {
 				return NT_STATUS_NO_MEMORY;
 			}
-			
 		}
-		
+
 		/* set old value mtime */
 		if (ldb_msg_find_ldb_val(res[0], "lastSetTime")) {
-			if (samdb_msg_add_uint64(secret_state->sam_ldb, 
+			if (samdb_msg_add_uint64(secret_state->sam_ldb,
 						 mem_ctx, msg, "priorSetTime", last_set_time) != LDB_SUCCESS) {
-				return NT_STATUS_NO_MEMORY; 
+				return NT_STATUS_NO_MEMORY;
 			}
 		} else {
-			if (samdb_msg_add_uint64(secret_state->sam_ldb, 
+			if (samdb_msg_add_uint64(secret_state->sam_ldb,
 						 mem_ctx, msg, "priorSetTime", nt_now) != LDB_SUCCESS) {
-				return NT_STATUS_NO_MEMORY; 
+				return NT_STATUS_NO_MEMORY;
 			}
 		}
 	}
@@ -3251,33 +3247,32 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
 		/* Decrypt */
 		crypt_secret.data = r->in.new_val->data;
 		crypt_secret.length = r->in.new_val->size;
-		
+
 		status = sess_decrypt_blob(mem_ctx, &crypt_secret, &session_key, &secret);
 		if (!NT_STATUS_IS_OK(status)) {
 			return status;
 		}
-		
+
 		val.data = secret.data;
 		val.length = secret.length;
-		
+
 		/* set value */
 		if (ldb_msg_add_value(msg, "currentValue", &val, NULL) != LDB_SUCCESS) {
-			return NT_STATUS_NO_MEMORY; 
+			return NT_STATUS_NO_MEMORY;
 		}
-		
+
 		/* set new value mtime */
-		if (samdb_msg_add_uint64(secret_state->sam_ldb, 
+		if (samdb_msg_add_uint64(secret_state->sam_ldb,
 					 mem_ctx, msg, "lastSetTime", nt_now) != LDB_SUCCESS) {
-			return NT_STATUS_NO_MEMORY; 
+			return NT_STATUS_NO_MEMORY;
 		}
-		
 	} else {
 		/* NULL out the NEW value */
-		if (samdb_msg_add_uint64(secret_state->sam_ldb, 
+		if (samdb_msg_add_uint64(secret_state->sam_ldb,
 					 mem_ctx, msg, "lastSetTime", nt_now) != LDB_SUCCESS) {
-			return NT_STATUS_NO_MEMORY; 
+			return NT_STATUS_NO_MEMORY;
 		}
-		if (samdb_msg_add_delete(secret_state->sam_ldb, 
+		if (samdb_msg_add_delete(secret_state->sam_ldb,
 					 mem_ctx, msg, "currentValue") != LDB_SUCCESS) {
 			return NT_STATUS_NO_MEMORY;
 		}
@@ -3293,8 +3288,8 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
 }
 
 
-/* 
-  lsa_QuerySecret 
+/*
+  lsa_QuerySecret
 */
 static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				struct lsa_QuerySecret *r)
@@ -3310,7 +3305,7 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 		"currentValue",
 		"priorValue",
 		"lastSetTime",
-		"priorSetTime", 
+		"priorSetTime",
 		NULL
 	};
 
@@ -3338,12 +3333,12 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 	msg = res[0];
-	
+
 	nt_status = dcesrv_fetch_session_key(dce_call->conn, &session_key);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		return nt_status;
 	}
-	
+
 	if (r->in.old_val) {
 		const struct ldb_val *prior_val;
 		r->out.old_val = talloc_zero(mem_ctx, struct lsa_DATA_BUF_PTR);
@@ -3351,11 +3346,11 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 			return NT_STATUS_NO_MEMORY;
 		}
 		prior_val = ldb_msg_find_ldb_val(res[0], "priorValue");
-		
+
 		if (prior_val && prior_val->length) {
 			secret.data = prior_val->data;
 			secret.length = prior_val->length;
-		
+
 			/* Encrypt */
 			crypt_secret = sess_encrypt_blob(mem_ctx, &secret, &session_key);
 			if (!crypt_secret.length) {
@@ -3370,7 +3365,7 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 			r->out.old_val->buf->data = crypt_secret.data;
 		}
 	}
-	
+
 	if (r->in.old_mtime) {
 		r->out.old_mtime = talloc(mem_ctx, NTTIME);
 		if (!r->out.old_mtime) {
@@ -3378,7 +3373,7 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 		}
 		*r->out.old_mtime = ldb_msg_find_attr_as_uint64(res[0], "priorSetTime", 0);
 	}
-	
+
 	if (r->in.new_val) {
 		const struct ldb_val *new_val;
 		r->out.new_val = talloc_zero(mem_ctx, struct lsa_DATA_BUF_PTR);
@@ -3387,11 +3382,11 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 		}
 
 		new_val = ldb_msg_find_ldb_val(res[0], "currentValue");
-		
+
 		if (new_val && new_val->length) {
 			secret.data = new_val->data;
 			secret.length = new_val->length;
-		
+
 			/* Encrypt */
 			crypt_secret = sess_encrypt_blob(mem_ctx, &secret, &session_key);
 			if (!crypt_secret.length) {
@@ -3406,7 +3401,7 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 			r->out.new_val->buf->data = crypt_secret.data;
 		}
 	}
-	
+
 	if (r->in.new_mtime) {
 		r->out.new_mtime = talloc(mem_ctx, NTTIME);
 		if (!r->out.new_mtime) {
@@ -3414,15 +3409,15 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 		}
 		*r->out.new_mtime = ldb_msg_find_attr_as_uint64(res[0], "lastSetTime", 0);
 	}
-	
+
 	return NT_STATUS_OK;
 }
 
 
-/* 
+/*
   lsa_LookupPrivValue
 */
-static NTSTATUS dcesrv_lsa_LookupPrivValue(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_LookupPrivValue(struct dcesrv_call_state *dce_call,
 				    TALLOC_CTX *mem_ctx,
 				    struct lsa_LookupPrivValue *r)
 {
@@ -3442,14 +3437,14 @@ static NTSTATUS dcesrv_lsa_LookupPrivValue(struct dcesrv_call_state *dce_call,
 	r->out.luid->low = id;
 	r->out.luid->high = 0;
 
-	return NT_STATUS_OK;	
+	return NT_STATUS_OK;
 }
 
 
-/* 
-  lsa_LookupPrivName 
+/*
+  lsa_LookupPrivName
 */
-static NTSTATUS dcesrv_lsa_LookupPrivName(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_LookupPrivName(struct dcesrv_call_state *dce_call,
 				   TALLOC_CTX *mem_ctx,
 				   struct lsa_LookupPrivName *r)
 {
@@ -3480,14 +3475,14 @@ static NTSTATUS dcesrv_lsa_LookupPrivName(struct dcesrv_call_state *dce_call,
 
 	*r->out.name = name;
 
-	return NT_STATUS_OK;	
+	return NT_STATUS_OK;
 }
 
 
-/* 
+/*
   lsa_LookupPrivDisplayName
 */
-static NTSTATUS dcesrv_lsa_LookupPrivDisplayName(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_LookupPrivDisplayName(struct dcesrv_call_state *dce_call,
 					  TALLOC_CTX *mem_ctx,
 					  struct lsa_LookupPrivDisplayName *r)
 {
@@ -3522,10 +3517,10 @@ static NTSTATUS dcesrv_lsa_LookupPrivDisplayName(struct dcesrv_call_state *dce_c
 }
 
 
-/* 
+/*
   lsa_EnumAccountsWithUserRight
 */
-static NTSTATUS dcesrv_lsa_EnumAccountsWithUserRight(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_EnumAccountsWithUserRight(struct dcesrv_call_state *dce_call,
 					      TALLOC_CTX *mem_ctx,
 					      struct lsa_EnumAccountsWithUserRight *r)
 {
@@ -3542,14 +3537,14 @@ static NTSTATUS dcesrv_lsa_EnumAccountsWithUserRight(struct dcesrv_call_state *d
 
 	if (r->in.name == NULL) {
 		return NT_STATUS_NO_SUCH_PRIVILEGE;
-	} 
+	}
 
 	privname = r->in.name->string;
 	if (sec_privilege_id(privname) == SEC_PRIV_INVALID && sec_right_bit(privname) == 0) {
 		return NT_STATUS_NO_SUCH_PRIVILEGE;
 	}
 
-	ret = gendb_search(state->pdb, mem_ctx, NULL, &res, attrs, 
+	ret = gendb_search(state->pdb, mem_ctx, NULL, &res, attrs,
 			   "privilege=%s", privname);
 	if (ret < 0) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -3573,10 +3568,10 @@ static NTSTATUS dcesrv_lsa_EnumAccountsWithUserRight(struct dcesrv_call_state *d
 }
 
 
-/* 
+/*
   lsa_AddAccountRights
 */
-static NTSTATUS dcesrv_lsa_AddAccountRights(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_AddAccountRights(struct dcesrv_call_state *dce_call,
 				     TALLOC_CTX *mem_ctx,
 				     struct lsa_AddAccountRights *r)
 {
@@ -3587,16 +3582,16 @@ static NTSTATUS dcesrv_lsa_AddAccountRights(struct dcesrv_call_state *dce_call,
 
 	state = h->data;
 
-	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, state, 
+	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, state,
 					  LDB_FLAG_MOD_ADD,
 					  r->in.sid, r->in.rights);
 }
 
 
-/* 
+/*
   lsa_RemoveAccountRights
 */
-static NTSTATUS dcesrv_lsa_RemoveAccountRights(struct dcesrv_call_state *dce_call, 
+static NTSTATUS dcesrv_lsa_RemoveAccountRights(struct dcesrv_call_state *dce_call,
 					TALLOC_CTX *mem_ctx,
 					struct lsa_RemoveAccountRights *r)
 {
@@ -3607,13 +3602,13 @@ static NTSTATUS dcesrv_lsa_RemoveAccountRights(struct dcesrv_call_state *dce_cal
 
 	state = h->data;
 
-	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, state, 
+	return dcesrv_lsa_AddRemoveAccountRights(dce_call, mem_ctx, state,
 					  LDB_FLAG_MOD_DELETE,
 					  r->in.sid, r->in.rights);
 }
 
 
-/* 
+/*
   lsa_StorePrivateData
 */
 static NTSTATUS dcesrv_lsa_StorePrivateData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -3623,7 +3618,7 @@ static NTSTATUS dcesrv_lsa_StorePrivateData(struct dcesrv_call_state *dce_call,
 }
 
 
-/* 
+/*
   lsa_RetrievePrivateData
 */
 static NTSTATUS dcesrv_lsa_RetrievePrivateData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -3633,7 +3628,7 @@ static NTSTATUS dcesrv_lsa_RetrievePrivateData(struct dcesrv_call_state *dce_cal
 }
 
 
-/* 
+/*
   lsa_GetUserName
 */
 static NTSTATUS dcesrv_lsa_GetUserName(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -3725,7 +3720,7 @@ static void kdc_get_policy(struct loadparm_context *lp_ctx,
 	config option (the max skew), it would probably make more sense
 	to have a lp_ or ldb global option as the samba default */
 	if (smb_krb5_context) {
-		unix_to_nt_time(&k->clock_skew, 
+		unix_to_nt_time(&k->clock_skew,
 				krb5_get_max_time_skew(smb_krb5_context->krb5_context));
 	}
 #endif
@@ -3754,8 +3749,8 @@ static NTSTATUS dcesrv_lsa_QueryDomainInformationPolicy(struct dcesrv_call_state
 	{
 		struct lsa_DomainInfoKerberos *k = &info->kerberos_info;
 		struct smb_krb5_context *smb_krb5_context;
-		int ret = smb_krb5_init_context(mem_ctx, 
-							dce_call->event_ctx, 
+		int ret = smb_krb5_init_context(mem_ctx,
+							dce_call->event_ctx,
 							dce_call->conn->dce_ctx->lp_ctx,
 							&smb_krb5_context);
 		if (ret != 0) {
@@ -3797,8 +3792,8 @@ static NTSTATUS dcesrv_lsa_TestCall(struct dcesrv_call_state *dce_call,
 	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }
 
-/* 
-  lsa_CREDRWRITE 
+/*
+  lsa_CREDRWRITE
 */
 static NTSTATUS dcesrv_lsa_CREDRWRITE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRWRITE *r)
@@ -3807,8 +3802,8 @@ static NTSTATUS dcesrv_lsa_CREDRWRITE(struct dcesrv_call_state *dce_call, TALLOC
 }
 
 
-/* 
-  lsa_CREDRREAD 
+/*
+  lsa_CREDRREAD
 */
 static NTSTATUS dcesrv_lsa_CREDRREAD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRREAD *r)
@@ -3817,8 +3812,8 @@ static NTSTATUS dcesrv_lsa_CREDRREAD(struct dcesrv_call_state *dce_call, TALLOC_
 }
 
 
-/* 
-  lsa_CREDRENUMERATE 
+/*
+  lsa_CREDRENUMERATE
 */
 static NTSTATUS dcesrv_lsa_CREDRENUMERATE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRENUMERATE *r)
@@ -3827,8 +3822,8 @@ static NTSTATUS dcesrv_lsa_CREDRENUMERATE(struct dcesrv_call_state *dce_call, TA
 }
 
 
-/* 
-  lsa_CREDRWRITEDOMAINCREDENTIALS 
+/*
+  lsa_CREDRWRITEDOMAINCREDENTIALS
 */
 static NTSTATUS dcesrv_lsa_CREDRWRITEDOMAINCREDENTIALS(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRWRITEDOMAINCREDENTIALS *r)
@@ -3837,8 +3832,8 @@ static NTSTATUS dcesrv_lsa_CREDRWRITEDOMAINCREDENTIALS(struct dcesrv_call_state
 }
 
 
-/* 
-  lsa_CREDRREADDOMAINCREDENTIALS 
+/*
+  lsa_CREDRREADDOMAINCREDENTIALS
 */
 static NTSTATUS dcesrv_lsa_CREDRREADDOMAINCREDENTIALS(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRREADDOMAINCREDENTIALS *r)
@@ -3847,8 +3842,8 @@ static NTSTATUS dcesrv_lsa_CREDRREADDOMAINCREDENTIALS(struct dcesrv_call_state *
 }
 
 
-/* 
-  lsa_CREDRDELETE 
+/*
+  lsa_CREDRDELETE
 */
 static NTSTATUS dcesrv_lsa_CREDRDELETE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRDELETE *r)
@@ -3857,8 +3852,8 @@ static NTSTATUS dcesrv_lsa_CREDRDELETE(struct dcesrv_call_state *dce_call, TALLO
 }
 
 
-/* 
-  lsa_CREDRGETTARGETINFO 
+/*
+  lsa_CREDRGETTARGETINFO
 */
 static NTSTATUS dcesrv_lsa_CREDRGETTARGETINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRGETTARGETINFO *r)
@@ -3867,8 +3862,8 @@ static NTSTATUS dcesrv_lsa_CREDRGETTARGETINFO(struct dcesrv_call_state *dce_call
 }
 
 
-/* 
-  lsa_CREDRPROFILELOADED 
+/*
+  lsa_CREDRPROFILELOADED
 */
 static NTSTATUS dcesrv_lsa_CREDRPROFILELOADED(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRPROFILELOADED *r)
@@ -3877,8 +3872,8 @@ static NTSTATUS dcesrv_lsa_CREDRPROFILELOADED(struct dcesrv_call_state *dce_call
 }
 
 
-/* 
-  lsa_CREDRGETSESSIONTYPES 
+/*
+  lsa_CREDRGETSESSIONTYPES
 */
 static NTSTATUS dcesrv_lsa_CREDRGETSESSIONTYPES(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRGETSESSIONTYPES *r)
@@ -3887,8 +3882,8 @@ static NTSTATUS dcesrv_lsa_CREDRGETSESSIONTYPES(struct dcesrv_call_state *dce_ca
 }
 
 
-/* 
-  lsa_LSARREGISTERAUDITEVENT 
+/*
+  lsa_LSARREGISTERAUDITEVENT
 */
 static NTSTATUS dcesrv_lsa_LSARREGISTERAUDITEVENT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_LSARREGISTERAUDITEVENT *r)
@@ -3897,8 +3892,8 @@ static NTSTATUS dcesrv_lsa_LSARREGISTERAUDITEVENT(struct dcesrv_call_state *dce_
 }
 
 
-/* 
-  lsa_LSARGENAUDITEVENT 
+/*
+  lsa_LSARGENAUDITEVENT
 */
 static NTSTATUS dcesrv_lsa_LSARGENAUDITEVENT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_LSARGENAUDITEVENT *r)
@@ -3907,8 +3902,8 @@ static NTSTATUS dcesrv_lsa_LSARGENAUDITEVENT(struct dcesrv_call_state *dce_call,
 }
 
 
-/* 
-  lsa_LSARUNREGISTERAUDITEVENT 
+/*
+  lsa_LSARUNREGISTERAUDITEVENT
 */
 static NTSTATUS dcesrv_lsa_LSARUNREGISTERAUDITEVENT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_LSARUNREGISTERAUDITEVENT *r)
@@ -3917,8 +3912,8 @@ static NTSTATUS dcesrv_lsa_LSARUNREGISTERAUDITEVENT(struct dcesrv_call_state *dc
 }
 
 
-/* 
-  lsa_lsaRQueryForestTrustInformation 
+/*
+  lsa_lsaRQueryForestTrustInformation
 */
 static NTSTATUS dcesrv_lsa_lsaRQueryForestTrustInformation(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_lsaRQueryForestTrustInformation *r)
@@ -4478,8 +4473,8 @@ static NTSTATUS dcesrv_lsa_lsaRSetForestTrustInformation(struct dcesrv_call_stat
 	return NT_STATUS_OK;
 }
 
-/* 
-  lsa_CREDRRENAME 
+/*
+  lsa_CREDRRENAME
 */
 static NTSTATUS dcesrv_lsa_CREDRRENAME(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_CREDRRENAME *r)
@@ -4489,8 +4484,8 @@ static NTSTATUS dcesrv_lsa_CREDRRENAME(struct dcesrv_call_state *dce_call, TALLO
 
 
 
-/* 
-  lsa_LSAROPENPOLICYSCE 
+/*
+  lsa_LSAROPENPOLICYSCE
 */
 static NTSTATUS dcesrv_lsa_LSAROPENPOLICYSCE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_LSAROPENPOLICYSCE *r)
@@ -4499,8 +4494,8 @@ static NTSTATUS dcesrv_lsa_LSAROPENPOLICYSCE(struct dcesrv_call_state *dce_call,
 }
 
 
-/* 
-  lsa_LSARADTREGISTERSECURITYEVENTSOURCE 
+/*
+  lsa_LSARADTREGISTERSECURITYEVENTSOURCE
 */
 static NTSTATUS dcesrv_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE *r)
@@ -4509,8 +4504,8 @@ static NTSTATUS dcesrv_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(struct dcesrv_call
 }
 
 
-/* 
-  lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE 
+/*
+  lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE
 */
 static NTSTATUS dcesrv_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE *r)
@@ -4519,8 +4514,8 @@ static NTSTATUS dcesrv_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(struct dcesrv_ca
 }
 
 
-/* 
-  lsa_LSARADTREPORTSECURITYEVENT 
+/*
+  lsa_LSARADTREPORTSECURITYEVENT
 */
 static NTSTATUS dcesrv_lsa_LSARADTREPORTSECURITYEVENT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct lsa_LSARADTREPORTSECURITYEVENT *r)
@@ -4541,8 +4536,8 @@ replies are the correct implementation. Do
 not try and fill these in with anything else
 ******************************************/
 
-/* 
-  dssetup_DsRoleDnsNameToFlatName 
+/*
+  dssetup_DsRoleDnsNameToFlatName
 */
 static WERROR dcesrv_dssetup_DsRoleDnsNameToFlatName(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					struct dssetup_DsRoleDnsNameToFlatName *r)
@@ -4551,8 +4546,8 @@ static WERROR dcesrv_dssetup_DsRoleDnsNameToFlatName(struct dcesrv_call_state *d
 }
 
 
-/* 
-  dssetup_DsRoleDcAsDc 
+/*
+  dssetup_DsRoleDcAsDc
 */
 static WERROR dcesrv_dssetup_DsRoleDcAsDc(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			     struct dssetup_DsRoleDcAsDc *r)
@@ -4561,8 +4556,8 @@ static WERROR dcesrv_dssetup_DsRoleDcAsDc(struct dcesrv_call_state *dce_call, TA
 }
 
 
-/* 
-  dssetup_DsRoleDcAsReplica 
+/*
+  dssetup_DsRoleDcAsReplica
 */
 static WERROR dcesrv_dssetup_DsRoleDcAsReplica(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				  struct dssetup_DsRoleDcAsReplica *r)
@@ -4571,8 +4566,8 @@ static WERROR dcesrv_dssetup_DsRoleDcAsReplica(struct dcesrv_call_state *dce_cal
 }
 
 
-/* 
-  dssetup_DsRoleDemoteDc 
+/*
+  dssetup_DsRoleDemoteDc
 */
 static WERROR dcesrv_dssetup_DsRoleDemoteDc(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 			       struct dssetup_DsRoleDemoteDc *r)
@@ -4581,8 +4576,8 @@ static WERROR dcesrv_dssetup_DsRoleDemoteDc(struct dcesrv_call_state *dce_call,
 }
 
 
-/* 
-  dssetup_DsRoleGetDcOperationProgress 
+/*
+  dssetup_DsRoleGetDcOperationProgress
 */
 static WERROR dcesrv_dssetup_DsRoleGetDcOperationProgress(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					     struct dssetup_DsRoleGetDcOperationProgress *r)
@@ -4611,8 +4606,8 @@ static WERROR dcesrv_dssetup_DsRoleCancel(struct dcesrv_call_state *dce_call, TA
 }
 
 
-/* 
-  dssetup_DsRoleServerSaveStateForUpgrade 
+/*
+  dssetup_DsRoleServerSaveStateForUpgrade
 */
 static WERROR dcesrv_dssetup_DsRoleServerSaveStateForUpgrade(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 						struct dssetup_DsRoleServerSaveStateForUpgrade *r)
@@ -4621,8 +4616,8 @@ static WERROR dcesrv_dssetup_DsRoleServerSaveStateForUpgrade(struct dcesrv_call_
 }
 
 
-/* 
-  dssetup_DsRoleUpgradeDownlevelServer 
+/*
+  dssetup_DsRoleUpgradeDownlevelServer
 */
 static WERROR dcesrv_dssetup_DsRoleUpgradeDownlevelServer(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					     struct dssetup_DsRoleUpgradeDownlevelServer *r)
@@ -4631,8 +4626,8 @@ static WERROR dcesrv_dssetup_DsRoleUpgradeDownlevelServer(struct dcesrv_call_sta
 }
 
 
-/* 
-  dssetup_DsRoleAbortDownlevelServerUpgrade 
+/*
+  dssetup_DsRoleAbortDownlevelServerUpgrade
 */
 static WERROR dcesrv_dssetup_DsRoleAbortDownlevelServerUpgrade(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 						  struct dssetup_DsRoleAbortDownlevelServerUpgrade *r)
@@ -4647,7 +4642,7 @@ static WERROR dcesrv_dssetup_DsRoleAbortDownlevelServerUpgrade(struct dcesrv_cal
 NTSTATUS dcerpc_server_lsa_init(void)
 {
 	NTSTATUS ret;
-	
+
 	ret = dcerpc_server_dssetup_init();
 	if (!NT_STATUS_IS_OK(ret)) {
 		return ret;