summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-08-29 13:23:06 -0700
committerJeremy Allison <jra@samba.org>2012-08-30 10:08:50 -0700
commit8c84ecef89dfbfd2cd76b92272fbd32fb13d00b8 (patch)
tree1305ac4635044a61e3fa43be1b57073b38b3e66b
parent02aacb17d18f1bb47575b473a9468ff05403e67c (diff)
downloadsamba-8c84ecef89dfbfd2cd76b92272fbd32fb13d00b8.tar.gz
samba-8c84ecef89dfbfd2cd76b92272fbd32fb13d00b8.tar.bz2
samba-8c84ecef89dfbfd2cd76b92272fbd32fb13d00b8.zip
Rename set_sd() to set_sd_blob() - this describes what it does.
-rw-r--r--source3/smbd/nttrans.c8
-rw-r--r--source3/smbd/proto.h2
-rw-r--r--source3/smbd/smb2_setinfo.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index a0a3f59e08..107e8f3558 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -831,10 +831,10 @@ static void do_nt_transact_create_pipe(connection_struct *conn,
}
/****************************************************************************
- Internal fn to set security descriptors.
+ Internal fn to set security descriptors from a data blob.
****************************************************************************/
-NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len,
+NTSTATUS set_sd_blob(files_struct *fsp, uint8_t *data, uint32_t sd_len,
uint32_t security_info_sent)
{
struct security_descriptor *psd = NULL;
@@ -910,7 +910,7 @@ NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len,
}
if (DEBUGLEVEL >= 10) {
- DEBUG(10,("set_sd for file %s\n", fsp_str_dbg(fsp)));
+ DEBUG(10,("set_sd_blob for file %s\n", fsp_str_dbg(fsp)));
NDR_PRINT_DEBUG(security_descriptor, psd);
}
@@ -2101,7 +2101,7 @@ static void call_nt_transact_set_security_desc(connection_struct *conn,
return;
}
- status = set_sd(fsp, (uint8 *)data, data_count, security_info_sent);
+ status = set_sd_blob(fsp, (uint8 *)data, data_count, security_info_sent);
if (!NT_STATUS_IS_OK(status)) {
reply_nterror(req, status);
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 5a384744a7..83555906e8 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -577,7 +577,7 @@ void *init_quota_handle(TALLOC_CTX *mem_ctx);
/* The following definitions come from smbd/nttrans.c */
void reply_ntcreate_and_X(struct smb_request *req);
-NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len,
+NTSTATUS set_sd_blob(files_struct *fsp, uint8_t *data, uint32_t sd_len,
uint32_t security_info_sent);
struct ea_list *read_nttrans_ea_list(TALLOC_CTX *ctx, const char *pdata, size_t data_size);
void reply_ntcancel(struct smb_request *req);
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 1b79a64133..d88f7ac8a2 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -308,7 +308,7 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev);
}
- status = set_sd(fsp,
+ status = set_sd_blob(fsp,
in_input_buffer.data,
in_input_buffer.length,
in_additional_information);