Revert "Don't re-initialize a token when we already have one. This fixes the build...

This reverts commit a90648e905aebc98c78897adf76729bea269cedf.

diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index 98594b0769f80215a9a97da6f68f6cd96081aa70..33a54dd0deeade52de0317eb8c81771d715543d5 100644 (file)
--- 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 cd05c361ce8cc8d4fbb6e5900b4b9c5f68791d4d..ab8287a01a170f68fd419171e9a9d1e1ef7552ef 100644 (file)
--- 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, ""))) {