[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  17a9a0f s3: libsmb : Bug 10150 - Not all OEM servers support the ALTNAME info level.
       via  cdc280d s3: libsmb SMB2 wrapper layer. cli_smb2_get_ea_list_path() failed to close file on exit.
      from  eaf1b8e s3-rpc_server: fix typo in DEBUG statement.

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


- Log -----------------------------------------------------------------
commit 17a9a0f37bbb730d09b3a57b00665d44aac18ea6
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Sep 17 11:24:05 2013 -0700

    s3: libsmb : Bug 10150 - Not all OEM servers support the ALTNAME info level.
    
    Just ignore and print error message and an altname of "" if the
    server returns NT_STATUS_NOT_SUPPORTED.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Sep 17 23:40:08 CEST 2013 on sn-devel-104

commit cdc280deb1e6f99ec9eae05d75bc1104448662ef
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Sep 17 11:00:16 2013 -0700

    s3: libsmb SMB2 wrapper layer. cli_smb2_get_ea_list_path() failed to close file on exit.
    
    Found at SNIA SDC plugfest.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/client/client.c        |   10 +++++++++-
 source3/libsmb/cli_smb2_fnum.c |    4 ++++
 2 files changed, 13 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index bdf6c50..a348644 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1709,7 +1709,15 @@ static int do_allinfo(const char *name)
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("%s getting alt name for %s\n", nt_errstr(status),
 			 name);
-		return false;
+		/*
+		 * Ignore not supported, it does not hurt if we can't list
+		 * alternate names.
+		 */
+		if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+			altname[0] = '\0';
+		} else {
+			return false;
+		}
 	}
 	d_printf("altname: %s\n", altname);
 
diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 3253f9d..202000f 100644
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -1997,6 +1997,10 @@ NTSTATUS cli_smb2_get_ea_list_path(struct cli_state *cli,
 
   fail:
 
+	if (fnum != 0xffff) {
+		cli_smb2_close_fnum(cli, fnum);
+	}
+
 	TALLOC_FREE(frame);
 	return status;
 }


-- 
Samba Shared Repository