svn commit: samba r16750 - in branches/SAMBA_3_0_RELEASE: . source/auth

[jerry at samba.org]

Author: jerry
Date: 2006-07-01 17:56:32 +0000 (Sat, 01 Jul 2006)
New Revision: 16750

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

Log:
merge fix for BUG 3905
Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-07-01 17:55:07 UTC (rev 16749)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-07-01 17:56:32 UTC (rev 16750)
@@ -176,6 +176,8 @@
     * Fix a crash in the printer publishing code when adding a 
       new printer via the APW.
     * Fix broken compile of unsupported smbwrapper utility.
+    * BUG 3905: Fix smbd startup failure caused by a failure to
+      create an NT token for the guest account.
 
 
 o   Guenther Deschner <gd at samba.org>

Modified: branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c	2006-07-01 17:55:07 UTC (rev 16749)
+++ branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c	2006-07-01 17:56:32 UTC (rev 16750)
@@ -876,9 +876,10 @@
 		}
 		else {
 			status = add_builtin_administrators( tmp_ctx, result );	
-			if ( !NT_STATUS_IS_OK(status) ) {			
-				result = NULL;
-				goto done;
+			if ( !NT_STATUS_IS_OK(status) ) {
+				/* just log a complaint but do not fail */
+				DEBUG(3,("create_local_nt_token: failed to check for local Administrators"
+					" membership (%s)\n", nt_errstr(status)));
 			}			
 		}		
 	}