svn commit: samba r17160 - in branches/SAMBA_3_0_23/source/auth: .

[jerry at samba.org]

Author: jerry
Date: 2006-07-20 19:15:49 +0000 (Thu, 20 Jul 2006)
New Revision: 17160

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

Log:
merge r17022 from SAMBA_3_0.  Thansk to Thomas Bork for pointing this out
Modified:
   branches/SAMBA_3_0_23/source/auth/auth_util.c


Changeset:
Modified: branches/SAMBA_3_0_23/source/auth/auth_util.c
===================================================================
--- branches/SAMBA_3_0_23/source/auth/auth_util.c	2006-07-20 18:02:51 UTC (rev 17159)
+++ branches/SAMBA_3_0_23/source/auth/auth_util.c	2006-07-20 19:15:49 UTC (rev 17160)
@@ -955,7 +955,8 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (server_info->was_mapped) {
+	if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) || 
+		server_info->was_mapped) {
 		status = create_token_from_username(server_info,
 						    server_info->unix_name,
 						    server_info->guest,