[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  b557f34 s3:smbd: fix brace placements in validate_my_share_entries() for readability
       via  678cc44 s3:smbd: also log the "offline" flag when debugging the dos-mode
      from  d09ac96 Removed phpldapadmin inclusion for Samba 4.

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


- Log -----------------------------------------------------------------
commit b557f34c80c9326d9aa887366501366bf3956ce1
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 26 09:08:17 2012 +0200

    s3:smbd: fix brace placements in validate_my_share_entries() for readability
    
    according to coding guidelines
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Oct 17 14:37:58 CEST 2012 on sn-devel-104

commit 678cc4403f78d36f277940add7b7b4294e13100e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Oct 11 07:41:19 2012 +0200

    s3:smbd: also log the "offline" flag when debugging the dos-mode
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Signed-off-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/smbd/dosmode.c |    1 +
 source3/smbd/open.c    |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index ad04a65..a98ac07 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -684,6 +684,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
 	if (result & FILE_ATTRIBUTE_DIRECTORY   ) DEBUG(8, ("d"));
 	if (result & FILE_ATTRIBUTE_ARCHIVE  ) DEBUG(8, ("a"));
 	if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]"));
+	if (result & FILE_ATTRIBUTE_OFFLINE ) DEBUG(8, ("[offline]"));
 
 	DEBUG(8,("\n"));
 
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index efabe4a..7eb9f32 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1012,7 +1012,8 @@ static void validate_my_share_entries(struct smbd_server_connection *sconn,
 	}
 
 	if (is_deferred_open_entry(share_entry) &&
-	    !open_was_deferred(sconn, share_entry->op_mid)) {
+	    !open_was_deferred(sconn, share_entry->op_mid))
+	{
 		char *str = talloc_asprintf(talloc_tos(),
 			"Got a deferred entry without a request: "
 			"PANIC: %s\n",
@@ -1038,7 +1039,8 @@ static void validate_my_share_entries(struct smbd_server_connection *sconn,
 	}
 
 	if ((share_entry->op_type == NO_OPLOCK) &&
-	    (fsp->oplock_type == FAKE_LEVEL_II_OPLOCK)) {
+	    (fsp->oplock_type == FAKE_LEVEL_II_OPLOCK))
+	{
 		/* Someone has already written to it, but I haven't yet
 		 * noticed */
 		return;


-- 
Samba Shared Repository