[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  b22b35e messaging3: Remove a pointless return;
       via  7c43a41 messaging3: Fix whitespace
       via  d108dad serverid: Fix an incompatible pointer assignment
       via  e3ca29f smbd: Fix a typo
      from  5e892fb s4-dns: dlz_bind9: improve log message consistency

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


- Log -----------------------------------------------------------------
commit b22b35e8c64dba8441ad1f915215b16d8811b6ab
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 13 15:02:57 2014 +0200

    messaging3: Remove a pointless return;
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Tue May 27 04:41:43 CEST 2014 on sn-devel-104

commit 7c43a4163ae1f9b482c4c4897498f09710115b8e
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 14 09:31:20 2014 +0200

    messaging3: Fix whitespace
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit d108dad61e0b5e2ad816ece577709b800e86961f
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 14 10:13:48 2014 +0200

    serverid: Fix an incompatible pointer assignment
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit e3ca29f3a17bc4ea5e1996a1178558da6b9ab593
Author: Volker Lendecke <vl at samba.org>
Date:   Fri May 23 15:19:05 2014 +0200

    smbd: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 source3/lib/messages.c |    3 +--
 source3/lib/serverid.c |    2 +-
 source3/smbd/open.c    |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 6778080..b045639 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -785,7 +785,7 @@ void messaging_dispatch_rec(struct messaging_context *msg_ctx,
 			 * to keep the order of waiters, as
 			 * other code may depend on this.
 			 */
-			if (i <  msg_ctx->num_waiters - 1) {
+			if (i < msg_ctx->num_waiters - 1) {
 				memmove(&msg_ctx->waiters[i],
 					&msg_ctx->waiters[i+1],
 					sizeof(struct tevent_req *) *
@@ -803,7 +803,6 @@ void messaging_dispatch_rec(struct messaging_context *msg_ctx,
 
 		i += 1;
 	}
-	return;
 }
 
 static int mess_parent_dgm_cleanup(void *private_data);
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 1a7e1ed..f982098 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -55,7 +55,7 @@ static struct db_context *serverid_db(void)
 
 bool serverid_parent_init(TALLOC_CTX *mem_ctx)
 {
-	struct tdb_wrap *db;
+	struct db_context *db;
 
 	db = serverid_db();
 	if (db == NULL) {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a8c6d24..237e90c 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1153,7 +1153,7 @@ static bool has_delete_on_close(struct share_mode_lock *lck,
 
 /****************************************************************************
  Deal with share modes
- Invarient: Share mode must be locked on entry and exit.
+ Invariant: Share mode must be locked on entry and exit.
  Returns -1 on error, or number of share modes on success (may be zero).
 ****************************************************************************/
 


-- 
Samba Shared Repository