s3-libsmb: Don't leak memory on error.

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

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 005f2cdf8e8599d3741ec82894260b100a83c49a..0d39245109ecf89483c58e6df6770700f383134e 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -32,6 +32,7 @@
 #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.
@@ -95,7 +96,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,
@@ -272,7 +273,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
          * server...
          */
         if (srv &&
-            *share != '\0' &&
+           share != NULL && *share != '\0' &&
             smbc_getOptionOneSharePerServer(context)) {
 
                 /*
@@ -293,7 +294,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                 if (!cli_state_has_tcon(srv->cli)) {
                         /* Ensure we have accurate auth info */
                        SMBC_call_auth_fn(ctx, context,
-                                         cli_state_remote_name(srv->cli),
+                                         smbXcli_conn_remote_name(srv->cli->conn),
                                          srv->cli->share,
                                           pp_workgroup,
                                           pp_username,
@@ -314,9 +315,11 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                         * tid.
                         */
 
-                       status = cli_tcon_andx(srv->cli, srv->cli->share, "?????",
-                                              *pp_password,
-                                              strlen(*pp_password)+1);
+                       status = cli_tree_connect(srv->cli,
+                                                 srv->cli->share,
+                                                 "?????",
+                                                 *pp_password,
+                                                 strlen(*pp_password)+1);
                        if (!NT_STATUS_IS_OK(status)) {
                                 errno = map_errno_from_nt_status(status);
                                 cli_shutdown(srv->cli);
@@ -369,7 +372,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                          */
                         if (srv) {
                                const char *remote_name =
-                                       cli_state_remote_name(srv->cli);
+                                       smbXcli_conn_remote_name(srv->cli->conn);
 
                                srv->dev = (dev_t)(str_checksum(remote_name) ^
                                                    str_checksum(srv->cli->share));
@@ -414,13 +417,17 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                flags |= CLI_FULL_CONNECTION_USE_CCACHE;
        }
 
+       if (smbc_getOptionUseNTHash(context)) {
+               flags |= CLI_FULL_CONNECTION_USE_NT_HASH;
+       }
+
         if (share == NULL || *share == '\0' || is_ipc) {
                /*
                 * Try 139 first for IPC$
                 */
-               status = cli_connect_nb(server_n, NULL, 139, 0x20,
+               status = cli_connect_nb(server_n, NULL, NBT_SMB_PORT, 0x20,
                                        smbc_getNetbiosName(context),
-                                       Undefined, flags, &c);
+                                       SMB_SIGNING_DEFAULT, flags, &c);
        }
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -429,7 +436,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                 */
                status = cli_connect_nb(server_n, NULL, 0, 0x20,
                                        smbc_getNetbiosName(context),
-                                       Undefined, flags, &c);
+                                       SMB_SIGNING_DEFAULT, flags, &c);
        }
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -439,7 +446,8 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 
        cli_set_timeout(c, smbc_getTimeout(context));
 
-       status = cli_negprot(c);
+       status = smbXcli_negprot(c->conn, c->timeout, PROTOCOL_CORE,
+                                PROTOCOL_NT1);
 
        if (!NT_STATUS_IS_OK(status)) {
                cli_shutdown(c);
@@ -486,7 +494,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
           here before trying to connect to the original share.
           cli_check_msdfs_proxy() will fail if it is a normal share. */
 
-       if ((cli_state_capabilities(c) & CAP_DFS) &&
+       if ((smb1cli_conn_capabilities(c->conn) & CAP_DFS) &&
                        cli_check_msdfs_proxy(ctx, c, share,
                                &newserver, &newshare,
                                /* FIXME: cli_check_msdfs_proxy() does
@@ -507,8 +515,8 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 
        /* must be a normal share */
 
-       status = cli_tcon_andx(c, share, "?????", *pp_password,
-                              strlen(*pp_password)+1);
+       status = cli_tree_connect(c, share, "?????", *pp_password,
+                                 strlen(*pp_password)+1);
        if (!NT_STATUS_IS_OK(status)) {
                errno = map_errno_from_nt_status(status);
                cli_shutdown(c);
@@ -695,7 +703,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
        if (!srv) {
                return NULL;
        }
-       server = cli_state_remote_name(srv->cli);
+       server = smbXcli_conn_remote_name(srv->cli->conn);
        share = srv->cli->share;
 
         /*
@@ -735,7 +743,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                                                *pp_workgroup,
                                                *pp_password,
                                                flags,
-                                               Undefined);
+                                               SMB_SIGNING_DEFAULT);
                 if (! NT_STATUS_IS_OK(nt_status)) {
                         DEBUG(1,("cli_full_connection failed! (%s)\n",
                                  nt_errstr(nt_status)));
@@ -804,6 +812,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                 if (!NT_STATUS_IS_OK(nt_status)) {
                         errno = SMBC_errno(context, ipc_srv->cli);
                         cli_shutdown(ipc_srv->cli);
+                        free(ipc_srv);
                         return NULL;
                 }