summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-02-02 13:28:29 +0000
committerStefan Metzmacher <metze@samba.org>2004-02-02 13:28:29 +0000
commit894e02f80c254da4edca5dbae99561d205c63fbe (patch)
tree5c93f4405c03e62ce6fcdab2c557c2a915baf466 /source4/ntvfs
parentada1de721ab17e83cfedf9d68adec750de626317 (diff)
downloadsamba-894e02f80c254da4edca5dbae99561d205c63fbe.tar.gz
samba-894e02f80c254da4edca5dbae99561d205c63fbe.tar.bz2
samba-894e02f80c254da4edca5dbae99561d205c63fbe.zip
some DEBUG and comment fixes
metze (This used to be commit 5ac4f878687eb0fa95a2e5830a8372168a27d3b3)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c1
-rw-r--r--source4/ntvfs/ipc/vfs_ipc.c6
-rw-r--r--source4/ntvfs/ntvfs_base.c8
-rw-r--r--source4/ntvfs/print/vfs_print.c3
-rw-r--r--source4/ntvfs/simple/vfs_simple.c3
5 files changed, 13 insertions, 8 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 10fd56cb44..976fa96b55 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -686,6 +686,7 @@ NTSTATUS ntvfs_cifs_init(void)
ZERO_STRUCT(ops);
+ /* fill in the name and type */
ops.name = "cifs";
ops.type = NTVFS_DISK;
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index c6d5a52960..cf1d21bf33 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -686,9 +686,11 @@ NTSTATUS ntvfs_ipc_init(void)
ZERO_STRUCT(ops);
- /* fill in all the operations */
- ops.name = "ipc";
+ /* fill in the name and type */
+ ops.name = "default";
ops.type = NTVFS_IPC;
+
+ /* fill in all the operations */
ops.connect = ipc_connect;
ops.disconnect = ipc_disconnect;
ops.unlink = ipc_unlink;
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index e4009fd1f0..3e1f77edce 100644
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -48,7 +48,7 @@ static NTSTATUS ntvfs_register(void *_ops)
if (ntvfs_backend_byname(ops->name, ops->type) != NULL) {
/* its already registered! */
- DEBUG(2,("NTVFS backend '%s' for type %d already registered\n",
+ DEBUG(0,("NTVFS backend '%s' for type %d already registered\n",
ops->name, (int)ops->type));
return NT_STATUS_OBJECT_NAME_COLLISION;
}
@@ -63,6 +63,9 @@ static NTSTATUS ntvfs_register(void *_ops)
num_backends++;
+ DEBUG(3,("NTVFS backend '%s' for type %d registered\n",
+ ops->name,ops->type));
+
return NT_STATUS_OK;
}
@@ -130,9 +133,6 @@ BOOL ntvfs_init(void)
NTSTATUS ntvfs_init_connection(struct request_context *req)
{
const char *handler = lp_ntvfs_handler(req->conn->service);
-
- if (strequal(handler, "default"))
- handler = "ipc";
req->conn->ntvfs_ops = ntvfs_backend_byname(handler, req->conn->type);
diff --git a/source4/ntvfs/print/vfs_print.c b/source4/ntvfs/print/vfs_print.c
index a9484d4329..f56b906501 100644
--- a/source4/ntvfs/print/vfs_print.c
+++ b/source4/ntvfs/print/vfs_print.c
@@ -88,7 +88,8 @@ NTSTATUS ntvfs_print_init(void)
struct ntvfs_ops ops;
ZERO_STRUCT(ops);
-
+
+ /* fill in the name and type */
ops.name = "default";
ops.type = NTVFS_PRINT;
diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 7972a3565a..157bf03320 100644
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -819,7 +819,8 @@ NTSTATUS ntvfs_simple_init(void)
struct ntvfs_ops ops;
ZERO_STRUCT(ops);
-
+
+ /* fill in the name and type */
ops.name = "simple";
ops.type = NTVFS_DISK;