summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/build/pidl/server.pm2
-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
-rw-r--r--source4/rpc_server/dcerpc_server.c8
-rw-r--r--source4/rpc_server/dcerpc_server.h5
-rw-r--r--source4/rpc_server/remote/dcesrv_remote.c2
9 files changed, 24 insertions, 14 deletions
diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm
index 20a8c383ea..297d4e3248 100644
--- a/source4/build/pidl/server.pm
+++ b/source4/build/pidl/server.pm
@@ -141,7 +141,7 @@ NTSTATUS dcerpc_$name\_init(void)
ep_server.interface_by_uuid = $name\_op_interface_by_uuid;
ep_server.interface_by_name = $name\_op_interface_by_name;
- /* register ourselves with the NTVFS subsystem. */
+ /* register ourselves with the DCERPC subsystem. */
ret = register_backend(\"dcerpc\", &ep_server);
if (!NT_STATUS_IS_OK(ret)) {
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;
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 0553537cb5..a17910e1d5 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -233,7 +233,7 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
DLIST_ADD(dce_ctx->endpoint_list, ep);
}
- DEBUG(3,("dcesrv_interface_register: interface '%s' registered on endpoint '%s'\n",
+ DEBUG(4,("dcesrv_interface_register: interface '%s' registered on endpoint '%s'\n",
iface->ndr->name, ep_name));
return NT_STATUS_OK;
@@ -1019,7 +1019,7 @@ static NTSTATUS decrpc_register_ep_server(void *_ep_server)
if (dcesrv_ep_server_byname(ep_server->name) != NULL) {
/* its already registered! */
- DEBUG(1,("DCERPC endpoint server '%s' already registered\n",
+ DEBUG(0,("DCERPC endpoint server '%s' already registered\n",
ep_server->name));
return NT_STATUS_OBJECT_NAME_COLLISION;
}
@@ -1034,7 +1034,7 @@ static NTSTATUS decrpc_register_ep_server(void *_ep_server)
num_ep_servers++;
- DEBUG(1,("DCERPC module '%s' registered\n",
+ DEBUG(3,("DCERPC endpoint server '%s' registered\n",
ep_server->name));
return NT_STATUS_OK;
@@ -1095,6 +1095,6 @@ BOOL dcesrv_init(void)
/* FIXME: Perhaps panic if a basic endpoint server, such as EPMAPER, fails to initialise? */
static_init_dcerpc;
- DEBUG(1,("DCERPC subsystem version %d initialised\n", DCERPC_MODULE_VERSION));
+ DEBUG(3,("DCERPC subsystem version %d initialised\n", DCERPC_MODULE_VERSION));
return True;
}
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 411bf400bf..08f3178689 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -21,6 +21,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef SAMBA_DCERPC_SERVER_H
+#define SAMBA_DCERPC_SERVER_H
+
/* modules can use the following to determine if the interface has changed
* please increment the version number after each interface change
* with a comment and maybe update struct dcesrv_critical_sizes.
@@ -183,3 +186,5 @@ struct dcesrv_critical_sizes {
int sizeof_dcesrv_auth;
int sizeof_dcesrv_handle;
};
+
+#endif /* SAMBA_DCERPC_SERVER_H */
diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index 381c79135c..2ca7fe326f 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -187,7 +187,7 @@ NTSTATUS dcerpc_remote_init(void)
ep_server.interface_by_uuid = remote_op_interface_by_uuid;
ep_server.interface_by_name = remote_op_interface_by_name;
- /* register ourselves with the NTVFS subsystem. */
+ /* register ourselves with the DCERPC subsystem. */
ret = register_backend("dcerpc", &ep_server);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register 'remote' endpoint server!\n"));
generated by cgit (git 2.34.1) at 2024-06-16 08:24:14 +0000