[SCM] Samba Shared Repository - branch v3-devel updated -
release-3-2-0pre2-3808-gdca8277
Jeremy Allison
jra at samba.org
Fri Aug 22 20:51:31 GMT 2008
The branch, v3-devel has been updated
via dca827791276906436452c650062164eb819dfe0 (commit)
from 25293ba1507f8f8fa7e33c302200184e980bb123 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -----------------------------------------------------------------
commit dca827791276906436452c650062164eb819dfe0
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 22 13:49:46 2008 -0700
Don't re-initialize a token when we already have one. This fixes the build farm failures when winbindd connects as guest.
This one took a *lot* of tracking down :-).
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/sesssetup.c | 23 +++++++++++++----------
source/winbindd/winbindd_cm.c | 3 +++
2 files changed, 16 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index 041596b..9c9d0a9 100644
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -1738,16 +1738,19 @@ void reply_sesssetup_and_X(struct smb_request *req)
return;
}
- nt_status = create_local_token(server_info);
- if (!NT_STATUS_IS_OK(nt_status)) {
- DEBUG(10, ("create_local_token failed: %s\n",
- nt_errstr(nt_status)));
- data_blob_free(&nt_resp);
- data_blob_free(&lm_resp);
- data_blob_clear_free(&plaintext_password);
- reply_nterror(req, nt_status_squash(nt_status));
- END_PROFILE(SMBsesssetupX);
- return;
+ if (!server_info->ptok) {
+ nt_status = create_local_token(server_info);
+
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ DEBUG(10, ("create_local_token failed: %s\n",
+ nt_errstr(nt_status)));
+ data_blob_free(&nt_resp);
+ data_blob_free(&lm_resp);
+ data_blob_clear_free(&plaintext_password);
+ reply_nterror(req, nt_status_squash(nt_status));
+ END_PROFILE(SMBsesssetupX);
+ return;
+ }
}
data_blob_clear_free(&plaintext_password);
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index 6db45f7..a8c0166 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -937,6 +937,9 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
anon_fallback:
/* Fall back to anonymous connection, this might fail later */
+ DEBUG(10,("cm_prepare_connection: falling back to anonymous "
+ "connection for DC %s\n",
+ controller ));
if (NT_STATUS_IS_OK(cli_session_setup(*cli, "", NULL, 0,
NULL, 0, ""))) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list