diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-29 17:40:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:41 -0500 |
| commit | 4fa24df98ded939c68bdc95e9f09334caeeb84af (patch) | |
| tree | 156dfe96806880d1da7f944fff6a84ffcc045e59 /source4/ntvfs | |
| parent | 535d1920f887ef98d962bcd7a40eae556f8e727f (diff) | |
| download | samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.tar.gz samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.tar.bz2 samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.zip | |
r19507: Merge my DSO fixes branch. Building Samba's libraries as shared libraries
works again now, by specifying --enable-dso to configure.
(This used to be commit 7a01235067a4800b07b8919a6a475954bfb0b04c)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/config.mk | 5 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_xattr.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index ed182d9a98..5fd6e58d2e 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -2,9 +2,10 @@ # Start MODULE pvfs_acl_xattr [MODULE::pvfs_acl_xattr] INIT_FUNCTION = pvfs_acl_xattr_init -SUBSYSTEM = ntvfs +SUBSYSTEM = ntvfs_posix OBJ_FILES = \ pvfs_acl_xattr.o +PRIVATE_DEPENDENCIES = NDR_XATTR # End MODULE pvfs_acl_xattr ################################################ @@ -52,7 +53,7 @@ OBJ_FILES = \ pvfs_notify.o \ xattr_system.o \ xattr_tdb.o -PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4 +#PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4 PUBLIC_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING # End MODULE ntvfs_posix ################################################ diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c index ab2f3fef6c..fcc2d351c9 100644 --- a/source4/ntvfs/posix/pvfs_xattr.c +++ b/source4/ntvfs/posix/pvfs_xattr.c @@ -101,7 +101,7 @@ NTSTATUS pvfs_xattr_unlink_hook(struct pvfs_state *pvfs, const char *fname) /* load a NDR structure from a xattr */ -NTSTATUS pvfs_xattr_ndr_load(struct pvfs_state *pvfs, +_PUBLIC_ NTSTATUS pvfs_xattr_ndr_load(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, const char *fname, int fd, const char *attr_name, void *p, void *pull_fn) @@ -126,7 +126,7 @@ NTSTATUS pvfs_xattr_ndr_load(struct pvfs_state *pvfs, /* save a NDR structure into a xattr */ -NTSTATUS pvfs_xattr_ndr_save(struct pvfs_state *pvfs, +_PUBLIC_ NTSTATUS pvfs_xattr_ndr_save(struct pvfs_state *pvfs, const char *fname, int fd, const char *attr_name, void *p, void *push_fn) { |