diff options
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/python/pyposix_eadb.c | 1 | ||||
| -rw-r--r-- | source4/ntvfs/posix/python/pyxattr_native.c | 8 | ||||
| -rw-r--r-- | source4/ntvfs/posix/python/pyxattr_tdb.c | 1 | ||||
| -rw-r--r-- | source4/ntvfs/posix/wscript_build | 4 | ||||
| -rw-r--r-- | source4/ntvfs/posix/xattr_system.c | 13 |
5 files changed, 12 insertions, 15 deletions
diff --git a/source4/ntvfs/posix/python/pyposix_eadb.c b/source4/ntvfs/posix/python/pyposix_eadb.c index 226160f88d..48310cc016 100644 --- a/source4/ntvfs/posix/python/pyposix_eadb.c +++ b/source4/ntvfs/posix/python/pyposix_eadb.c @@ -24,7 +24,6 @@ #include "tdb_compat.h" #include "lib/tdb_wrap/tdb_wrap.h" #include "librpc/ndr/libndr.h" -#include "lib/util/wrap_xattr.h" #include "ntvfs/posix/posix_eadb.h" #include "libcli/util/pyerrors.h" #include "param/pyparam.h" diff --git a/source4/ntvfs/posix/python/pyxattr_native.c b/source4/ntvfs/posix/python/pyxattr_native.c index caec115c05..4f610a01f5 100644 --- a/source4/ntvfs/posix/python/pyxattr_native.c +++ b/source4/ntvfs/posix/python/pyxattr_native.c @@ -21,7 +21,7 @@ #include <Python.h> #include "includes.h" #include "librpc/ndr/libndr.h" -#include "lib/util/wrap_xattr.h" +#include "system/filesys.h" void initxattr_native(void); @@ -46,7 +46,7 @@ static PyObject *py_wrap_setxattr(PyObject *self, PyObject *args) return NULL; blob.length = blobsize; - ret = wrap_setxattr(filename, attribute, blob.data, blob.length, 0); + ret = setxattr(filename, attribute, blob.data, blob.length, 0); if( ret < 0 ) { if (errno == ENOTSUP) { PyErr_SetFromErrno(PyExc_IOError); @@ -68,7 +68,7 @@ static PyObject *py_wrap_getxattr(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "ss", &filename, &attribute)) return NULL; mem_ctx = talloc_new(NULL); - len = wrap_getxattr(filename,attribute,NULL,0); + len = getxattr(filename,attribute,NULL,0); if( len < 0 ) { if (errno == ENOTSUP) { PyErr_SetFromErrno(PyExc_IOError); @@ -80,7 +80,7 @@ static PyObject *py_wrap_getxattr(PyObject *self, PyObject *args) } /* check length ... */ buf = talloc_zero_array(mem_ctx, char, len); - len = wrap_getxattr(filename, attribute, buf, len); + len = getxattr(filename, attribute, buf, len); if( len < 0 ) { if (errno == ENOTSUP) { PyErr_SetFromErrno(PyExc_IOError); diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c index 1df9897e9a..b5109317dd 100644 --- a/source4/ntvfs/posix/python/pyxattr_tdb.c +++ b/source4/ntvfs/posix/python/pyxattr_tdb.c @@ -24,7 +24,6 @@ #include "tdb_compat.h" #include "lib/tdb_wrap/tdb_wrap.h" #include "librpc/ndr/libndr.h" -#include "lib/util/wrap_xattr.h" #include "ntvfs/posix/posix_eadb.h" #include "libcli/util/pyerrors.h" #include "param/pyparam.h" diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 6ac22e1e84..ee0ef2494c 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -35,14 +35,14 @@ bld.SAMBA_MODULE('ntvfs_posix', autoproto='vfs_posix_proto.h', subsystem='ntvfs', init_function='ntvfs_posix_init', - deps='NDR_XATTR wrap_xattr ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio posix_eadb', + deps='NDR_XATTR attr ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio posix_eadb', internal_module=True ) bld.SAMBA_PYTHON('python_xattr_native', source='python/pyxattr_native.c', - deps='ndr ldb samdb samba-credentials pyparam_util wrap_xattr attr', + deps='ndr ldb samdb samba-credentials pyparam_util attr', realname='samba/xattr_native.so' ) diff --git a/source4/ntvfs/posix/xattr_system.c b/source4/ntvfs/posix/xattr_system.c index f22c0e9ea4..ebb2010e38 100644 --- a/source4/ntvfs/posix/xattr_system.c +++ b/source4/ntvfs/posix/xattr_system.c @@ -21,7 +21,6 @@ #include "includes.h" #include "vfs_posix.h" -#include "../lib/util/wrap_xattr.h" /* pull a xattr as a blob, from either a file or a file descriptor @@ -43,9 +42,9 @@ NTSTATUS pull_xattr_blob_system(struct pvfs_state *pvfs, again: if (fd != -1) { - ret = wrap_fgetxattr(fd, attr_name, blob->data, estimated_size); + ret = fgetxattr(fd, attr_name, blob->data, estimated_size); } else { - ret = wrap_getxattr(fname, attr_name, blob->data, estimated_size); + ret = getxattr(fname, attr_name, blob->data, estimated_size); } if (ret == -1 && errno == ERANGE) { estimated_size *= 2; @@ -104,9 +103,9 @@ NTSTATUS push_xattr_blob_system(struct pvfs_state *pvfs, int ret; if (fd != -1) { - ret = wrap_fsetxattr(fd, attr_name, blob->data, blob->length, 0); + ret = fsetxattr(fd, attr_name, blob->data, blob->length, 0); } else { - ret = wrap_setxattr(fname, attr_name, blob->data, blob->length, 0); + ret = setxattr(fname, attr_name, blob->data, blob->length, 0); } if (ret == -1) { return pvfs_map_errno(pvfs, errno); @@ -125,9 +124,9 @@ NTSTATUS delete_xattr_system(struct pvfs_state *pvfs, const char *attr_name, int ret; if (fd != -1) { - ret = wrap_fremovexattr(fd, attr_name); + ret = fremovexattr(fd, attr_name); } else { - ret = wrap_removexattr(fname, attr_name); + ret = removexattr(fname, attr_name); } if (ret == -1) { return pvfs_map_errno(pvfs, errno); |