Index: auth/auth_util.c
===================================================================
--- auth/auth_util.c	(revision 17377)
+++ auth/auth_util.c	(working copy)
@@ -955,8 +955,8 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) || 
-		server_info->was_mapped) {
+	if ((lp_server_role() == ROLE_DOMAIN_MEMBER) &&
+			(server_info->was_mapped || !winbind_ping())) {
 		status = create_token_from_username(server_info,
 						    server_info->unix_name,
 						    server_info->guest,