[SCM] Samba Shared Repository - branch v3-6-test updated

[Michael Adam]

The branch, v3-6-test has been updated
       via  0d7a2d2 s3:smbd: fix switch indentation level in get_ea_dos_attribute()
       via  a1305f2 nsswitch: fix a segfault in the krb5 locator plugin
      from  61629ff s3: Slightly simplify winbind_write_sock

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 0d7a2d28867fbfdf609b988facbf27adb5a56d47
Author: Michael Adam <obnox at samba.org>
Date:   Thu Feb 10 16:09:34 2011 +0100

    s3:smbd: fix switch indentation level in get_ea_dos_attribute()
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Thu Feb 10 17:46:12 CET 2011 on sn-devel-104

commit a1305f2a3dcc4eb4636e96688860179cc2513628
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date:   Thu Feb 10 15:55:50 2011 +0100

    nsswitch: fix a segfault in the krb5 locator plugin
    
    after the number of retries was exceeded, the loop did not
        bail out correctly with an error and went on using a null pointer

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

Summary of changes:
 nsswitch/winbind_krb5_locator.c |    2 +-
 source3/smbd/dosmode.c          |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/winbind_krb5_locator.c
index db6e8d0..e921cae 100644
--- a/nsswitch/winbind_krb5_locator.c
+++ b/nsswitch/winbind_krb5_locator.c
@@ -192,7 +192,7 @@ static krb5_error_code smb_krb5_locator_call_cbfunc(const char *name,
 			break;
 		}
 
-		if (ret == EAI_AGAIN) {
+		if ((ret == EAI_AGAIN) && (count > 1)) {
 			count--;
 			continue;
 		}
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 838dec0..c0bf168 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -308,10 +308,10 @@ static bool get_ea_dos_attribute(connection_struct *conn,
 						create_time)) ));
 			}
 			break;
-			default:
-				DEBUG(1,("get_ea_dos_attribute: Badly formed DOSATTRIB on "
-					 "file %s - %s\n", smb_fname_str_dbg(smb_fname),
-					 attrstr));
+		default:
+			DEBUG(1,("get_ea_dos_attribute: Badly formed DOSATTRIB on "
+				 "file %s - %s\n", smb_fname_str_dbg(smb_fname),
+				 attrstr));
 	                return false;
 	}
 


-- 
Samba Shared Repository