[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  f14ba64 s4:winbindd: fix spacing and line length in cmd_getpwnam_recv_domain()
       via  7d01f10 s3:smbd: fix missing space in debug message in initial_break_processing()
      from  1da22ab build: Do not force a specific perl from ${PERL} when running pod2man

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


- Log -----------------------------------------------------------------
commit f14ba6460a08794074bf1395a6d3886aee2fcb57
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 27 01:28:51 2013 +0100

    s4:winbindd: fix spacing and line length in cmd_getpwnam_recv_domain()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Feb 28 03:54:41 CET 2013 on sn-devel-104

commit 7d01f1036971ecb4151871be30f7b6f39316adf6
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 26 09:39:17 2013 +0100

    s3:smbd: fix missing space in debug message in initial_break_processing()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/smbd/oplock.c             |    2 +-
 source4/winbind/wb_cmd_getpwnam.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index f447113..1fc7c83 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -290,7 +290,7 @@ static files_struct *initial_break_processing(
 		/* The file could have been closed in the meantime - return success. */
 		if( DEBUGLVL( 3 ) ) {
 			dbgtext( "initial_break_processing: cannot find open file with " );
-			dbgtext( "file_id %s gen_id = %lu", file_id_string_tos(&id), file_id);
+			dbgtext( "file_id %s gen_id = %lu, ", file_id_string_tos(&id), file_id);
 			dbgtext( "allowing break to succeed.\n" );
 		}
 		return NULL;
diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c
index 0ba4cb6..0101d8c 100644
--- a/source4/winbind/wb_cmd_getpwnam.c
+++ b/source4/winbind/wb_cmd_getpwnam.c
@@ -84,7 +84,8 @@ static void cmd_getpwnam_recv_domain(struct composite_context *ctx)
 	user_info = talloc(state, struct libnet_UserInfo);
 	if (composite_nomem(user_info, state->ctx)) return;
 
-	ok= wb_samba3_split_username(state, state->service->task->lp_ctx, state->name, &user_dom, &user_name);
+	ok = wb_samba3_split_username(state, state->service->task->lp_ctx,
+				      state->name, &user_dom, &user_name);
 	if(!ok){
 		composite_error(state->ctx, NT_STATUS_OBJECT_NAME_INVALID);
 		return;


-- 
Samba Shared Repository