Revert "s3:libsmb: remove unused show_sessetup handling from do_connect()"
authorStefan Metzmacher <metze@samba.org>
Fri, 23 Jun 2017 15:13:59 +0000 (17:13 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 18 Feb 2019 11:47:34 +0000 (12:47 +0100)
This reverts commit b6f66cf85fafa08aed5692d76940908854310e93.

source3/libsmb/clidfs.c

index 4342a3b1d1b20065b9684101efa7876f5f418e48..d49c48859fff9dae90d081b2cd1e83bed0a71ac2 100644 (file)
@@ -135,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,
@@ -259,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
@@ -272,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);
        }
@@ -338,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)) {