[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  5de7a3d quota: move function again to its belonging ifdef block
       via  da747fa s3:proto.h: remove duplicate disk_quotas prototypes
       via  f602640 quota: fix configure test for HP-UX
      from  6a1fa3e samba3.smb2.durable-open.delete_on_close1 is now flapping (sometimes passes).

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


- Log -----------------------------------------------------------------
commit 5de7a3d73908f50dbaf141d2f964849904b2fa1a
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 11 01:00:50 2012 +0200

    quota: move function again to its belonging ifdef block
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Sep 11 04:44:28 CEST 2012 on sn-devel-104

commit da747faad25640d0d51e4ca4153eb4e035ab9097
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 11 00:44:04 2012 +0200

    s3:proto.h: remove duplicate disk_quotas prototypes

commit f6026407694f56f5a23338aa9e687fda9921a83e
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 11 00:07:45 2012 +0200

    quota: fix configure test for HP-UX
    
    while HP-UX does have the 4A quota interface our test failed due to a missing
    function prototype in HP-UX and our test running in strict mode with
    compile warnings be errors. So let's make our own prototype in the test when we
    are on HP*UX

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

Summary of changes:
 source3/smbd/proto.h      |   10 ----------
 source3/smbd/quotas.c     |   20 +++++++++-----------
 source3/tests/sysquotas.c |    6 ++++++
 3 files changed, 15 insertions(+), 21 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index a6aa862..5d6a299 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -788,17 +788,7 @@ bool fork_echo_handler(struct smbd_server_connection *sconn);
 /* The following definitions come from smbd/quotas.c  */
 
 bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize);
-bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize);
-bool disk_quotas(const char *path,
-		uint64_t *bsize,
-		uint64_t *dfree,
-		uint64_t *dsize);
-bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize);
-bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize);
-bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize);
 bool disk_quotas_vxfs(const char *name, char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize);
-bool disk_quotas(const char *path,uint64_t *bsize,uint64_t *dfree,uint64_t *dsize);
-bool disk_quotas(const char *path,uint64_t *bsize,uint64_t *dfree,uint64_t *dsize);
 
 /* The following definitions come from smbd/reply.c  */
 
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index d9b21f5..c64b63a 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -112,6 +112,15 @@ static int my_xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr)
 	return (1);
 }
 
+static int my_xdr_getquota_args(XDR *xdrsp, struct getquota_args *args)
+{
+	if (!xdr_string(xdrsp, &args->gqa_pathp, RQ_PATHLEN ))
+		return(0);
+	if (!xdr_int(xdrsp, &args->gqa_uid))
+		return(0);
+	return (1);
+}
+
 /* Restricted to SUNOS5 for the moment, I haven`t access to others to test. */
 static bool nfs_quotas(char *nfspath, uid_t euser_id, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
@@ -520,17 +529,6 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d
 
 #endif
 
-#if defined(SUNOS)
-static int my_xdr_getquota_args(XDR *xdrsp, struct getquota_args *args)
-{
-	if (!xdr_string(xdrsp, &args->gqa_pathp, RQ_PATHLEN ))
-		return(0);
-	if (!xdr_int(xdrsp, &args->gqa_uid))
-		return(0);
-	return (1);
-}
-#endif
-
 #if defined(VXFS_QUOTA)
 
 /****************************************************************************
diff --git a/source3/tests/sysquotas.c b/source3/tests/sysquotas.c
index 68f8a1c..1544dca 100644
--- a/source3/tests/sysquotas.c
+++ b/source3/tests/sysquotas.c
@@ -24,6 +24,12 @@
 # include <sys/quota.h>
 #endif
 
+#ifdef HPUX
+/* HPUX has no prototype for quotactl but we test compile with strict
+   error checks, which would fail without function prototype */
+extern int quotactl(int cmd, const char *special, uid_t uid, void *addr);
+#endif
+
 #ifndef SYS_DQBLK
 #define SYS_DQBLK dqblk
 #endif


-- 
Samba Shared Repository