summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-07-01 17:56:32 +0000
committerGerald Carter <jerry@samba.org>2006-07-01 17:56:32 +0000
commit0cf0d51f29dedc6ce3ee9866a2b228b7e33ad230 (patch)
treee0d9c195db8270ecda6a72f93641d4b0a39c5de5
parentdde0e6e65e25d3dcbf306b70b871fbbded82a582 (diff)
downloadsamba-0cf0d51f29dedc6ce3ee9866a2b228b7e33ad230.tar.gz
r16750: merge fix for BUG 3905
-rw-r--r--WHATSNEW.txt2
-rw-r--r--source/auth/auth_util.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index f69e950ddb0..bfd86802f22 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -176,6 +176,8 @@ o Gerald (Jerry) Carter <jerry@samba.org>
* 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@samba.org>
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 0401e02b7d4..df4a4e1b388 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -876,9 +876,10 @@ static struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
}
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)));
}
}
}