From: Gregor Beck <gbeck@sernet.de>
Date: Fri, 18 Oct 2013 13:32:55 +0000 (+0200)
Subject: s3:libsmb: SMBC_getatr() if no method worked, try all methods again on next attempt
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=71dc7e593ef17db7875d3d9a2e42ae588679392e

s3:libsmb: SMBC_getatr() if no method worked, try all methods again on next attempt

Signed-off-by: Gregor Beck <gbeck@sernet.de>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 277ca83e33d8..8fb7a2e67eca 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -575,9 +575,7 @@ SMBC_getatr(SMBCCTX * context,
 
 	/* if this is NT then don't bother with the getatr */
 	if (smb1cli_conn_capabilities(targetcli->conn) & CAP_NT_SMBS) {
-                errno = EPERM;
-		TALLOC_FREE(frame);
-                return False;
+		goto all_failed;
         }
 
 	if (NT_STATUS_IS_OK(cli_getatr(targetcli, targetpath, mode, size, &write_time))) {
@@ -603,6 +601,10 @@ SMBC_getatr(SMBCCTX * context,
 		return True;
 	}
 
+all_failed:
+	srv->no_pathinfo2 = False;
+	srv->no_pathinfo3 = False;
+
         errno = EPERM;
 	TALLOC_FREE(frame);
 	return False;