mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
r15185: Force all NTVFS modules to provide a critical sizes structure so
the version information can be checked when modules are registered.
This commit is contained in:
parent
bf946e6d6d
commit
95eb558063
@ -939,6 +939,7 @@ NTSTATUS ntvfs_cifs_init(void)
|
||||
{
|
||||
NTSTATUS ret;
|
||||
struct ntvfs_ops ops;
|
||||
NTVFS_CURRENT_CRITICAL_SIZES(vers);
|
||||
|
||||
ZERO_STRUCT(ops);
|
||||
|
||||
@ -985,7 +986,7 @@ NTSTATUS ntvfs_cifs_init(void)
|
||||
|
||||
/* 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"));
|
||||
|
@ -777,6 +777,7 @@ NTSTATUS ntvfs_ipc_init(void)
|
||||
{
|
||||
NTSTATUS ret;
|
||||
struct ntvfs_ops ops;
|
||||
NTVFS_CURRENT_CRITICAL_SIZES(vers);
|
||||
|
||||
ZERO_STRUCT(ops);
|
||||
|
||||
@ -817,7 +818,7 @@ NTSTATUS ntvfs_ipc_init(void)
|
||||
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"));
|
||||
|
@ -884,6 +884,7 @@ NTSTATUS ntvfs_nbench_init(void)
|
||||
{
|
||||
NTSTATUS ret;
|
||||
struct ntvfs_ops ops;
|
||||
NTVFS_CURRENT_CRITICAL_SIZES(vers);
|
||||
|
||||
ZERO_STRUCT(ops);
|
||||
|
||||
@ -928,7 +929,7 @@ NTSTATUS ntvfs_nbench_init(void)
|
||||
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"));
|
||||
|
@ -44,10 +44,18 @@ static int num_backends;
|
||||
|
||||
The 'type' is used to specify whether this is for a disk, printer or IPC$ share
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ntvfs_register(const struct ntvfs_ops *ops)
|
||||
_PUBLIC_ NTSTATUS ntvfs_register(const struct ntvfs_ops *ops,
|
||||
const struct ntvfs_critical_sizes *const sizes)
|
||||
{
|
||||
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",
|
||||
|
@ -286,6 +286,7 @@ NTSTATUS ntvfs_posix_init(void)
|
||||
{
|
||||
NTSTATUS ret;
|
||||
struct ntvfs_ops ops;
|
||||
NTVFS_CURRENT_CRITICAL_SIZES(vers);
|
||||
|
||||
ZERO_STRUCT(ops);
|
||||
|
||||
@ -328,14 +329,14 @@ NTSTATUS ntvfs_posix_init(void)
|
||||
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));
|
||||
|
@ -100,6 +100,7 @@ NTSTATUS ntvfs_print_init(void)
|
||||
{
|
||||
NTSTATUS ret;
|
||||
struct ntvfs_ops ops;
|
||||
NTVFS_CURRENT_CRITICAL_SIZES(vers);
|
||||
|
||||
ZERO_STRUCT(ops);
|
||||
|
||||
@ -115,7 +116,7 @@ NTSTATUS ntvfs_print_init(void)
|
||||
|
||||
/* 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"));
|
||||
|
@ -969,6 +969,7 @@ NTSTATUS ntvfs_simple_init(void)
|
||||
{
|
||||
NTSTATUS ret;
|
||||
struct ntvfs_ops ops;
|
||||
NTVFS_CURRENT_CRITICAL_SIZES(vers);
|
||||
|
||||
ZERO_STRUCT(ops);
|
||||
|
||||
@ -1010,7 +1011,7 @@ NTSTATUS ntvfs_simple_init(void)
|
||||
|
||||
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",
|
||||
|
@ -639,6 +639,7 @@ NTSTATUS ntvfs_unixuid_init(void)
|
||||
{
|
||||
NTSTATUS ret;
|
||||
struct ntvfs_ops ops;
|
||||
NTVFS_CURRENT_CRITICAL_SIZES(vers);
|
||||
|
||||
ZERO_STRUCT(ops);
|
||||
|
||||
@ -679,15 +680,15 @@ NTSTATUS ntvfs_unixuid_init(void)
|
||||
|
||||
/* 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:
|
||||
|
Loading…
Reference in New Issue
Block a user