svn commit: samba r15522 - in branches/SAMBA_4_0/source/ntvfs/cifs: .

[metze at samba.org]

Author: metze
Date: 2006-05-09 15:50:35 +0000 (Tue, 09 May 2006)
New Revision: 15522

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15522

Log:
allow cifs:map_trans2 per share

metze
Modified:
   branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2006-05-09 09:41:40 UTC (rev 15521)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2006-05-09 15:50:35 UTC (rev 15522)
@@ -39,6 +39,7 @@
 	struct ntvfs_module_context *ntvfs;
 	struct async_info *pending;
 	BOOL map_generic;
+	BOOL map_trans2;
 };
 
 
@@ -173,6 +174,9 @@
 	private->map_generic = lp_parm_bool(ntvfs->ctx->config.snum, 
 					    "cifs", "mapgeneric", False);
 
+	private->map_trans2 = lp_parm_bool(ntvfs->ctx->config.snum,
+					   "cifs", "maptrans2", False);
+
 	return NT_STATUS_OK;
 }
 
@@ -873,6 +877,10 @@
 	struct cvfs_private *private = ntvfs->private_data;
 	struct smbcli_request *c_req;
 
+	if (!private->map_trans2) {
+		return NT_STATUS_NOT_IMPLEMENTED;
+	}
+
 	SETUP_PID;
 
 	if (!(req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC)) {
@@ -979,11 +987,8 @@
 	ops.async_setup = cvfs_async_setup;
 	ops.cancel = cvfs_cancel;
 	ops.notify = cvfs_notify;
+	ops.trans2 = cvfs_trans2;
 
-	if (lp_parm_bool(-1, "cifs", "maptrans2", False)) {
-		ops.trans2 = cvfs_trans2;
-	}
-
 	/* register ourselves with the NTVFS subsystem. We register
 	   under the name 'cifs'. */
 	ret = ntvfs_register(&ops, &vers);