[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  b53c5bc quota: also log which fs type we found
       via  29c5780 autoconf: check for dn_expand also in libinet
       via  39d1a2c wafbuild: check for dn_expand also in libinet
      from  8de46ea Add 'bool use_privs' to smbd_calculate_access_mask().

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


- Log -----------------------------------------------------------------
commit b53c5bcf5bddb8a673d94870bdcfac426a8159ec
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Sep 14 20:46:45 2012 +0200

    quota: also log which fs type we found
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Sat Sep 15 02:18:16 CEST 2012 on sn-devel-104

commit 29c5780f8d0b7413136140db4ce133e97625ae31
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Sep 14 20:32:15 2012 +0200

    autoconf: check for dn_expand also in libinet
    
    see bug #7472

commit 39d1a2c2a1d5e69d0396622bc9fea00d0f0d779d
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Sep 14 20:41:08 2012 +0200

    wafbuild: check for dn_expand also in libinet
    
    see bug #7472

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

Summary of changes:
 source3/configure.in    |    1 +
 source3/lib/sysquotas.c |    2 +-
 source3/wscript         |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index a6cc444..06f6028 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1219,6 +1219,7 @@ fi
 AC_CHECK_LIB(resolv, dn_expand)
 AC_CHECK_LIB(resolv, _dn_expand)
 AC_CHECK_LIB(resolv, __dn_expand)
+AC_CHECK_LIB(inet, dn_expand)
 
 #
 # Check for the functions putprpwnam, set_auth_parameters,
diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index c531666..97dd49d 100644
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -406,7 +406,7 @@ int sys_get_quota(const char *path, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DI
 	}
 
 	errno = 0;
-	DEBUG(10,("sys_get_quota() uid(%u, %u)\n", (unsigned)getuid(), (unsigned)geteuid()));
+	DEBUG(10,("sys_get_quota() uid(%u, %u), fs(%s)\n", (unsigned)getuid(), (unsigned)geteuid(), fs));
 
 	for (i=0;(fs && sys_quota_backends[i].name && sys_quota_backends[i].get_quota);i++) {
 		if (strcmp(fs,sys_quota_backends[i].name)==0) {
diff --git a/source3/wscript b/source3/wscript
index 18f84f8..d0e76f3 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -97,6 +97,7 @@ def configure(conf):
     #FIXME: for some reason this one still fails
     conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
     conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
+    conf.CHECK_FUNCS_IN('dn_expand', 'inet')
     conf.CHECK_DECLS('fdatasync', reverse=True)
     conf.CHECK_DECLS('readahead', reverse=True, headers='fcntl.h')
 


-- 
Samba Shared Repository