[SCM] Samba Shared Repository - branch master updated - 4f25c779243ba38fce26dea51feafcf28492d79b

[Stefan Metzmacher]

The branch, master has been updated
       via  4f25c779243ba38fce26dea51feafcf28492d79b (commit)
       via  7ed352b0c9f79b288cac850b4e50a9feffd7b069 (commit)
       via  973d50a7ff39c14bf734f095e4bf57843ce80529 (commit)
      from  eb9656e75721d6738d8da0f0ec8386403aa4f5f8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4f25c779243ba38fce26dea51feafcf28492d79b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 3 17:31:32 2008 +0100

    s3: proto.h: add missing sys_[g|s]et_quota_vfs() prototypes
    
    metze

commit 7ed352b0c9f79b288cac850b4e50a9feffd7b069
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 3 14:29:49 2008 +0100

    s4:torture: PROVISION isn't used by all tests
    
    We should not pollute all torture object files with
    EXT_LIB_PYTHON_CFLAGS
    
    metze

commit 973d50a7ff39c14bf734f095e4bf57843ce80529
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 3 14:27:54 2008 +0100

    s4:torture: fix names of defines
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h         |    3 +++
 source4/torture/config.mk       |    5 +++--
 source4/torture/local/config.mk |    3 ++-
 source4/torture/util.h          |    6 +++---
 4 files changed, 11 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5ca5c77..254c33d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -955,6 +955,9 @@ int sys_set_quota(const char *path, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DI
 
 /* The following definitions come from lib/sysquotas_*.c  */
 
+int sys_get_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
+int sys_set_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
+
 int sys_get_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
 int sys_set_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
 
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 211d097..8b12f36 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -1,5 +1,5 @@
 [SUBSYSTEM::TORTURE_UTIL]
-PRIVATE_DEPENDENCIES = LIBCLI_RAW LIBPYTHON smbcalls PROVISION
+PRIVATE_DEPENDENCIES = LIBCLI_RAW
 PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
 
 TORTURE_UTIL_OBJ_FILES = $(addprefix $(torturesrcdir)/, util_smb.o)
@@ -212,7 +212,8 @@ INIT_FUNCTION = torture_net_init
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-NET \
 		POPT_CREDENTIALS \
-		torture_rpc
+		torture_rpc \
+		PROVISION
 # End SUBSYSTEM TORTURE_NET
 #################################
 
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index def391b..46d5e38 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -14,7 +14,8 @@ PRIVATE_DEPENDENCIES = \
 		TORTURE_UTIL \
 		TORTURE_NDR \
 		share \
-		torture_registry
+		torture_registry \
+		PROVISION
 # End SUBSYSTEM TORTURE_LOCAL
 #################################
 
diff --git a/source4/torture/util.h b/source4/torture/util.h
index 9dc948a..f36d542 100644
--- a/source4/torture/util.h
+++ b/source4/torture/util.h
@@ -17,8 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _TORTURE_PROVISION_H_
-#define _TORTURE_PROVISION_H_
+#ifndef _TORTURE_UTIL_H_
+#define _TORTURE_UTIL_H_
 
 #include "torture/torture.h"
 
@@ -94,4 +94,4 @@ NTSTATUS torture_second_tcon(TALLOC_CTX *mem_ctx,
 
 
 
-#endif /* _TORTURE_PROVISION_H_ */
+#endif /* _TORTURE_UTIL_H_ */


-- 
Samba Shared Repository