svn commit: samba r11948 - in trunk/source/passdb: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-11-28 21:26:22 +0000 (Mon, 28 Nov 2005)
New Revision: 11948

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

Log:
Revert an accidential commit
Modified:
   trunk/source/passdb/passdb.c


Changeset:
Modified: trunk/source/passdb/passdb.c
===================================================================
--- trunk/source/passdb/passdb.c	2005-11-28 20:42:18 UTC (rev 11947)
+++ trunk/source/passdb/passdb.c	2005-11-28 21:26:22 UTC (rev 11948)
@@ -874,13 +874,11 @@
 	
 	become_root();
 	if (pdb_getsampwnam(sam_account, user)) {
-		uint16 acct;
 		const DOM_SID *user_sid;
 
 		unbecome_root();
 
 		user_sid = pdb_get_user_sid(sam_account);
-		acct = pdb_get_acct_ctrl(sam_account);
 
 		if (!sid_check_is_in_our_domain(user_sid)) {
 			DEBUG(0, ("User %s with invalid SID %s in passdb\n",
@@ -889,13 +887,7 @@
 		}
 
 		sid_peek_rid(user_sid, rid);
-
-		if (acct & (ACB_DOMTRUST|ACB_WSTRUST|ACB_SRVTRUST)) {
-			/* We need to filter out these in lsa_lookupnames. */
-			*type = SID_NAME_COMPUTER;
-		} else {
-			*type = SID_NAME_USER;
-		}
+		*type = SID_NAME_USER;
 		pdb_free_sam(&sam_account);
 		return True;
 	}