[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  052b9a5 Fix a typo
      from  5a82cc2 s3: smbd: Codenomicon crash in do_smb_load_module().

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


- Log -----------------------------------------------------------------
commit 052b9a53b76d7a3a282387aafca31c5ce843d07a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 12 09:03:21 2015 +0000

    Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Jun 19 01:05:17 CEST 2015 on sn-devel-104

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

Summary of changes:
 lib/tsocket/tsocket_bsd.c            | 4 ++--
 source4/nbt_server/wins/winsserver.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index f1ece75..8203755 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -855,7 +855,7 @@ static struct tevent_req *tdgram_bsd_recvfrom_send(TALLOC_CTX *mem_ctx,
 		 * recvfrom if the caller asked for it.
 		 *
 		 * This is needed because in most cases
-		 * we preferr to flush send buffers before
+		 * we prefer to flush send buffers before
 		 * receiving incoming requests.
 		 */
 		tdgram_bsd_recvfrom_handler(req);
@@ -1746,7 +1746,7 @@ static struct tevent_req *tstream_bsd_readv_send(TALLOC_CTX *mem_ctx,
 		 * readv if the caller asked for it.
 		 *
 		 * This is needed because in most cases
-		 * we preferr to flush send buffers before
+		 * we prefer to flush send buffers before
 		 * receiving incoming requests.
 		 */
 		tstream_bsd_readv_handler(req);
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 3cd7d43..a60d5bd 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -679,7 +679,7 @@ static void nbtd_wins_randomize1Clist(struct loadparm_context *lp_ctx,
 
 	/* 
 	 * choose a random address to be the first in the response to the client,
-	 * preferr the addresses inside the nbtd:wins_randomize1Clist_mask netmask
+	 * prefer the addresses inside the nbtd:wins_randomize1Clist_mask netmask
 	 */
 	r = random();
 	idx = sidx = r % num_addrs;


-- 
Samba Shared Repository