some DEBUG and comment fixes

metze
(This used to be commit 5ac4f878687eb0fa95a2e5830a8372168a27d3b3)

diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm
index 20a8c383ea339a16d98c451574c55bc709e2755d..297d4e3248aaaa43292fc01f21f3ccdaa513ad7f 100644 (file)
--- 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 10fd56cb443422b35e8e17d63d591e09d809e96a..976fa96b55b4fdbd4a8c8a2f5caad0afc8b025b9 100644 (file)
--- 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 c6d5a529605677d157cb32632e05d0694d71b525..cf1d21bf33f11644eeff52ee00293b5ed7872416 100644 (file)
--- 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 e4009fd1f0144ca6ffc33450aa402bb7ce73aa80..3e1f77edce4568451d4dc296e405fb94c6f61124 100644 (file)
--- 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 a9484d4329e0c04059b20a849df44584e9e1bf65..f56b9065018f3d89155e6be10cfb0d35e11b107e 100644 (file)
--- 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 7972a3565a48b11b6ca8638923ca4dc012e3243b..157bf03320c122977d32c65cf316d5fb44f54db5 100644 (file)
--- 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 0553537cb539f12467ca1139d7b9b8a3f8ba1090..a17910e1d5e0975c3ea43efbe2a75283c00d034c 100644 (file)
--- 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 411bf400bf311935477f8191cf8147dec1e288b6..08f3178689800be43ccb29189a39f39a50cee7de 100644 (file)
--- 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 381c79135c1da73a588f29dee5f71b9561bc4051..2ca7fe326f5e19f176e67fb2e862f2247a5804e7 100644 (file)
--- 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"));