libsmbclient: Allow server (NetApp) to return STATUS_INVALID_PARAMETER from an echo.
[nivanova/samba-autobuild/.git] / source3 / libsmb / libsmb_server.c
index 70e0d57273a6f2496e669c6d7c1ca990363e0b9c..e6067be2013025b8517fef912e44c548cb807d75 100644 (file)
@@ -1,54 +1,86 @@
-/* 
+/*
    Unix SMB/Netbios implementation.
    SMB client library implementation
    Copyright (C) Andrew Tridgell 1998
    Copyright (C) Richard Sharpe 2000, 2002
    Copyright (C) John Terpstra 2000
-   Copyright (C) Tom Jansen (Ninja ISD) 2002 
+   Copyright (C) Tom Jansen (Ninja ISD) 2002
    Copyright (C) Derrell Lipman 2003-2008
    Copyright (C) Jeremy Allison 2007, 2008
-   
+   Copyright (C) SATOH Fumiyasu <fumiyas@osstech.co.jp> 2009.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_pipe.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "libcli/security/security.h"
+#include "libsmb/nmblib.h"
+#include "../libcli/smb/smbXcli_base.h"
 
-
-/* 
+/*
  * Check a server for being alive and well.
- * returns 0 if the server is in shape. Returns 1 on error 
- * 
+ * returns 0 if the server is in shape. Returns 1 on error
+ *
  * Also useable outside libsmbclient to enable external cache
  * to do some checks too.
  */
 int
 SMBC_check_server(SMBCCTX * context,
-                  SMBCSRV * server) 
+                  SMBCSRV * server)
 {
-        socklen_t size;
-        struct sockaddr addr;
+       time_t now;
+
+       if (!cli_state_is_connected(server->cli)) {
+               return 1;
+       }
+
+       now = time_mono(NULL);
 
-        size = sizeof(addr);
-        return (getpeername(server->cli->fd, &addr, &size) == -1);
+       if (server->last_echo_time == (time_t)0 ||
+                       now > server->last_echo_time +
+                               (server->cli->timeout/1000)) {
+               unsigned char data[16] = {0};
+               NTSTATUS status = cli_echo(server->cli,
+                                       1,
+                                       data_blob_const(data, sizeof(data)));
+               if (!NT_STATUS_IS_OK(status)) {
+                       /*
+                        * Some NetApp servers return
+                        * NT_STATUS_INVALID_PARAMETER.That's OK, they still
+                        * replied.
+                        * BUG: https://bugzilla.samba.org/show_bug.cgi?id=13007
+                        */
+                       if (!NT_STATUS_EQUAL(status,
+                                       NT_STATUS_INVALID_PARAMETER)) {
+                               return 1;
+                       }
+               }
+               server->last_echo_time = now;
+       }
+       return 0;
 }
 
-/* 
+/*
  * Remove a server from the cached server list it's unused.
  * On success, 0 is returned. 1 is returned if the server could not be removed.
- * 
+ *
  * Also useable outside libsmbclient
  */
 int
@@ -61,7 +93,7 @@ SMBC_remove_unused_server(SMBCCTX * context,
        if (!context || !context->internal->initialized || !srv) {
                 return 1;
         }
-       
+
        /* Check all open files/directories for a relation with this server */
        for (file = context->internal->files; file; file = file->next) {
                if (file->srv == srv) {
@@ -80,7 +112,7 @@ SMBC_remove_unused_server(SMBCCTX * context,
 
        DEBUG(3, ("smbc_remove_usused_server: %p removed.\n", srv));
 
-       (context->cache.remove_cached_server_fn)(context, srv);
+       smbc_getFunctionRemoveCachedServer(context)(context, srv);
 
         SAFE_FREE(srv);
        return 0;
@@ -89,7 +121,7 @@ SMBC_remove_unused_server(SMBCCTX * context,
 /****************************************************************
  * Call the auth_fn with fixed size (fstring) buffers.
  ***************************************************************/
-void
+static void
 SMBC_call_auth_fn(TALLOC_CTX *ctx,
                   SMBCCTX *context,
                   const char *server,
@@ -98,19 +130,38 @@ SMBC_call_auth_fn(TALLOC_CTX *ctx,
                   char **pp_username,
                   char **pp_password)
 {
-       fstring workgroup;
-       fstring username;
-       fstring password;
+       fstring workgroup = { 0 };
+       fstring username = { 0 };
+       fstring password = { 0 };
+        smbc_get_auth_data_with_context_fn auth_with_context_fn;
 
-       strlcpy(workgroup, *pp_workgroup, sizeof(workgroup));
-       strlcpy(username, *pp_username, sizeof(username));
-       strlcpy(password, *pp_password, sizeof(password));
+       if (*pp_workgroup != NULL) {
+               strlcpy(workgroup, *pp_workgroup, sizeof(workgroup));
+       }
+       if (*pp_username != NULL) {
+               strlcpy(username, *pp_username, sizeof(username));
+       }
+       if (*pp_password != NULL) {
+               strlcpy(password, *pp_password, sizeof(password));
+       }
 
-        (context->server.get_auth_data_fn)(
-                server, share,
-                workgroup, sizeof(workgroup),
-                username, sizeof(username),
-                password, sizeof(password));
+        /* See if there's an authentication with context function provided */
+        auth_with_context_fn = smbc_getFunctionAuthDataWithContext(context);
+        if (auth_with_context_fn)
+        {
+            (* auth_with_context_fn)(context,
+                                     server, share,
+                                     workgroup, sizeof(workgroup),
+                                     username, sizeof(username),
+                                     password, sizeof(password));
+        }
+        else
+        {
+            smbc_getFunctionAuthData(context)(server, share,
+                                              workgroup, sizeof(workgroup),
+                                              username, sizeof(username),
+                                              password, sizeof(password));
+        }
 
        TALLOC_FREE(*pp_workgroup);
        TALLOC_FREE(*pp_username);
@@ -145,21 +196,21 @@ SMBC_find_server(TALLOC_CTX *ctx,
         SMBCSRV *srv;
         int auth_called = 0;
 
- check_server_cache:
+        if (!pp_workgroup || !pp_username || !pp_password) {
+                return NULL;
+        }
 
-       srv = (context->cache.get_cached_server_fn)(context,
-                                                    server, share,
-                                                    *pp_workgroup,
-                                                    *pp_username);
+check_server_cache:
+
+       srv = smbc_getFunctionGetCachedServer(context)(context,
+                                                       server, share,
+                                                       *pp_workgroup,
+                                                       *pp_username);
 
        if (!auth_called && !srv && (!*pp_username || !(*pp_username)[0] ||
-                               !*pp_password || !(*pp_password)[0])) {
+                                     !*pp_password || !(*pp_password)[0])) {
                SMBC_call_auth_fn(ctx, context, server, share,
-                               pp_workgroup, pp_username, pp_password);
-
-               if (!pp_workgroup || !pp_username || !pp_password) {
-                       return NULL;
-               }
+                                  pp_workgroup, pp_username, pp_password);
 
                /*
                  * However, smbc_auth_fn may have picked up info relating to
@@ -172,22 +223,22 @@ SMBC_find_server(TALLOC_CTX *ctx,
        }
 
        if (srv) {
-               if ((context->server.check_server_fn)(context, srv)) {
+               if (smbc_getFunctionCheckServer(context)(context, srv)) {
                        /*
                          * This server is no good anymore
                          * Try to remove it and check for more possible
                          * servers in the cache
                          */
-                       if ((context->server.remove_unused_server_fn)(context,
-                                                                      srv)) { 
+                       if (smbc_getFunctionRemoveUnusedServer(context)(context,
+                                                                        srv)) {
                                 /*
                                  * We could not remove the server completely,
                                  * remove it from the cache so we will not get
                                  * it again. It will be removed when the last
                                  * file/dir is closed.
                                  */
-                               (context->cache.remove_cached_server_fn)(context,
-                                                                         srv);
+                               smbc_getFunctionRemoveCachedServer(context)(context,
+                                                                            srv);
                        }
 
                        /*
@@ -214,29 +265,39 @@ SMBC_find_server(TALLOC_CTX *ctx,
  * info we need, unless the username and password were passed in.
  */
 
-SMBCSRV *
-SMBC_server(TALLOC_CTX *ctx,
+static SMBCSRV *
+SMBC_server_internal(TALLOC_CTX *ctx,
             SMBCCTX *context,
             bool connect_if_not_found,
             const char *server,
+            uint16_t port,
             const char *share,
             char **pp_workgroup,
             char **pp_username,
-            char **pp_password)
+            char **pp_password,
+           bool *in_cache)
 {
        SMBCSRV *srv=NULL;
-       struct cli_state *c;
-       struct nmb_name called, calling;
+       char *workgroup = NULL;
+       struct cli_state *c = NULL;
        const char *server_n = server;
-       struct sockaddr_storage ss;
-       int tried_reverse = 0;
-        int port_try_first;
-        int port_try_next;
-        const char *username_used;
+        int is_ipc = (share != NULL && strcmp(share, "IPC$") == 0);
+       uint32_t fs_attrs = 0;
+       const char *username_used = NULL;
+       const char *password_used = NULL;
        NTSTATUS status;
+       char *newserver, *newshare;
+       int flags = 0;
+       struct smbXcli_tcon *tcon = NULL;
+       int signing_state = SMB_SIGNING_DEFAULT;
+       struct cli_credentials *creds = NULL;
+       bool use_kerberos = false;
+       bool fallback_after_kerberos = false;
+       bool use_ccache = false;
+       bool pw_nt_hash = false;
 
-       zero_addr(&ss);
        ZERO_STRUCT(c);
+       *in_cache = false;
 
        if (server[0] == 0) {
                errno = EPERM;
@@ -245,33 +306,46 @@ SMBC_server(TALLOC_CTX *ctx,
 
         /* Look for a cached connection */
         srv = SMBC_find_server(ctx, context, server, share,
-                          pp_workgroup, pp_username, pp_password);
+                               pp_workgroup, pp_username, pp_password);
 
         /*
          * If we found a connection and we're only allowed one share per
          * server...
          */
-        if (srv && *share != '\0' && context->internal->one_share_per_server) {
+        if (srv &&
+           share != NULL && *share != '\0' &&
+            smbc_getOptionOneSharePerServer(context)) {
 
                 /*
                  * ... then if there's no current connection to the share,
                  * connect to it.  SMBC_find_server(), or rather the function
-                 * pointed to by context->cache.get_cached_srv_fn which
+                 * pointed to by context->get_cached_srv_fn which
                  * was called by SMBC_find_server(), will have issued a tree
                  * disconnect if the requested share is not the same as the
                  * one that was already connected.
                  */
-                if (srv->cli->cnum == (uint16) -1) {
+
+               /*
+                * Use srv->cli->desthost and srv->cli->share instead of
+                * server and share below to connect to the actual share,
+                * i.e., a normal share or a referred share from
+                * 'msdfs proxy' share.
+                */
+                if (!cli_state_has_tcon(srv->cli)) {
                         /* Ensure we have accurate auth info */
-                       SMBC_call_auth_fn(ctx, context, server, share,
-                               pp_workgroup, pp_username, pp_password);
+                       SMBC_call_auth_fn(ctx, context,
+                                         smbXcli_conn_remote_name(srv->cli->conn),
+                                         srv->cli->share,
+                                          pp_workgroup,
+                                          pp_username,
+                                          pp_password);
 
                        if (!*pp_workgroup || !*pp_username || !*pp_password) {
                                errno = ENOMEM;
                                cli_shutdown(srv->cli);
                                srv->cli = NULL;
-                               (context->cache.remove_cached_server_fn)(context,
-                                                                         srv);
+                               smbc_getFunctionRemoveCachedServer(context)(context,
+                                                                            srv);
                                return NULL;
                        }
 
@@ -281,25 +355,66 @@ SMBC_server(TALLOC_CTX *ctx,
                         * tid.
                         */
 
-                       if (!cli_send_tconX(srv->cli, share, "?????",
-                                               *pp_password,
-                                               strlen(*pp_password)+1)) {
-
-                                errno = SMBC_errno(context, srv->cli);
+                       status = cli_tree_connect(srv->cli,
+                                                 srv->cli->share,
+                                                 "?????",
+                                                 *pp_password);
+                       if (!NT_STATUS_IS_OK(status)) {
                                 cli_shutdown(srv->cli);
+                                errno = map_errno_from_nt_status(status);
                                srv->cli = NULL;
-                                (context->cache.remove_cached_server_fn)(context,
-                                                                         srv);
+                                smbc_getFunctionRemoveCachedServer(context)(context,
+                                                                            srv);
                                 srv = NULL;
                         }
 
+                        /* Determine if this share supports case sensitivity */
+                        if (is_ipc) {
+                                DEBUG(4,
+                                      ("IPC$ so ignore case sensitivity\n"));
+                                status = NT_STATUS_OK;
+                        } else {
+                                status = cli_get_fs_attr_info(c, &fs_attrs);
+                        }
+
+                        if (!NT_STATUS_IS_OK(status)) {
+                                DEBUG(4, ("Could not retrieve "
+                                          "case sensitivity flag: %s.\n",
+                                          nt_errstr(status)));
+
+                                /*
+                                 * We can't determine the case sensitivity of
+                                 * the share. We have no choice but to use the
+                                 * user-specified case sensitivity setting.
+                                 */
+                                if (smbc_getOptionCaseSensitive(context)) {
+                                        cli_set_case_sensitive(c, True);
+                                } else {
+                                        cli_set_case_sensitive(c, False);
+                                }
+                        } else if (!is_ipc) {
+                                DEBUG(4,
+                                      ("Case sensitive: %s\n",
+                                       (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
+                                        ? "True"
+                                        : "False")));
+                                cli_set_case_sensitive(
+                                        c,
+                                        (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
+                                         ? True
+                                         : False));
+                        }
+
                         /*
                          * Regenerate the dev value since it's based on both
                          * server and share
                          */
                         if (srv) {
-                                srv->dev = (dev_t)(str_checksum(server) ^
-                                                   str_checksum(share));
+                               const char *remote_name =
+                                       smbXcli_conn_remote_name(srv->cli->conn);
+
+                               srv->dev = (dev_t)(str_checksum(remote_name) ^
+                                                   str_checksum(srv->cli->share));
                         }
                 }
         }
@@ -308,7 +423,8 @@ SMBC_server(TALLOC_CTX *ctx,
         if (srv) {
 
                 /* ... then we're done here.  Give 'em what they came for. */
-                return srv;
+               *in_cache = true;
+                goto done;
         }
 
         /* If we're not asked to connect when a connection doesn't exist... */
@@ -322,118 +438,104 @@ SMBC_server(TALLOC_CTX *ctx,
                return NULL;
        }
 
-       make_nmb_name(&calling, context->config.netbios_name, 0x0);
-       make_nmb_name(&called , server, 0x20);
-
        DEBUG(4,("SMBC_server: server_n=[%s] server=[%s]\n", server_n, server));
 
        DEBUG(4,(" -> server_n=[%s] server=[%s]\n", server_n, server));
 
- again:
+       status = NT_STATUS_UNSUCCESSFUL;
 
-       zero_addr(&ss);
-
-       /* have to open a new connection */
-       if ((c = cli_initialise()) == NULL) {
-               errno = ENOMEM;
-               return NULL;
+       if (smbc_getOptionUseKerberos(context)) {
+               flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
+               use_kerberos = true;
        }
 
-       if (context->flags.bits & SMB_CTX_FLAG_USE_KERBEROS) {
-               c->use_kerberos = True;
+       if (smbc_getOptionFallbackAfterKerberos(context)) {
+               flags |= CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
+               fallback_after_kerberos = true;
        }
-       if (context->flags.bits & SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS) {
-               c->fallback_after_kerberos = True;
+
+       if (smbc_getOptionUseCCache(context)) {
+               flags |= CLI_FULL_CONNECTION_USE_CCACHE;
+               use_ccache = true;
        }
 
-       c->timeout = context->config.timeout;
+       if (smbc_getOptionUseNTHash(context)) {
+               flags |= CLI_FULL_CONNECTION_USE_NT_HASH;
+               pw_nt_hash = true;
+       }
 
-        /*
-         * Force use of port 139 for first try if share is $IPC, empty, or
-         * null, so browse lists can work
-         */
-        if (share == NULL || *share == '\0' || strcmp(share, "IPC$") == 0) {
-                port_try_first = 139;
-                port_try_next = 445;
-        } else {
-                port_try_first = 445;
-                port_try_next = 139;
-        }
+       if (context->internal->smb_encryption_level != SMBC_ENCRYPTLEVEL_NONE) {
+               signing_state = SMB_SIGNING_REQUIRED;
+       }
 
-        c->port = port_try_first;
+       if (port == 0) {
+               if (share == NULL || *share == '\0' || is_ipc) {
+                       /*
+                        * Try 139 first for IPC$
+                        */
+                       status = cli_connect_nb(server_n, NULL, NBT_SMB_PORT, 0x20,
+                                       smbc_getNetbiosName(context),
+                                       signing_state, flags, &c);
+               }
+       }
 
-       status = cli_connect(c, server_n, &ss);
        if (!NT_STATUS_IS_OK(status)) {
-
-                /* First connection attempt failed.  Try alternate port. */
-                c->port = port_try_next;
-
-                status = cli_connect(c, server_n, &ss);
-               if (!NT_STATUS_IS_OK(status)) {
-                       cli_shutdown(c);
-                       errno = ETIMEDOUT;
-                       return NULL;
-               }
+               /*
+                * No IPC$ or 139 did not work
+                */
+               status = cli_connect_nb(server_n, NULL, port, 0x20,
+                                       smbc_getNetbiosName(context),
+                                       signing_state, flags, &c);
        }
 
-       if (!cli_session_request(c, &calling, &called)) {
-               cli_shutdown(c);
-               if (strcmp(called.name, "*SMBSERVER")) {
-                       make_nmb_name(&called , "*SMBSERVER", 0x20);
-                       goto again;
-               } else {  /* Try one more time, but ensure we don't loop */
-
-                       /* Only try this if server is an IP address ... */
-
-                       if (is_ipaddress(server) && !tried_reverse) {
-                               fstring remote_name;
-                               struct sockaddr_storage rem_ss;
-
-                               if (!interpret_string_addr(&rem_ss, server,
-                                                       NI_NUMERICHOST)) {
-                                       DEBUG(4, ("Could not convert IP address "
-                                               "%s to struct sockaddr_storage\n",
-                                               server));
-                                       errno = ETIMEDOUT;
-                                       return NULL;
-                               }
+       if (!NT_STATUS_IS_OK(status)) {
+               errno = map_errno_from_nt_status(status);
+               return NULL;
+       }
 
-                               tried_reverse++; /* Yuck */
+       cli_set_timeout(c, smbc_getTimeout(context));
 
-                               if (name_status_find("*", 0, 0, &rem_ss, remote_name)) {
-                                       make_nmb_name(&called, remote_name, 0x20);
-                                       goto again;
-                               }
-                       }
-               }
+       status = smbXcli_negprot(c->conn, c->timeout,
+                                lp_client_min_protocol(),
+                                lp_client_max_protocol());
+       if (!NT_STATUS_IS_OK(status)) {
+               cli_shutdown(c);
                errno = ETIMEDOUT;
                return NULL;
        }
 
-       DEBUG(4,(" session request ok\n"));
+       if (smbXcli_conn_protocol(c->conn) >= PROTOCOL_SMB2_02) {
+               /* Ensure we ask for some initial credits. */
+               smb2cli_conn_set_max_credits(c->conn, DEFAULT_SMB2_MAX_CREDITS);
+       }
 
-       if (!cli_negprot(c)) {
+       username_used = *pp_username;
+       password_used = *pp_password;
+
+       creds = cli_session_creds_init(c,
+                                      username_used,
+                                      *pp_workgroup,
+                                      NULL, /* realm */
+                                      password_used,
+                                      use_kerberos,
+                                      fallback_after_kerberos,
+                                      use_ccache,
+                                      pw_nt_hash);
+       if (creds == NULL) {
                cli_shutdown(c);
-               errno = ETIMEDOUT;
+               errno = ENOMEM;
                return NULL;
        }
 
-        username_used = *pp_username;
-
-       if (!NT_STATUS_IS_OK(cli_session_setup(c, username_used,
-                                              *pp_password, strlen(*pp_password),
-                                              *pp_password, strlen(*pp_password),
-                                              *pp_workgroup))) {
+       status = cli_session_setup_creds(c, creds);
+       if (!NT_STATUS_IS_OK(status)) {
 
                 /* Failed.  Try an anonymous login, if allowed by flags. */
-                username_used = "";
+               username_used = "";
+               password_used = "";
 
-                if ((context->flags.bits &
-                     SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON) ||
-                    !NT_STATUS_IS_OK(cli_session_setup(c, username_used,
-                                                       *pp_password, 1,
-                                                       *pp_password, 0,
-                                                       *pp_workgroup))) {
+                if (smbc_getOptionNoAutoAnonymousLogin(context) ||
+                   !NT_STATUS_IS_OK(cli_session_setup_anon(c))) {
 
                         cli_shutdown(c);
                         errno = EPERM;
@@ -443,21 +545,81 @@ SMBC_server(TALLOC_CTX *ctx,
 
        DEBUG(4,(" session setup ok\n"));
 
-       if (!cli_send_tconX(c, share, "?????",
-                           *pp_password, strlen(*pp_password)+1)) {
-               errno = SMBC_errno(context, c);
+       /* here's the fun part....to support 'msdfs proxy' shares
+          (on Samba or windows) we have to issues a TRANS_GET_DFS_REFERRAL
+          here before trying to connect to the original share.
+          cli_check_msdfs_proxy() will fail if it is a normal share. */
+
+       if (smbXcli_conn_dfs_supported(c->conn) &&
+                       cli_check_msdfs_proxy(ctx, c, share,
+                               &newserver, &newshare,
+                               /* FIXME: cli_check_msdfs_proxy() does
+                                  not support smbc_smb_encrypt_level type */
+                               context->internal->smb_encryption_level ?
+                                       true : false,
+                               creds)) {
                cli_shutdown(c);
+               srv = SMBC_server_internal(ctx, context, connect_if_not_found,
+                               newserver, port, newshare, pp_workgroup,
+                               pp_username, pp_password, in_cache);
+               TALLOC_FREE(newserver);
+               TALLOC_FREE(newshare);
+               return srv;
+       }
+
+       /* must be a normal share */
+
+       status = cli_tree_connect_creds(c, share, "?????", creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               cli_shutdown(c);
+               errno = map_errno_from_nt_status(status);
                return NULL;
        }
 
        DEBUG(4,(" tconx ok\n"));
 
+       if (smbXcli_conn_protocol(c->conn) >= PROTOCOL_SMB2_02) {
+               tcon = c->smb2.tcon;
+       } else {
+               tcon = c->smb1.tcon;
+       }
+
+        /* Determine if this share supports case sensitivity */
+       if (is_ipc) {
+                DEBUG(4, ("IPC$ so ignore case sensitivity\n"));
+                status = NT_STATUS_OK;
+        } else {
+                status = cli_get_fs_attr_info(c, &fs_attrs);
+        }
+
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(4, ("Could not retrieve case sensitivity flag: %s.\n",
+                          nt_errstr(status)));
+
+                /*
+                 * We can't determine the case sensitivity of the share. We
+                 * have no choice but to use the user-specified case
+                 * sensitivity setting.
+                 */
+                if (smbc_getOptionCaseSensitive(context)) {
+                        cli_set_case_sensitive(c, True);
+                } else {
+                        cli_set_case_sensitive(c, False);
+                }
+       } else if (!is_ipc) {
+                DEBUG(4, ("Case sensitive: %s\n",
+                          (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
+                           ? "True"
+                           : "False")));
+               smbXcli_tcon_set_fs_attributes(tcon, fs_attrs);
+        }
+
        if (context->internal->smb_encryption_level) {
-               /* Attempt UNIX smb encryption. */
-               if (!NT_STATUS_IS_OK(cli_force_encryption(c,
-                                               username_used,
-                                               *pp_password,
-                                               *pp_workgroup))) {
+               /* Attempt encryption. */
+               status = cli_cm_force_encryption_creds(c,
+                                                      creds,
+                                                      share);
+               if (!NT_STATUS_IS_OK(status)) {
 
                        /*
                         * context->smb_encryption_level == 1
@@ -483,47 +645,89 @@ SMBC_server(TALLOC_CTX *ctx,
 
        srv = SMB_MALLOC_P(SMBCSRV);
        if (!srv) {
+               cli_shutdown(c);
                errno = ENOMEM;
-               goto failed;
+               return NULL;
        }
 
        ZERO_STRUCTP(srv);
-       srv->cli = c;
+       DLIST_ADD(srv->cli, c);
        srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
         srv->no_pathinfo = False;
         srv->no_pathinfo2 = False;
+       srv->no_pathinfo3 = False;
         srv->no_nt_session = False;
 
-       /* now add it to the cache (internal or external)  */
+done:
+       if (!pp_workgroup || !*pp_workgroup || !**pp_workgroup) {
+               workgroup = talloc_strdup(ctx, smbc_getWorkgroup(context));
+       } else {
+               workgroup = *pp_workgroup;
+       }
+       if(!workgroup) {
+               if (c != NULL) {
+                       cli_shutdown(c);
+               }
+               SAFE_FREE(srv);
+               return NULL;
+       }
+
+       /* set the credentials to make DFS work */
+       smbc_set_credentials_with_fallback(context,
+                                          workgroup,
+                                          *pp_username,
+                                          *pp_password);
+
+       return srv;
+}
+
+SMBCSRV *
+SMBC_server(TALLOC_CTX *ctx,
+               SMBCCTX *context,
+               bool connect_if_not_found,
+               const char *server,
+               uint16_t port,
+               const char *share,
+               char **pp_workgroup,
+               char **pp_username,
+               char **pp_password)
+{
+       SMBCSRV *srv=NULL;
+       bool in_cache = false;
+
+       srv = SMBC_server_internal(ctx, context, connect_if_not_found,
+                       server, port, share, pp_workgroup,
+                       pp_username, pp_password, &in_cache);
+
+       if (!srv) {
+               return NULL;
+       }
+       if (in_cache) {
+               return srv;
+       }
+
+       /* Now add it to the cache (internal or external)  */
        /* Let the cache function set errno if it wants to */
        errno = 0;
-       if ((context->cache.add_cached_server_fn)(context, srv,
-                                                  server, share,
-                                                  *pp_workgroup,
-                                                  *pp_username)) {
+       if (smbc_getFunctionAddCachedServer(context)(context, srv,
+                                               server, share,
+                                               *pp_workgroup,
+                                               *pp_username)) {
                int saved_errno = errno;
                DEBUG(3, (" Failed to add server to cache\n"));
                errno = saved_errno;
                if (errno == 0) {
                        errno = ENOMEM;
                }
-               goto failed;
+               SAFE_FREE(srv);
+               return NULL;
        }
 
        DEBUG(2, ("Server connect ok: //%s/%s: %p\n",
-                 server, share, srv));
+               server, share, srv));
 
        DLIST_ADD(context->internal->servers, srv);
        return srv;
-
- failed:
-       cli_shutdown(c);
-       if (!srv) {
-               return NULL;
-       }
-
-       SAFE_FREE(srv);
-       return NULL;
 }
 
 /*
@@ -534,32 +738,50 @@ SMBCSRV *
 SMBC_attr_server(TALLOC_CTX *ctx,
                  SMBCCTX *context,
                  const char *server,
+                 uint16_t port,
                  const char *share,
                  char **pp_workgroup,
                  char **pp_username,
                  char **pp_password)
 {
         int flags;
-        struct sockaddr_storage ss;
-       struct cli_state *ipc_cli;
-       struct rpc_pipe_client *pipe_hnd;
+       struct cli_state *ipc_cli = NULL;
+       struct rpc_pipe_client *pipe_hnd = NULL;
         NTSTATUS nt_status;
+       SMBCSRV *srv=NULL;
        SMBCSRV *ipc_srv=NULL;
 
+       /*
+        * Use srv->cli->desthost and srv->cli->share instead of
+        * server and share below to connect to the actual share,
+        * i.e., a normal share or a referred share from
+        * 'msdfs proxy' share.
+        */
+       srv = SMBC_server(ctx, context, true, server, port, share,
+                       pp_workgroup, pp_username, pp_password);
+       if (!srv) {
+               return NULL;
+       }
+       server = smbXcli_conn_remote_name(srv->cli->conn);
+       share = srv->cli->share;
+
         /*
          * See if we've already created this special connection.  Reference
          * our "special" share name '*IPC$', which is an impossible real share
          * name due to the leading asterisk.
          */
         ipc_srv = SMBC_find_server(ctx, context, server, "*IPC$",
-                              pp_workgroup, pp_username, pp_password);
+                                   pp_workgroup, pp_username, pp_password);
         if (!ipc_srv) {
+               int signing_state = SMB_SIGNING_DEFAULT;
 
                 /* We didn't find a cached connection.  Get the password */
                if (!*pp_password || (*pp_password)[0] == '\0') {
                         /* ... then retrieve it now. */
                        SMBC_call_auth_fn(ctx, context, server, share,
-                               pp_workgroup, pp_username, pp_password);
+                                          pp_workgroup,
+                                          pp_username,
+                                          pp_password);
                        if (!*pp_workgroup || !*pp_username || !*pp_password) {
                                errno = ENOMEM;
                                return NULL;
@@ -567,19 +789,24 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                 }
 
                 flags = 0;
-                if (context->flags.bits & SMB_CTX_FLAG_USE_KERBEROS) {
+                if (smbc_getOptionUseKerberos(context)) {
                         flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
                 }
+                if (smbc_getOptionUseCCache(context)) {
+                        flags |= CLI_FULL_CONNECTION_USE_CCACHE;
+                }
+               if (context->internal->smb_encryption_level != SMBC_ENCRYPTLEVEL_NONE) {
+                       signing_state = SMB_SIGNING_REQUIRED;
+               }
 
-                zero_addr(&ss);
                 nt_status = cli_full_connection(&ipc_cli,
-                                               global_myname(), server,
-                                               &ss, 0, "IPC$", "?????",
+                                               lp_netbios_name(), server,
+                                               NULL, 0, "IPC$", "?????",
                                                *pp_username,
                                                *pp_workgroup,
                                                *pp_password,
                                                flags,
-                                               Undefined, NULL);
+                                               signing_state);
                 if (! NT_STATUS_IS_OK(nt_status)) {
                         DEBUG(1,("cli_full_connection failed! (%s)\n",
                                  nt_errstr(nt_status)));
@@ -588,11 +815,13 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                 }
 
                if (context->internal->smb_encryption_level) {
-                       /* Attempt UNIX smb encryption. */
-                       if (!NT_STATUS_IS_OK(cli_force_encryption(ipc_cli,
-                                               *pp_username,
-                                               *pp_password,
-                                               *pp_workgroup))) {
+                       /* Attempt encryption. */
+                       nt_status = cli_cm_force_encryption(ipc_cli,
+                                                           *pp_username,
+                                                           *pp_password,
+                                                           *pp_workgroup,
+                                                           "IPC$");
+                       if (!NT_STATUS_IS_OK(nt_status)) {
 
                                /*
                                 * context->smb_encryption_level ==
@@ -620,46 +849,46 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                 }
 
                 ZERO_STRUCTP(ipc_srv);
-                ipc_srv->cli = ipc_cli;
-
-                pipe_hnd = cli_rpc_pipe_open_noauth(ipc_srv->cli,
-                                                    PI_LSARPC,
-                                                    &nt_status);
-                if (!pipe_hnd) {
-                    DEBUG(1, ("cli_nt_session_open fail!\n"));
-                    errno = ENOTSUP;
-                    cli_shutdown(ipc_srv->cli);
-                    free(ipc_srv);
-                    return NULL;
+                DLIST_ADD(ipc_srv->cli, ipc_cli);
+
+                nt_status = cli_rpc_pipe_open_noauth(
+                       ipc_srv->cli, &ndr_table_lsarpc, &pipe_hnd);
+                if (!NT_STATUS_IS_OK(nt_status)) {
+                        DEBUG(1, ("cli_nt_session_open fail!\n"));
+                        errno = ENOTSUP;
+                        cli_shutdown(ipc_srv->cli);
+                        free(ipc_srv);
+                        return NULL;
                 }
 
                 /*
                  * Some systems don't support
-                 * SEC_RIGHTS_MAXIMUM_ALLOWED, but NT sends 0x2000000
+                 * SEC_FLAG_MAXIMUM_ALLOWED, but NT sends 0x2000000
                  * so we might as well do it too.
                  */
 
                 nt_status = rpccli_lsa_open_policy(
-                    pipe_hnd,
-                    talloc_tos(),
-                    True,
-                    GENERIC_EXECUTE_ACCESS,
-                    &ipc_srv->pol);
+                        pipe_hnd,
+                        talloc_tos(),
+                        True,
+                        GENERIC_EXECUTE_ACCESS,
+                        &ipc_srv->pol);
 
                 if (!NT_STATUS_IS_OK(nt_status)) {
-                    errno = SMBC_errno(context, ipc_srv->cli);
-                    cli_shutdown(ipc_srv->cli);
-                    return NULL;
+                        errno = SMBC_errno(context, ipc_srv->cli);
+                        cli_shutdown(ipc_srv->cli);
+                        free(ipc_srv);
+                        return NULL;
                 }
 
                 /* now add it to the cache (internal or external) */
 
                 errno = 0;      /* let cache function set errno if it likes */
-                if ((context->cache.add_cached_server_fn)(context, ipc_srv,
-                                                          server,
-                                                          "*IPC$",
-                                                          *pp_workgroup,
-                                                          *pp_username)) {
+                if (smbc_getFunctionAddCachedServer(context)(context, ipc_srv,
+                                                             server,
+                                                             "*IPC$",
+                                                             *pp_workgroup,
+                                                             *pp_username)) {
                         DEBUG(3, (" Failed to add server to cache\n"));
                         if (errno == 0) {
                                 errno = ENOMEM;