svn commit: samba r24990 - in branches: SAMBA_3_2/source/passdb SAMBA_3_2_0/source/passdb

[obnox at samba.org]

Author: obnox
Date: 2007-09-07 08:54:48 +0000 (Fri, 07 Sep 2007)
New Revision: 24990

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24990

Log:
Kill an incredible amount of trailing whitespaces...
Further reformat get_trust_pw to conform to coding rules.

Michael


Modified:
   branches/SAMBA_3_2/source/passdb/passdb.c
   branches/SAMBA_3_2_0/source/passdb/passdb.c


Changeset:
Modified: branches/SAMBA_3_2/source/passdb/passdb.c
===================================================================
--- branches/SAMBA_3_2/source/passdb/passdb.c	2007-09-07 08:13:02 UTC (rev 24989)
+++ branches/SAMBA_3_2/source/passdb/passdb.c	2007-09-07 08:54:48 UTC (rev 24990)
@@ -1527,28 +1527,31 @@
 	DOM_SID sid;
 	char *pwd;
 	time_t last_set_time;
-                                                                                                                     
+
 	/* if we are a DC and this is not our domain, then lookup an account
 		for the domain trust */
-                                                                                                                     
-	if ( IS_DC && !strequal(domain, lp_workgroup()) && lp_allow_trusted_domains() ) {
-		if (!pdb_get_trusteddom_pw(domain, &pwd, &sid, &last_set_time)) {
+
+	if (IS_DC && !strequal(domain, lp_workgroup()) &&
+	    lp_allow_trusted_domains())
+	{
+		if (!pdb_get_trusteddom_pw(domain, &pwd, &sid, &last_set_time))
+		{
 			DEBUG(0, ("get_trust_pw: could not fetch trust "
 				"account password for trusted domain %s\n",
 				domain));
 			return False;
 		}
-                                                                                                                     
+
 		*channel = SEC_CHAN_DOMAIN;
 		E_md4hash(pwd, ret_pwd);
 		SAFE_FREE(pwd);
 
 		return True;
 	}
-                                                                                                                     
+
 	/* Just get the account for the requested domain. In the future this
 	 * might also cover to be member of more than one domain. */
-                                                                                                                     
+
 	if (secrets_fetch_trust_account_password(domain, ret_pwd,
 						&last_set_time, channel))
 		return True;
@@ -1558,4 +1561,3 @@
 	return False;
 }
 
-/* END */

Modified: branches/SAMBA_3_2_0/source/passdb/passdb.c
===================================================================
--- branches/SAMBA_3_2_0/source/passdb/passdb.c	2007-09-07 08:13:02 UTC (rev 24989)
+++ branches/SAMBA_3_2_0/source/passdb/passdb.c	2007-09-07 08:54:48 UTC (rev 24990)
@@ -1527,28 +1527,31 @@
 	DOM_SID sid;
 	char *pwd;
 	time_t last_set_time;
-                                                                                                                     
+
 	/* if we are a DC and this is not our domain, then lookup an account
 		for the domain trust */
-                                                                                                                     
-	if ( IS_DC && !strequal(domain, lp_workgroup()) && lp_allow_trusted_domains() ) {
-		if (!pdb_get_trusteddom_pw(domain, &pwd, &sid, &last_set_time)) {
+
+	if (IS_DC && !strequal(domain, lp_workgroup()) &&
+	    lp_allow_trusted_domains())
+	{
+		if (!pdb_get_trusteddom_pw(domain, &pwd, &sid, &last_set_time))
+		{
 			DEBUG(0, ("get_trust_pw: could not fetch trust "
 				"account password for trusted domain %s\n",
 				domain));
 			return False;
 		}
-                                                                                                                     
+
 		*channel = SEC_CHAN_DOMAIN;
 		E_md4hash(pwd, ret_pwd);
 		SAFE_FREE(pwd);
 
 		return True;
 	}
-                                                                                                                     
+
 	/* Just get the account for the requested domain. In the future this
 	 * might also cover to be member of more than one domain. */
-                                                                                                                     
+
 	if (secrets_fetch_trust_account_password(domain, ret_pwd,
 						&last_set_time, channel))
 		return True;
@@ -1558,4 +1561,3 @@
 	return False;
 }
 
-/* END */