*/
#include "includes.h"
-
-/****************************************************************************
- query the security descriptor for a open file
- ****************************************************************************/
-struct security_descriptor *cli_query_secdesc(struct cli_state *cli, uint16_t fnum,
- TALLOC_CTX *mem_ctx)
+#include "libsmb/libsmb.h"
+#include "../libcli/security/secdesc.h"
+#include "../libcli/smb/smbXcli_base.h"
+
+NTSTATUS cli_query_security_descriptor(struct cli_state *cli,
+ uint16_t fnum,
+ uint32_t sec_info,
+ TALLOC_CTX *mem_ctx,
+ struct security_descriptor **sd)
{
uint8_t param[8];
uint8_t *rdata=NULL;
uint32_t rdata_count=0;
- struct security_descriptor *psd = NULL;
NTSTATUS status;
+ struct security_descriptor *lsd;
+
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ return cli_smb2_query_security_descriptor(cli,
+ fnum,
+ sec_info,
+ mem_ctx,
+ sd);
+ }
SIVAL(param, 0, fnum);
- SIVAL(param, 4, 0x7);
+ SIVAL(param, 4, sec_info);
status = cli_trans(talloc_tos(), cli, SMBnttrans,
NULL, -1, /* name, fid */
goto cleanup;
}
- status = unmarshall_sec_desc(mem_ctx, (uint8 *)rdata, rdata_count,
- &psd);
-
+ status = unmarshall_sec_desc(mem_ctx, (uint8_t *)rdata, rdata_count,
+ &lsd);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("unmarshall_sec_desc failed: %s\n",
nt_errstr(status)));
goto cleanup;
}
+ if (sd != NULL) {
+ *sd = lsd;
+ } else {
+ TALLOC_FREE(lsd);
+ }
+
cleanup:
TALLOC_FREE(rdata);
- return psd;
+ return status;
+}
+
+NTSTATUS cli_query_secdesc(struct cli_state *cli, uint16_t fnum,
+ TALLOC_CTX *mem_ctx, struct security_descriptor **sd)
+{
+ uint32_t sec_info = SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL;
+
+ return cli_query_security_descriptor(cli, fnum, sec_info, mem_ctx, sd);
}
/****************************************************************************
set the security descriptor for a open file
****************************************************************************/
-bool cli_set_secdesc(struct cli_state *cli, uint16_t fnum, struct security_descriptor *sd)
+NTSTATUS cli_set_security_descriptor(struct cli_state *cli,
+ uint16_t fnum,
+ uint32_t sec_info,
+ const struct security_descriptor *sd)
{
- char param[8];
- char *rparam=NULL, *rdata=NULL;
- unsigned int rparam_count=0, rdata_count=0;
- uint32 sec_info = 0;
- TALLOC_CTX *frame = talloc_stackframe();
- bool ret = False;
- uint8 *data;
+ uint8_t param[8];
+ uint8_t *data;
size_t len;
NTSTATUS status;
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ return cli_smb2_set_security_descriptor(cli,
+ fnum,
+ sec_info,
+ sd);
+ }
+
status = marshall_sec_desc(talloc_tos(), sd, &data, &len);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("marshall_sec_desc failed: %s\n",
nt_errstr(status)));
- goto cleanup;
+ return status;
}
SIVAL(param, 0, fnum);
+ SIVAL(param, 4, sec_info);
- if (sd->dacl)
- sec_info |= SECINFO_DACL;
- if (sd->owner_sid)
- sec_info |= SECINFO_OWNER;
- if (sd->group_sid)
- sec_info |= SECINFO_GROUP;
- SSVAL(param, 4, sec_info);
-
- if (!cli_send_nt_trans(cli,
- NT_TRANSACT_SET_SECURITY_DESC,
- 0,
- NULL, 0, 0,
- param, 8, 0,
- (char *)data, len, 0)) {
- DEBUG(1,("Failed to send NT_TRANSACT_SET_SECURITY_DESC\n"));
- goto cleanup;
+ status = cli_trans(talloc_tos(), cli, SMBnttrans,
+ NULL, -1, /* name, fid */
+ NT_TRANSACT_SET_SECURITY_DESC, 0,
+ NULL, 0, 0, /* setup */
+ param, 8, 0, /* param */
+ data, len, 0, /* data */
+ NULL, /* recv_flags2 */
+ NULL, 0, NULL, /* rsetup */
+ NULL, 0, NULL, /* rparam */
+ NULL, 0, NULL); /* rdata */
+ TALLOC_FREE(data);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to send NT_TRANSACT_SET_SECURITY_DESC: %s\n",
+ nt_errstr(status)));
}
+ return status;
+}
+NTSTATUS cli_set_secdesc(struct cli_state *cli, uint16_t fnum,
+ const struct security_descriptor *sd)
+{
+ uint32_t sec_info = 0;
- if (!cli_receive_nt_trans(cli,
- &rparam, &rparam_count,
- &rdata, &rdata_count)) {
- DEBUG(1,("NT_TRANSACT_SET_SECURITY_DESC failed\n"));
- goto cleanup;
+ if (sd->dacl || (sd->type & SEC_DESC_DACL_PRESENT)) {
+ sec_info |= SECINFO_DACL;
+ }
+ if (sd->sacl || (sd->type & SEC_DESC_SACL_PRESENT)) {
+ sec_info |= SECINFO_SACL;
+ }
+ if (sd->owner_sid) {
+ sec_info |= SECINFO_OWNER;
+ }
+ if (sd->group_sid) {
+ sec_info |= SECINFO_GROUP;
}
- ret = True;
-
- cleanup:
-
- SAFE_FREE(rparam);
- SAFE_FREE(rdata);
-
- TALLOC_FREE(frame);
-
- return ret;
+ return cli_set_security_descriptor(cli, fnum, sec_info, sd);
}