Changeset 988 for vendor/current/source4/ntvfs/smb2

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/ntvfs/smb2/vfs_smb2.c (modified) (15 diffs)

vendor/current/source4/ntvfs/smb2/vfs_smb2.c

@@ -42 +42 @@
 #include "libcli/smb2/smb2_calls.h"
 
+NTSTATUS ntvfs_smb2_init(void);
+
 struct cvfs_file {
         struct cvfs_file *prev, *next;
@@ -99 +101 @@
   along to the client
  */
+#if 0
 static bool oplock_handler(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *p_private)
 {
@@ -122 +125 @@
         return true;
 }
+#endif
 
 /*
@@ -161 +165 @@
         struct cvfs_private *p;
         const char *host, *user, *pass, *domain, *remote_share, *sharename;
-        struct composite_context *creq;
         struct share_config *scfg = ntvfs->ctx->config;
         struct smb2_tree *tree;
@@ -167 +170 @@
         bool machine_account;
         struct smbcli_options options;
+        TALLOC_CTX *tmp_ctx;
+
+        tmp_ctx = talloc_new(req);
+        if (tmp_ctx == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
 
         switch (tcon->generic.level) {
@@ -179 +188 @@
                 break;
         default:
-                return NT_STATUS_INVALID_LEVEL;
+                status = NT_STATUS_INVALID_LEVEL;
+                goto out;
         }
 
@@ -191 +201 @@
         /* Here we need to determine which server to connect to.
          * For now we use parametric options, type cifs.
-         * Later we will use security=server and auth_server.c.
          */
-        host = share_string_option(scfg, SMB2_SERVER, NULL);
-        user = share_string_option(scfg, SMB2_USER, NULL);
-        pass = share_string_option(scfg, SMB2_PASSWORD, NULL);
-        domain = share_string_option(scfg, SMB2_DOMAIN, NULL);
-        remote_share = share_string_option(scfg, SMB2_SHARE, NULL);
+        host = share_string_option(tmp_ctx, scfg, SMB2_SERVER, NULL);
+        user = share_string_option(tmp_ctx, scfg, SMB2_USER, NULL);
+        pass = share_string_option(tmp_ctx, scfg, SMB2_PASSWORD, NULL);
+        domain = share_string_option(tmp_ctx, scfg, SMB2_DOMAIN, NULL);
+        remote_share = share_string_option(tmp_ctx, scfg, SMB2_SHARE, NULL);
         if (!remote_share) {
                 remote_share = sharename;
@@ -206 +215 @@
         p = talloc_zero(ntvfs, struct cvfs_private);
         if (!p) {
-                return NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
+                goto out;
         }
 
@@ -213 +223 @@
         if (!host) {
                 DEBUG(1,("CIFS backend: You must supply server\n"));
-                return NT_STATUS_INVALID_PARAMETER;
+                status = NT_STATUS_INVALID_PARAMETER;
+                goto out;
         } 
         
@@ -220 +231 @@
                 credentials = cli_credentials_init(p);
                 if (!credentials) {
-                        return NT_STATUS_NO_MEMORY;
+                        status = NT_STATUS_NO_MEMORY;
+                        goto out;
                 }
                 cli_credentials_set_conf(credentials, ntvfs->ctx->lp_ctx);
@@ -237 +249 @@
                 status = cli_credentials_set_machine_account(credentials, ntvfs->ctx->lp_ctx);
                 if (!NT_STATUS_IS_OK(status)) {
-                        return status;
+                        goto out;
                 }
         } else if (req->session_info->credentials) {
@@ -244 +256 @@
         } else {
                 DEBUG(1,("CIFS backend: NO delegated credentials found: You must supply server, user and password or the client must supply delegated credentials\n"));
-                return NT_STATUS_INVALID_PARAMETER;
+                status = NT_STATUS_INVALID_PARAMETER;
+                goto out;
         }
 
         lpcfg_smbcli_options(ntvfs->ctx->lp_ctx, &options);
 
-        creq = smb2_connect_send(p, host,
+        status = smb2_connect(p, host,
                         lpcfg_parm_string_list(p, ntvfs->ctx->lp_ctx, NULL, "smb2", "ports", NULL),
-                                remote_share, 
-                                 lpcfg_resolve_context(ntvfs->ctx->lp_ctx),
-                                 credentials,
-                                 ntvfs->ctx->event_ctx, &options,
-                                 lpcfg_socket_options(ntvfs->ctx->lp_ctx),
-                                 lpcfg_gensec_settings(p, ntvfs->ctx->lp_ctx)
-                                 );
-
-        status = smb2_connect_recv(creq, p, &tree);
-        NT_STATUS_NOT_OK_RETURN(status);
+                        remote_share,
+                        lpcfg_resolve_context(ntvfs->ctx->lp_ctx),
+                        credentials,
+                        &tree,
+                        ntvfs->ctx->event_ctx, &options,
+                        lpcfg_socket_options(ntvfs->ctx->lp_ctx),
+                        lpcfg_gensec_settings(p, ntvfs->ctx->lp_ctx));
+        if (!NT_STATUS_IS_OK(status)) {
+                goto out;
+        }
 
         status = smb2_get_roothandle(tree, &p->roothandle);
-        NT_STATUS_NOT_OK_RETURN(status);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto out;
+        }
 
         p->tree = tree;
@@ -270 +285 @@
 
         ntvfs->ctx->fs_type = talloc_strdup(ntvfs->ctx, "NTFS");
-        NT_STATUS_HAVE_NO_MEMORY(ntvfs->ctx->fs_type);
+        if (ntvfs->ctx->fs_type == NULL) {
+                status = NT_STATUS_NO_MEMORY;
+                goto out;
+        }
         ntvfs->ctx->dev_type = talloc_strdup(ntvfs->ctx, "A:");
-        NT_STATUS_HAVE_NO_MEMORY(ntvfs->ctx->dev_type);
+        if (ntvfs->ctx->dev_type == NULL) {
+                status = NT_STATUS_NO_MEMORY;
+                goto out;
+        }
 
         if (tcon->generic.level == RAW_TCON_TCONX) {
@@ -283 +304 @@
         smbcli_oplock_handler(p->transport, oplock_handler, p);
         */
-        return NT_STATUS_OK;
+
+        status = NT_STATUS_OK;
+
+out:
+        TALLOC_FREE(tmp_ctx);
+        return status;
 }
 
@@ -835 +861 @@
         
         /* fill in all the operations */
-        ops.connect = cvfs_connect;
-        ops.disconnect = cvfs_disconnect;
-        ops.unlink = cvfs_unlink;
-        ops.chkpath = cvfs_chkpath;
-        ops.qpathinfo = cvfs_qpathinfo;
-        ops.setpathinfo = cvfs_setpathinfo;
-        ops.open = cvfs_open;
-        ops.mkdir = cvfs_mkdir;
-        ops.rmdir = cvfs_rmdir;
-        ops.rename = cvfs_rename;
-        ops.copy = cvfs_copy;
-        ops.ioctl = cvfs_ioctl;
-        ops.read = cvfs_read;
-        ops.write = cvfs_write;
-        ops.seek = cvfs_seek;
-        ops.flush = cvfs_flush; 
-        ops.close = cvfs_close;
-        ops.exit = cvfs_exit;
-        ops.lock = cvfs_lock;
-        ops.setfileinfo = cvfs_setfileinfo;
-        ops.qfileinfo = cvfs_qfileinfo;
-        ops.fsinfo = cvfs_fsinfo;
-        ops.lpq = cvfs_lpq;
-        ops.search_first = cvfs_search_first;
-        ops.search_next = cvfs_search_next;
-        ops.search_close = cvfs_search_close;
-        ops.trans = cvfs_trans;
-        ops.logoff = cvfs_logoff;
-        ops.async_setup = cvfs_async_setup;
-        ops.cancel = cvfs_cancel;
-        ops.notify = cvfs_notify;
+        ops.connect_fn = cvfs_connect;
+        ops.disconnect_fn = cvfs_disconnect;
+        ops.unlink_fn = cvfs_unlink;
+        ops.chkpath_fn = cvfs_chkpath;
+        ops.qpathinfo_fn = cvfs_qpathinfo;
+        ops.setpathinfo_fn = cvfs_setpathinfo;
+        ops.open_fn = cvfs_open;
+        ops.mkdir_fn = cvfs_mkdir;
+        ops.rmdir_fn = cvfs_rmdir;
+        ops.rename_fn = cvfs_rename;
+        ops.copy_fn = cvfs_copy;
+        ops.ioctl_fn = cvfs_ioctl;
+        ops.read_fn = cvfs_read;
+        ops.write_fn = cvfs_write;
+        ops.seek_fn = cvfs_seek;
+        ops.flush_fn = cvfs_flush;
+        ops.close_fn = cvfs_close;
+        ops.exit_fn = cvfs_exit;
+        ops.lock_fn = cvfs_lock;
+        ops.setfileinfo_fn = cvfs_setfileinfo;
+        ops.qfileinfo_fn = cvfs_qfileinfo;
+        ops.fsinfo_fn = cvfs_fsinfo;
+        ops.lpq_fn = cvfs_lpq;
+        ops.search_first_fn = cvfs_search_first;
+        ops.search_next_fn = cvfs_search_next;
+        ops.search_close_fn = cvfs_search_close;
+        ops.trans_fn = cvfs_trans;
+        ops.logoff_fn = cvfs_logoff;
+        ops.async_setup_fn = cvfs_async_setup;
+        ops.cancel_fn = cvfs_cancel;
+        ops.notify_fn = cvfs_notify;
 
         /* register ourselves with the NTVFS subsystem. We register