[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Sep 26 03:51:02 MDT 2012
The branch, master has been updated
via 968da5f nsswitch: Add waf tests for solaris special cases
via 128fb54 build: Remove unused --with-sys-quotas option
via afbc87b build: Set HAVE_SYS_QUOTAS and WITH_QUOTAS if we have any supported sysquota backend
via 7ad1971 build: Remove unused samba_cv_sysquotas_file variable from autoconf configure
via e1f17ee build: Add waf configure support for non-linux quotas
from 11634e6 smb.conf(5): Remove documentation for removed 'lock spin count' parameter.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 968da5f890a978f482f56f9eaff0c56a0d52980c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Sep 26 18:09:20 2012 +1000
nsswitch: Add waf tests for solaris special cases
These are in configure.in for autoconf. Found in the config.h comparison on
the smbtorture4 build.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Wed Sep 26 11:50:10 CEST 2012 on sn-devel-104
commit 128fb54ab4feb0c665f438f56dca5f734e355be1
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Sep 26 13:10:17 2012 +1000
build: Remove unused --with-sys-quotas option
commit afbc87b8cc5b068feadb773bdf755abc26f7d0db
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Sep 26 12:42:15 2012 +1000
build: Set HAVE_SYS_QUOTAS and WITH_QUOTAS if we have any supported sysquota backend
commit 7ad1971e2240eccda70783c4de77b7c5bc7893d3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Sep 26 12:33:50 2012 +1000
build: Remove unused samba_cv_sysquotas_file variable from autoconf configure
commit e1f17eef970cd8432a3391b0bb79de4857fac177
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Sep 26 12:33:13 2012 +1000
build: Add waf configure support for non-linux quotas
-----------------------------------------------------------------------
Summary of changes:
nsswitch/wscript_configure | 16 ++++++++++++++++
source3/configure.in | 3 ---
source3/wscript | 44 +++++++++++++++++++++++++++++++++++++++++---
3 files changed, 57 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/wscript_configure b/nsswitch/wscript_configure
index 7d6ea82..3048f48 100644
--- a/nsswitch/wscript_configure
+++ b/nsswitch/wscript_configure
@@ -4,3 +4,19 @@ conf.CHECK_HEADERS('nss.h nss_common.h ns_api.h')
conf.CHECK_HEADERS('security/pam_appl.h security/pam_modules.h pam/pam_modules.h', together=True)
conf.CHECK_FUNCS_IN('pam_start', 'pam', checklibc=True, headers='security/pam_appl.h')
+
+# Solaris 10 does have new member in nss_XbyY_key
+conf.CHECK_STRUCTURE_MEMBER('union nss_XbyY_key', 'ipnode.af_family',
+ define='HAVE_NSS_XBYY_KEY_IPNODE',
+ headers='nss_dbdefs.h')
+
+# Solaris has some extra fields in struct passwd that need to be
+# initialised otherwise nscd crashes.
+
+conf.CHECK_STRUCTURE_MEMBER('struct passwd', 'pw_comment',
+ define='HAVE_PASSWD_PW_COMMENT',
+ headers='pwd.h')
+
+conf.CHECK_STRUCTURE_MEMBER('struct passwd', 'pw_age',
+ define='HAVE_PASSWD_PW_AGE',
+ headers='pwd.h')
diff --git a/source3/configure.in b/source3/configure.in
index 489b017..5045742 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4539,7 +4539,6 @@ case "$host_os" in
*linux*)
samba_cv_SYSQUOTA_FOUND=yes
AC_DEFINE(HAVE_QUOTACTL_LINUX,1,[Whether Linux quota support is available])
- samba_cv_sysquotas_file="lib/sysquotas_linux.c"
AC_MSG_CHECKING(whether to use the lib/sysquotas_linux.c builtin support)
AC_MSG_RESULT(yes)
@@ -4623,7 +4622,6 @@ AC_TRY_RUN_STRICT([
if test x"$samba_cv_HAVE_QUOTACTL_4A" = x"yes"; then
samba_cv_SYSQUOTA_FOUND=yes;
AC_DEFINE(HAVE_QUOTACTL_4A,1,[Whether long quotactl(int cmd, char *special, qid_t id, caddr_t addr) is available])
- samba_cv_sysquotas_file="lib/sysquotas_4A.c"
fi
fi
@@ -4638,7 +4636,6 @@ AC_TRY_RUN_STRICT([
if test x"$samba_cv_HAVE_QUOTACTL_4B" = x"yes"; then
samba_cv_SYSQUOTA_FOUND=yes;
AC_DEFINE(HAVE_QUOTACTL_4B,1,[Whether int quotactl(const char *path, int cmd, int id, char *addr) is available])
- samba_cv_sysquotas_file="lib/sysquotas_4B.c"
AC_CHECK_MEMBERS([struct dqblk.dqb_curbytes], # Darwin bytecount style
[ AC_DEFINE([HAVE_STRUCT_DQBLK_DQB_CURBYTES],[1],[darwin style quota bytecount])],,
[#include <sys/types.h>
diff --git a/source3/wscript b/source3/wscript
index cb76293..3815c7c 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -31,7 +31,6 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('pam')
opt.SAMBA3_ADD_OPTION('pam_smbpass')
opt.SAMBA3_ADD_OPTION('quotas')
- opt.SAMBA3_ADD_OPTION('sys-quotas')
opt.SAMBA3_ADD_OPTION('sendfile-support')
opt.SAMBA3_ADD_OPTION('utmp')
opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True)
@@ -1224,7 +1223,9 @@ main() {
# For IRIX like dqb_isoftlimit instead of dqb_fsoftlimit in struc dqblk
conf.CHECK_STRUCTURE_MEMBER('struct dqblk', 'dqb_fsoftlimit', define='HAVE_DQB_FSOFTLIMIT',
headers='sys/quota.h')
-
+ #darwin style quota bytecount
+ conf.CHECK_STRUCTURE_MEMBER('struct dqblk', 'dqb_curbytes', define='HAVE_STRUCT_DQBLK_DQB_CURBYTES',
+ headers='sys/quota.h')
if conf.CHECK_HEADERS('rpcsvc/rquota.h'):
conf.DEFINE('HAVE_NFS_QUOTAS', '1')
conf.CHECK_STRUCTURE_MEMBER('struct getquota_rslt', 'getquota_rslt_u',
@@ -1233,11 +1234,48 @@ main() {
if (host_os.rfind('linux') > -1):
conf.DEFINE('HAVE_QUOTACTL_LINUX', '1')
+ elif not conf.CONFIG_SET("HAVE_XFS_QUOTAS"):
+ if not conf.CHECK_CODE('''
+ #define HAVE_QUOTACTL_4A 1
+ #define AUTOCONF_TEST 1
+ #include "confdefs.h"
+ #include "${srcdir-.}/../tests/sysquotas.c"
+ ''',
+ define='HAVE_QUOTACTL_4A',
+ msg='for QUOTACTL_4A: long quotactl(int cmd, char *special, qid_t id, caddr_t addr)',
+ execute=True,
+ local_include=False):
+ conf.CHECK_CODE('''
+ #define HAVE_QUOTACTL_4B 1
+ #define AUTOCONF_TEST 1
+ #include "confdefs.h"
+ #include "${srcdir-.}/../tests/sysquotas.c"
+ ''',
+ define='HAVE_QUOTACTL_4B',
+ msg='for QUOTACTL_4B: int quotactl(const char *path, int cmd, int id, char *addr)',
+ execute=True,
+ local_include=False)
+
+ conf.CHECK_CODE('''
+ clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp");
+''',
+ headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nettype.h rpc/xdr.h",
+ define='HAVE_NFS_QUOTAS',
+ msg='for NFS QUOTAS',
+ execute=True,
+ local_include=False)
+
+ conf.CHECK_STRUCTURE_MEMBER('struct getquota_rslt',
+ 'getquota_rslt_u',
+ define='HAVE_GETQUOTA_RSLT_GETQUOTA_RSLT_U',
+ headers='rpcsvc/rquota.h')
if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \
conf.CONFIG_SET('HAVE_QUOTACTL_4A') or \
- conf.CONFIG_SET('HAVE_QUOTACTL_4B'):
+ conf.CONFIG_SET('HAVE_QUOTACTL_4B') or \
+ conf.CONFIG_SET('HAVE_XFS_QUOTAS'):
conf.DEFINE('HAVE_SYS_QUOTAS', '1')
+ conf.DEFINE('WITH_QUOTAS', '1')
#
# checking for clustering extensions (CTDB)
--
Samba Shared Repository
More information about the samba-cvs
mailing list