Changeset 989 for vendor/current/source4/ntvfs/posix

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/source4/ntvfs/posix

Files:

• posix_eadb.c (modified) (6 diffs)
• wscript_build (modified) (1 diff)

vendor/current/source4/ntvfs/posix/posix_eadb.c

@@ -22 +22 @@
 #include "includes.h"
 #include "lib/tdb_wrap/tdb_wrap.h"
+#ifdef WITH_NTVFS_FILESERVER
 #include "vfs_posix.h"
+#endif
 #include "posix_eadb.h"
 
@@ -144 +146 @@
 }
 
-NTSTATUS pull_xattr_blob_tdb(struct pvfs_state *pvfs_state,
-                             TALLOC_CTX *mem_ctx,
-                             const char *attr_name,
-                             const char *fname,
-                             int fd,
-                             size_t estimated_size,
-                             DATA_BLOB *blob)
-{
-        return pull_xattr_blob_tdb_raw(pvfs_state->ea_db,mem_ctx,attr_name,fname,fd,estimated_size,blob);
-}
-
 /*
   push a xattr as a blob, using ea_tdb
@@ -200 +191 @@
         return status;
 }
-NTSTATUS push_xattr_blob_tdb(struct pvfs_state *pvfs_state,
-                             const char *attr_name,
-                             const char *fname,
-                             int fd,
-                             const DATA_BLOB *blob)
-{
-        return push_xattr_blob_tdb_raw(pvfs_state->ea_db, attr_name, fname, fd, blob);
-}
 
 
@@ -235 +218 @@
 
 /*
-  delete a xattr
-*/
-NTSTATUS delete_posix_eadb(struct pvfs_state *pvfs_state, const char *attr_name,
-                          const char *fname, int fd)
-{
-        return delete_posix_eadb_raw(pvfs_state->ea_db,
-                                    attr_name, fname, fd);
-}
-
-
-/*
   delete all xattrs for a file
 */
@@ -272 +244 @@
 
 /*
-  delete all xattrs for a file
-*/
-NTSTATUS unlink_posix_eadb(struct pvfs_state *pvfs_state, const char *fname)
-{
-        return unlink_posix_eadb_raw(pvfs_state->ea_db, fname, -1);
-}
-
-/*
   list all xattrs for a file
 */
@@ -289 +253 @@
                                      fname, fd, 100, list);
 }
+
+#ifdef WITH_NTVFS_FILESERVER
+NTSTATUS pull_xattr_blob_tdb(struct pvfs_state *pvfs_state,
+                             TALLOC_CTX *mem_ctx,
+                             const char *attr_name,
+                             const char *fname,
+                             int fd,
+                             size_t estimated_size,
+                             DATA_BLOB *blob)
+{
+        return pull_xattr_blob_tdb_raw(pvfs_state->ea_db,mem_ctx,attr_name,fname,fd,estimated_size,blob);
+}
+
+NTSTATUS push_xattr_blob_tdb(struct pvfs_state *pvfs_state,
+                             const char *attr_name,
+                             const char *fname,
+                             int fd,
+                             const DATA_BLOB *blob)
+{
+        return push_xattr_blob_tdb_raw(pvfs_state->ea_db, attr_name, fname, fd, blob);
+}
+
+/*
+  delete a xattr
+*/
+NTSTATUS delete_posix_eadb(struct pvfs_state *pvfs_state, const char *attr_name,
+                          const char *fname, int fd)
+{
+        return delete_posix_eadb_raw(pvfs_state->ea_db,
+                                    attr_name, fname, fd);
+}
+
+/*
+  delete all xattrs for a file
+*/
+NTSTATUS unlink_posix_eadb(struct pvfs_state *pvfs_state, const char *fname)
+{
+        return unlink_posix_eadb_raw(pvfs_state->ea_db, fname, -1);
+}
+
+#endif

vendor/current/source4/ntvfs/posix/wscript_build

@@ -1 +1 @@
 #!/usr/bin/env python
 
-bld.SAMBA_SUBSYSTEM('pvfs_acl',
-        source='pvfs_acl.c',
-        autoproto='vfs_acl_proto.h',
-        deps='events samba-modules',
-        )
+if bld.CONFIG_SET('WITH_NTVFS_FILESERVER'):
+    bld.SAMBA_SUBSYSTEM('pvfs_acl',
+                        source='pvfs_acl.c',
+                        autoproto='vfs_acl_proto.h',
+                        deps='events samba-modules',
+    )
 
 
-bld.SAMBA_MODULE('pvfs_acl_xattr',
-        source='pvfs_acl_xattr.c',
-        subsystem='pvfs_acl',
-        init_function='pvfs_acl_xattr_init',
-        deps='NDR_XATTR events'
-        )
+    bld.SAMBA_MODULE('pvfs_acl_xattr',
+                     source='pvfs_acl_xattr.c',
+                     subsystem='pvfs_acl',
+                     init_function='pvfs_acl_xattr_init',
+                    deps='NDR_XATTR events'
+    )
 
 
-bld.SAMBA_MODULE('pvfs_acl_nfs4',
-        source='pvfs_acl_nfs4.c',
-        subsystem='pvfs_acl',
-        init_function='pvfs_acl_nfs4_init',
-        deps='NDR_NFS4ACL samdb events'
-        )
+    bld.SAMBA_MODULE('pvfs_acl_nfs4',
+                     source='pvfs_acl_nfs4.c',
+                     subsystem='pvfs_acl',
+                     init_function='pvfs_acl_nfs4_init',
+                    deps='NDR_NFS4ACL samdb events'
+    )
 
 
-bld.SAMBA_SUBSYSTEM('pvfs_aio',
-        source='pvfs_aio.c',
-        deps='tevent',
-        enabled=False
-        )
+    bld.SAMBA_SUBSYSTEM('pvfs_aio',
+                        source='pvfs_aio.c',
+                        deps='tevent',
+                    enabled=False
+    )
 
 
-bld.SAMBA_MODULE('ntvfs_posix',
-        source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c',
-        autoproto='vfs_posix_proto.h',
-        subsystem='ntvfs',
-        init_function='ntvfs_posix_init',
-        deps='NDR_XATTR attr ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio posix_eadb',
-        internal_module=True
-        )
+    bld.SAMBA_MODULE('ntvfs_posix',
+                     source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c',
+                     autoproto='vfs_posix_proto.h',
+                     subsystem='ntvfs',
+                    init_function='ntvfs_posix_init',
+                     deps='NDR_XATTR attr ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio posix_eadb',
+                     internal_module=True
+    )