The branch, master has been updated
via 2ea0f6c s3:quota-nfs: add RQ_PATHLEN define for systems that don't
have it
via 79df06e s3:quota-nfs: another build fix for the old Unix world
via b89d988 s3: fix wrong invocations of talloc_realloc
from 7a51c5e selftest/knownfail: we pass some samba3.smb2.durable-*
tests now
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2ea0f6c00da1287a8c59efcbceb7f4f6525a52b0
Author: Björn Jacke <b...@sernet.de>
Date: Sun Sep 9 16:00:47 2012 +0200
s3:quota-nfs: add RQ_PATHLEN define for systems that don't have it
Autobuild-User(master): Björn Jacke <b...@sernet.de>
Autobuild-Date(master): Sun Sep 9 17:44:51 CEST 2012 on sn-devel-104
commit 79df06ed009bc9a55703014213af436f2045bda5
Author: Björn Jacke <b...@sernet.de>
Date: Sun Sep 9 15:59:42 2012 +0200
s3:quota-nfs: another build fix for the old Unix world
commit b89d9887e8fd20bef9bbc6383e63cd356db08361
Author: Björn Jacke <b...@sernet.de>
Date: Sun Sep 9 01:59:39 2012 +0200
s3: fix wrong invocations of talloc_realloc
-----------------------------------------------------------------------
Summary of changes:
source3/lib/sysquotas_nfs.c | 6 +++++-
source3/modules/vfs_aixacl_util.c | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/sysquotas_nfs.c b/source3/lib/sysquotas_nfs.c
index 6f87137..ad98152 100644
--- a/source3/lib/sysquotas_nfs.c
+++ b/source3/lib/sysquotas_nfs.c
@@ -44,6 +44,10 @@
#endif
#include <rpc/xdr.h>
+#ifndef RQ_PATHLEN
+#define RQ_PATHLEN 1024
+#endif
+
#ifdef HAVE_GETQUOTA_RSLT_GETQUOTA_RSLT_U
#define GQR_RQUOTA getquota_rslt_u.gqr_rquota
#define GQR_STATUS status
@@ -69,7 +73,7 @@ static int my_xdr_getquota_rslt(XDR *xdrsp, struct
getquota_rslt *gqr)
DEBUG(6,("nfs_quotas: Status bad or zero\n"));
return 0;
}
- gqr->status = quotastat;
+ gqr->GQR_STATUS = quotastat;
if (!xdr_int(xdrsp, &gqr->GQR_RQUOTA.rq_bsize)) {
DEBUG(6,("nfs_quotas: Block size bad or zero\n"));
diff --git a/source3/modules/vfs_aixacl_util.c
b/source3/modules/vfs_aixacl_util.c
index bd5ccbb..fb13866 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -63,7 +63,7 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
idp = acl_entry->ace_id;
DEBUG(10,("idp->id_data is %d\n",idp->id_data[0]));
- result->acl = talloc_realloc(result, result->acl,
result->count+1);
+ result->acl = talloc_realloc(result, result->acl,
struct smb_acl_entry, result->count+1);
if (result == NULL) {
DEBUG(0, ("talloc_realloc failed\n"));
errno = ENOMEM;
@@ -138,7 +138,7 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
for( i = 1; i < 4; i++) {
DEBUG(10,("i is %d\n",i));
- result->acl = talloc_realloc(result, result->acl,
result->count+1);
+ result->acl = talloc_realloc(result, result->acl, struct
smb_acl_entry, result->count+1);
if (result->acl == NULL) {
TALLOC_FREE(result);
DEBUG(0, ("talloc_realloc failed\n"));
--
Samba Shared Repository
