diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-04-07 13:15:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:00:47 -0500 |
| commit | 2e894625e7c951b5ee66670124b4bef82a8129d9 (patch) | |
| tree | f0020b62a5e8258bb9b3bb999ec2f9a63c6ec305 /source4/ntvfs/posix | |
| parent | 5b1a495e96be6f92df3ba2d30095d879041f757e (diff) | |
| download | samba-2e894625e7c951b5ee66670124b4bef82a8129d9.tar.gz samba-2e894625e7c951b5ee66670124b4bef82a8129d9.tar.bz2 samba-2e894625e7c951b5ee66670124b4bef82a8129d9.zip | |
r14964: - move sidmap code from ntvfs_common to SAMDB
- make ntvfs_common a library
- create sys_notify library
metze
(This used to be commit a3e1d56cf7b688c515f5d6d4d43e0b24c2261d15)
Diffstat (limited to 'source4/ntvfs/posix')
| -rw-r--r-- | source4/ntvfs/posix/config.mk | 2 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 10 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.h | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index c49fbc88b7..b9724cb9f2 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -32,6 +32,6 @@ OBJ_FILES = \ pvfs_notify.o \ xattr_system.o \ xattr_tdb.o -REQUIRED_SUBSYSTEMS = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID +REQUIRED_SUBSYSTEMS = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID ntvfs_common # End MODULE ntvfs_posix ################################################ diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index dd8c3fe81f..c4d4d11c04 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -332,11 +332,19 @@ NTSTATUS ntvfs_posix_init(void) ops.name = "default"; ret = ntvfs_register(&ops); + 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); if (!NT_STATUS_IS_OK(ret)) { - DEBUG(0,("Failed to register POSIX backend!\n")); + DEBUG(0,("Failed to register POSIX backend as '%s'!\n", ops.name)); + } + + if (NT_STATUS_IS_OK(ret)) { + ret = ntvfs_common_init(); } return ret; diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index f34529bc0f..335cfdf4e0 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/ntvfs/posix/vfs_posix.h @@ -27,6 +27,7 @@ #include "system/filesys.h" #include "ntvfs/ntvfs.h" #include "ntvfs/common/proto.h" +#include "dsdb/samdb/samdb.h" /* this is the private structure for the posix vfs backend. It is used to hold per-connection (per tree connect) state information */ |