[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  8858657 replace: Include libgen.h if available
       via  bde7d74 smbd: avoid extra churn on a debug print
      from  c4409ea perf: Add simple tests for the open/close a database case

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


- Log -----------------------------------------------------------------
commit 88586570e8b469a3abfaa91dbeabc63596b53e3b
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Dec 1 12:12:47 2016 +1100

    replace: Include libgen.h if available
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Dec  1 18:08:54 CET 2016 on sn-devel-144

commit bde7d74c4a58535f05cbfff133e5a2d2b90e11d7
Author: Uri Simchoni <uri at samba.org>
Date:   Thu Dec 1 06:29:34 2016 +0200

    smbd: avoid extra churn on a debug print
    
    Remove the user / group name in debug-printing of a
    POSIX-ACL-derived ACE.
    
    Obtaining the user name might result an extra lookup
    to the domain. In a typical case, a user raises logging
    level to 10 to troubleshoot an issue, so connectivity
    problems are likely to exist. In that case we won't want
    the extra debug printing to create more issues.
    
    Signed-off-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 lib/replace/system/dir.h  | 4 ++++
 source3/smbd/posix_acls.c | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/dir.h b/lib/replace/system/dir.h
index dec2d54..0955b19 100644
--- a/lib/replace/system/dir.h
+++ b/lib/replace/system/dir.h
@@ -46,6 +46,10 @@
 #define mkdir(dir, mode) mkdir(dir)
 #endif
 
+#if HAVE_LIBGEN_H
+# include <libgen.h>
+#endif
+
 /* Test whether a file name is the "." or ".." directory entries.
  * These really should be inline functions.
  */
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index e8e819c..f7829fe 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -802,11 +802,9 @@ static void print_canon_ace(canon_ace *pace, int num)
 	dbgtext( "canon_ace index %d. Type = %s ", num, pace->attr == ALLOW_ACE ? "allow" : "deny" );
 	dbgtext( "SID = %s ", sid_string_dbg(&pace->trustee));
 	if (pace->owner_type == UID_ACE) {
-		const char *u_name = uidtoname(pace->unix_ug.id);
-		dbgtext( "uid %u (%s) ", (unsigned int)pace->unix_ug.id, u_name );
+		dbgtext( "uid %u ", (unsigned int)pace->unix_ug.id);
 	} else if (pace->owner_type == GID_ACE) {
-		char *g_name = gidtoname(pace->unix_ug.id);
-		dbgtext( "gid %u (%s) ", (unsigned int)pace->unix_ug.id, g_name );
+		dbgtext( "gid %u ", (unsigned int)pace->unix_ug.id);
 	} else
 		dbgtext( "other ");
 	switch (pace->type) {


-- 
Samba Shared Repository