From: Luk Claes <luk@debian.org>
Date: Sun, 19 May 2013 17:27:06 +0000 (+0200)
Subject: s3/libsmb: Use smbXcli_conn_nt_smbs_supported instead of SMB1 specific test
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=3005dc18f8668239442ffdbeaa3d6270ef7fef18

s3/libsmb: Use smbXcli_conn_nt_smbs_supported instead of SMB1 specific test

Signed-off-by: Luk Claes <luk@debian.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index b0d3a4e6e4b..41f84db5149 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -953,7 +953,7 @@ NTSTATUS cli_list(struct cli_state *cli, const char *mask, uint16 attribute,
 		goto fail;
 	}
 
-	info_level = (smb1cli_conn_capabilities(cli->conn) & CAP_NT_SMBS)
+	info_level = smbXcli_conn_nt_smbs_supported(cli->conn)
 		? SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_INFO_STANDARD;
 
 	req = cli_list_send(frame, ev, cli, mask, attribute, info_level);
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 9521542cb27..14080fe1c79 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -551,7 +551,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) {
+	if (smbXcli_conn_nt_smbs_supported(targetcli->conn)) {
                 errno = EPERM;
 		TALLOC_FREE(frame);
                 return False;