[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  1e2e92f... Correct fix for unused variable return from ndr_decode. Use it :-). Jeremy.
      from  2fff1e1... Revert "s3: remove unused Variable"

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


- Log -----------------------------------------------------------------
commit 1e2e92f54d90c59a2a340728d3adc3cac1dd8133
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 25 17:38:55 2010 -0800

    Correct fix for unused variable return from ndr_decode. Use it :-).
    Jeremy.

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

Summary of changes:
 source3/smbd/dosmode.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index aaef09b..e5d6bc3 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -264,6 +264,14 @@ static bool get_ea_dos_attribute(connection_struct *conn,
 	ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), NULL, &dosattrib,
 			(ndr_pull_flags_fn_t)ndr_pull_xattr_DOSATTRIB);
 
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		DEBUG(1,("get_ea_dos_attributes: bad ndr decode "
+			 "from EA on file %s: Error = %s\n",
+			 smb_fname_str_dbg(smb_fname),
+			 ndr_errstr(ndr_err)));
+		return false;
+	}
+
 	DEBUG(10,("get_ea_dos_attribute: %s attr = %s\n",
 		  smb_fname_str_dbg(smb_fname), dosattrib.attrib_hex));
 


-- 
Samba Shared Repository