Rename set_sd() to set_sd_blob() - this describes what it does. (cherry picked from...

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index e87d132c6224dcb07594fdc358cc9db0b16da641..7fb22e3ff2245fc76656cc0c6078ac7699c28150 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -827,10 +827,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;
@@ -906,7 +906,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);
        }
 
@@ -2095,7 +2095,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 d75138b117b703c325f50c778e4cd57aaa628a32..9224ce710c4e7cf71819d86f5974053f83a50208 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -561,7 +561,7 @@ void send_nt_replies(connection_struct *conn,
                     char *params, int paramsize,
                     char *pdata, int datasize);
 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);
 NTSTATUS smb_fsctl(struct files_struct *fsp,
                       TALLOC_CTX *ctx,

diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index ba914668fdf04d12d12747d47631ab0f9581fd72..d97caa44b6752cc1b4e0dcecc1c240d3aba2d3c2 100644 (file)
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -298,7 +298,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);