s3/libsmb: Use smbXcli_conn_nt_smbs_supported instead of SMB1 specific test
authorLuk Claes <luk@debian.org>
Sun, 19 May 2013 17:27:06 +0000 (19:27 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 11 Jun 2013 12:46:00 +0000 (14:46 +0200)
Signed-off-by: Luk Claes <luk@debian.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/libsmb/clilist.c
source3/libsmb/libsmb_file.c

index b0d3a4e6e4b225c87bf487bbb4c4d345712fc7d2..41f84db5149142d9b6b1128291e2f9d639cdd3c6 100644 (file)
@@ -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);
index 9521542cb274a3c84fd4ff7d7b75dd450218f37a..14080fe1c79a2c06d1d331378066511701adec5e 100644 (file)
@@ -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;