svn commit: samba r12432 - in branches/SAMBA_4_0/source/rpc_server/samr: .

abartlet at samba.org abartlet at samba.org
Thu Dec 22 11:26:13 GMT 2005


Author: abartlet
Date: 2005-12-22 11:26:12 +0000 (Thu, 22 Dec 2005)
New Revision: 12432

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

Log:
Re-indent and consistantly cancel the transaction.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2005-12-22 11:13:05 UTC (rev 12431)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2005-12-22 11:26:12 UTC (rev 12432)
@@ -846,11 +846,18 @@
 	}
 	sid = samdb_result_dom_sid(mem_ctx, msgs[0], "objectSid");
 	if (sid == NULL) {
+		ldb_transaction_cancel(d_state->sam_ctx);
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
+	/* Change the account control to be the correct account type.
+	 * The default is for a workstation account */
 	user_account_control = samdb_result_uint(msgs[0], "userAccountControl", 0);
-	user_account_control = (user_account_control & ~(UF_NORMAL_ACCOUNT|UF_INTERDOMAIN_TRUST_ACCOUNT|UF_WORKSTATION_TRUST_ACCOUNT|UF_SERVER_TRUST_ACCOUNT));
+	user_account_control = (user_account_control & 
+				~(UF_NORMAL_ACCOUNT |
+				  UF_INTERDOMAIN_TRUST_ACCOUNT | 
+				  UF_WORKSTATION_TRUST_ACCOUNT | 
+				  UF_SERVER_TRUST_ACCOUNT));
 	user_account_control |= samdb_acb2uf(r->in.acct_flags);
 
 	talloc_free(msg);



More information about the samba-cvs mailing list