Revert "s3:libsmb: remove unused show_sessetup handling from do_connect()"

[metze/samba/wip.git] / source3 / libsmb / clidfs.c

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index b740007f675348f5f40b452483d06ae30f8c242d..d49c48859fff9dae90d081b2cd1e83bed0a71ac2 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -26,6 +26,7 @@
 #include "trans2.h"
 #include "libsmb/nmblib.h"
 #include "../libcli/smb/smbXcli_base.h"
+#include "auth/credentials/credentials.h"
 
 /********************************************************************
  Important point.
@@ -134,6 +135,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                                        const char *server,
                                        const char *share,
                                        const struct user_auth_info *auth_info,
+                                       bool show_sessetup,
                                        bool force_encrypt,
                                        int max_protocol,
                                        int port,
@@ -144,11 +146,9 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
        char *servicename;
        char *sharename;
        char *newserver, *newshare;
-       const char *username;
-       const char *password;
-       const char *domain;
        NTSTATUS status;
        int flags = 0;
+       enum protocol_types protocol = PROTOCOL_NONE;
        int signing_state = get_cmdline_auth_info_signing_state(auth_info);
        struct cli_credentials *creds = NULL;
 
@@ -197,14 +197,18 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                flags, &c);
 
        if (!NT_STATUS_IS_OK(status)) {
-               d_printf("Connection to %s failed (Error %s)\n",
-                               server,
-                               nt_errstr(status));
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+                       DBG_ERR("NetBIOS support disabled, unable to connect");
+               }
+
+               DBG_WARNING("Connection to %s failed (Error %s)\n",
+                           server,
+                           nt_errstr(status));
                return status;
        }
 
        if (max_protocol == 0) {
-               max_protocol = PROTOCOL_NT1;
+               max_protocol = PROTOCOL_LATEST;
        }
        DEBUG(4,(" session request ok\n"));
 
@@ -218,27 +222,25 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                cli_shutdown(c);
                return status;
        }
+       protocol = smbXcli_conn_protocol(c->conn);
+       DEBUG(4,(" negotiated dialect[%s] against server[%s]\n",
+                smb_protocol_types_string(protocol),
+                smbXcli_conn_remote_name(c->conn)));
 
-       if (smbXcli_conn_protocol(c->conn) >= PROTOCOL_SMB2_02) {
+       if (protocol >= PROTOCOL_SMB2_02) {
                /* Ensure we ask for some initial credits. */
                smb2cli_conn_set_max_credits(c->conn, DEFAULT_SMB2_MAX_CREDITS);
        }
 
-       username = get_cmdline_auth_info_username(auth_info);
-       password = get_cmdline_auth_info_password(auth_info);
-       domain = get_cmdline_auth_info_domain(auth_info);
-       if ((domain == NULL) || (domain[0] == '\0')) {
-               domain = lp_workgroup();
-       }
-
        creds = get_cmdline_auth_info_creds(auth_info);
 
        status = cli_session_setup_creds(c, creds);
        if (!NT_STATUS_IS_OK(status)) {
                /* If a password was not supplied then
                 * try again with a null username. */
-               if (password[0] || !username[0] ||
-                       get_cmdline_auth_info_use_kerberos(auth_info) ||
+               if (force_encrypt || smbXcli_conn_signing_mandatory(c->conn) ||
+                       cli_credentials_authentication_requested(creds) ||
+                       cli_credentials_is_anonymous(creds) ||
                        !NT_STATUS_IS_OK(status = cli_session_setup_anon(c)))
                {
                        d_printf("session setup failed: %s\n",
@@ -258,6 +260,15 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                return status;
        }
 
+       if ( show_sessetup ) {
+               if (*c->server_domain) {
+                       DEBUG(0,("Domain=[%s] OS=[%s] Server=[%s]\n",
+                               c->server_domain,c->server_os,c->server_type));
+               } else if (*c->server_os || *c->server_type) {
+                       DEBUG(0,("OS=[%s] Server=[%s]\n",
+                                c->server_os,c->server_type));
+               }
+       }
        DEBUG(4,(" session setup ok\n"));
 
        /* here's the fun part....to support 'msdfs proxy' shares
@@ -271,7 +282,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                                force_encrypt, creds)) {
                cli_shutdown(c);
                return do_connect(ctx, newserver,
-                               newshare, auth_info,
+                               newshare, auth_info, false,
                                force_encrypt, max_protocol,
                                port, name_type, pcli);
        }
@@ -337,7 +348,7 @@ static NTSTATUS cli_cm_connect(TALLOC_CTX *ctx,
 
        status = do_connect(ctx, server, share,
                                auth_info,
-                               force_encrypt, max_protocol,
+                               show_hdr, force_encrypt, max_protocol,
                                port, name_type, &cli);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -990,7 +1001,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
                             smbXcli_conn_remote_name(rootcli->conn),
                             "IPC$",
                             dfs_auth_info,
-                            smb1cli_conn_encryption_on(rootcli->conn),
+                            cli_state_is_encryption_on(rootcli),
                             smbXcli_conn_protocol(rootcli->conn),
                             0,
                             0x20,
@@ -1047,7 +1058,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
                                dfs_refs[count].server,
                                dfs_refs[count].share,
                                dfs_auth_info,
-                               smb1cli_conn_encryption_on(rootcli->conn),
+                               cli_state_is_encryption_on(rootcli),
                                smbXcli_conn_protocol(rootcli->conn),
                                0,
                                0x20,