diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-08-27 10:35:51 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-08-27 10:35:51 +0200 |
| commit | 52428c8ba8f4f73e648696cae3136884e94575d7 (patch) | |
| tree | 278248703f0d087b07739e0f654616afc5cad1e3 | |
| parent | a90648e905aebc98c78897adf76729bea269cedf (diff) | |
| download | samba-52428c8ba8f4f73e648696cae3136884e94575d7.tar.gz | |
Revert "Don't re-initialize a token when we already have one. This fixes the build farm failures when winbindd connects as guest."
This reverts commit a90648e905aebc98c78897adf76729bea269cedf.
| -rw-r--r-- | source/smbd/sesssetup.c | 23 | ||||
| -rw-r--r-- | source/winbindd/winbindd_cm.c | 3 |
2 files changed, 10 insertions, 16 deletions
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c index 98594b0769f..33a54dd0dee 100644 --- a/source/smbd/sesssetup.c +++ b/source/smbd/sesssetup.c @@ -1735,19 +1735,16 @@ void reply_sesssetup_and_X(struct smb_request *req) 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; - } + 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->user_session_key.data) { diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c index cd05c361ce8..ab8287a01a1 100644 --- a/source/winbindd/winbindd_cm.c +++ b/source/winbindd/winbindd_cm.c @@ -908,9 +908,6 @@ 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, ""))) { |