svn commit: samba r15188 - in branches/SAMBA_4_0/source/ntvfs: .
cifs ipc nbench posix print simple unixuid
jpeach at samba.org
jpeach at samba.org
Mon Apr 24 01:26:33 GMT 2006
Author: jpeach
Date: 2006-04-24 01:26:31 +0000 (Mon, 24 Apr 2006)
New Revision: 15188
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15188
Log:
Restore svn rev. 15183, 15184 and 15185, which I inadvertantly clobbered
in r15186. I don't think I should be allowed to use quilt and svn at the
same time any more :(
Modified:
branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
branches/SAMBA_4_0/source/ntvfs/ntvfs.h
branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c
branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c
branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c
branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -939,6 +939,7 @@
{
NTSTATUS ret;
struct ntvfs_ops ops;
+ NTVFS_CURRENT_CRITICAL_SIZES(vers);
ZERO_STRUCT(ops);
@@ -985,7 +986,7 @@
/* register ourselves with the NTVFS subsystem. We register
under the name 'cifs'. */
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register CIFS backend!\n"));
Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -777,6 +777,7 @@
{
NTSTATUS ret;
struct ntvfs_ops ops;
+ NTVFS_CURRENT_CRITICAL_SIZES(vers);
ZERO_STRUCT(ops);
@@ -817,7 +818,7 @@
ops.cancel = ipc_cancel;
/* register ourselves with the NTVFS subsystem. */
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register IPC backend!\n"));
Modified: branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -884,6 +884,7 @@
{
NTSTATUS ret;
struct ntvfs_ops ops;
+ NTVFS_CURRENT_CRITICAL_SIZES(vers);
ZERO_STRUCT(ops);
@@ -928,7 +929,7 @@
ops.trans2 = NULL;
/* register ourselves with the NTVFS subsystem. */
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register nbench backend!\n"));
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs.h
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs.h 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs.h 2006-04-24 01:26:31 UTC (rev 15188)
@@ -266,6 +266,17 @@
int sizeof_ntvfs_request;
};
+#define NTVFS_CURRENT_CRITICAL_SIZES(c) \
+ struct ntvfs_critical_sizes c = { \
+ .interface_version = NTVFS_INTERFACE_VERSION, \
+ .sizeof_ntvfs_critical_sizes = sizeof(struct ntvfs_critical_sizes), \
+ .sizeof_ntvfs_context = sizeof(struct ntvfs_context), \
+ .sizeof_ntvfs_module_context = sizeof(struct ntvfs_module_context), \
+ .sizeof_ntvfs_ops = sizeof(struct ntvfs_ops), \
+ .sizeof_ntvfs_async_state = sizeof(struct ntvfs_async_state), \
+ .sizeof_ntvfs_request = sizeof(struct ntvfs_request), \
+ }
+
struct messaging_context;
#include "librpc/gen_ndr/security.h"
#include "librpc/gen_ndr/notify.h"
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -44,11 +44,18 @@
The 'type' is used to specify whether this is for a disk, printer or IPC$ share
*/
-_PUBLIC_ NTSTATUS ntvfs_register(const void *_ops)
+_PUBLIC_ NTSTATUS ntvfs_register(const struct ntvfs_ops *ops,
+ const struct ntvfs_critical_sizes *const sizes)
{
- const struct ntvfs_ops *ops = _ops;
struct ntvfs_ops *new_ops;
-
+
+ if (ntvfs_interface_differs(sizes)) {
+ DEBUG(0, ("NTVFS backend '%s' for type %d "
+ "failed version check\n",
+ ops->name, (int)ops->type));
+ return NT_STATUS_BAD_FUNCTION_TABLE;
+ }
+
if (ntvfs_backend_byname(ops->name, ops->type) != NULL) {
/* its already registered! */
DEBUG(0,("NTVFS backend '%s' for type %d already registered\n",
@@ -98,22 +105,50 @@
This can be used by backends to either detect compilation errors, or provide
multiple implementations for different smbd compilation options in one module
*/
-static const struct ntvfs_critical_sizes critical_sizes = {
- .interface_version = NTVFS_INTERFACE_VERSION,
- .sizeof_ntvfs_critical_sizes = sizeof(struct ntvfs_critical_sizes),
- .sizeof_ntvfs_context = sizeof(struct ntvfs_context),
- .sizeof_ntvfs_module_context = sizeof(struct ntvfs_module_context),
- .sizeof_ntvfs_ops = sizeof(struct ntvfs_ops),
- .sizeof_ntvfs_async_state = sizeof(struct ntvfs_async_state),
- .sizeof_ntvfs_request = sizeof(struct ntvfs_request),
-};
+static const NTVFS_CURRENT_CRITICAL_SIZES(critical_sizes);
+
_PUBLIC_ const struct ntvfs_critical_sizes *ntvfs_interface_version(void)
{
return &critical_sizes;
}
+_PUBLIC_ BOOL ntvfs_interface_differs(const struct ntvfs_critical_sizes *const iface)
+{
+ /* The comparison would be easier with memcmp, but compiler-interset
+ * alignment padding is not guaranteed to be zeroed.
+ */
+#define FIELD_DIFFERS(field) (iface->field != critical_sizes.field)
+
+ if (FIELD_DIFFERS(interface_version))
+ return True;
+
+ if (FIELD_DIFFERS(sizeof_ntvfs_critical_sizes))
+ return True;
+
+ if (FIELD_DIFFERS(sizeof_ntvfs_context))
+ return True;
+
+ if (FIELD_DIFFERS(sizeof_ntvfs_module_context))
+ return True;
+
+ if (FIELD_DIFFERS(sizeof_ntvfs_ops))
+ return True;
+
+ if (FIELD_DIFFERS(sizeof_ntvfs_async_state))
+ return True;
+
+ if (FIELD_DIFFERS(sizeof_ntvfs_request))
+ return True;
+
+ /* Versions match. */
+ return False;
+
+#undef FIELD_DIFFERS
+}
+
+
/*
initialise a connection structure to point at a NTVFS backend
*/
Modified: branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -286,6 +286,7 @@
{
NTSTATUS ret;
struct ntvfs_ops ops;
+ NTVFS_CURRENT_CRITICAL_SIZES(vers);
ZERO_STRUCT(ops);
@@ -328,14 +329,14 @@
under the name 'default' as we wish to be the default
backend, and also register as 'posix' */
ops.name = "default";
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register POSIX backend as '%s'!\n", ops.name));
}
ops.name = "posix";
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register POSIX backend as '%s'!\n", ops.name));
Modified: branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -100,6 +100,7 @@
{
NTSTATUS ret;
struct ntvfs_ops ops;
+ NTVFS_CURRENT_CRITICAL_SIZES(vers);
ZERO_STRUCT(ops);
@@ -115,7 +116,7 @@
/* register ourselves with the NTVFS subsystem. We register under the name 'default'
as we wish to be the default backend */
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register PRINT backend!\n"));
Modified: branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -969,6 +969,7 @@
{
NTSTATUS ret;
struct ntvfs_ops ops;
+ NTVFS_CURRENT_CRITICAL_SIZES(vers);
ZERO_STRUCT(ops);
@@ -1010,7 +1011,7 @@
ops.type = NTVFS_DISK;
ops.name = "simple";
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register simple backend with name: %s!\n",
Modified: branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c 2006-04-24 00:38:53 UTC (rev 15187)
+++ branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c 2006-04-24 01:26:31 UTC (rev 15188)
@@ -639,6 +639,7 @@
{
NTSTATUS ret;
struct ntvfs_ops ops;
+ NTVFS_CURRENT_CRITICAL_SIZES(vers);
ZERO_STRUCT(ops);
@@ -679,15 +680,15 @@
/* we register under all 3 backend types, as we are not type specific */
ops.type = NTVFS_DISK;
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) goto failed;
ops.type = NTVFS_PRINT;
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) goto failed;
ops.type = NTVFS_IPC;
- ret = ntvfs_register(&ops);
+ ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) goto failed;
failed:
More information about the samba-cvs
mailing list