summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/client/client.c2
-rw-r--r--source3/libsmb/clisecdesc.c2
-rw-r--r--source3/libsmb/libsmb_xattr.c4
-rw-r--r--source3/libsmb/proto.h2
-rw-r--r--source3/torture/test_nttrans_create.c2
-rw-r--r--source3/utils/net_rpc.c2
-rw-r--r--source3/utils/net_rpc_printer.c2
-rw-r--r--source3/utils/smbcacls.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 142eea2733..5c4d63a8c1 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -586,7 +586,7 @@ static NTSTATUS display_finfo(struct cli_state *cli_state, struct file_info *fin
afname, nt_errstr(status)));
} else {
struct security_descriptor *sd = NULL;
- sd = cli_query_secdesc(cli_state, fnum, ctx);
+ sd = cli_query_secdesc_old(cli_state, fnum, ctx);
if (!sd) {
status = cli_nt_error(cli_state);
DEBUG( 0, ("display_finfo() failed to "
diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c
index d703b1f774..71358e8612 100644
--- a/source3/libsmb/clisecdesc.c
+++ b/source3/libsmb/clisecdesc.c
@@ -24,7 +24,7 @@
/****************************************************************************
query the security descriptor for a open file
****************************************************************************/
-struct security_descriptor *cli_query_secdesc(struct cli_state *cli, uint16_t fnum,
+struct security_descriptor *cli_query_secdesc_old(struct cli_state *cli, uint16_t fnum,
TALLOC_CTX *mem_ctx)
{
uint8_t param[8];
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 00f94122bc..f4c22e3422 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -911,7 +911,7 @@ cacl_get(SMBCCTX *context,
return -1;
}
- sd = cli_query_secdesc(targetcli, fnum, ctx);
+ sd = cli_query_secdesc_old(targetcli, fnum, ctx);
if (!sd) {
DEBUG(5,
@@ -1570,7 +1570,7 @@ cacl_set(SMBCCTX *context,
return -1;
}
- old = cli_query_secdesc(targetcli, fnum, ctx);
+ old = cli_query_secdesc_old(targetcli, fnum, ctx);
if (!old) {
DEBUG(5, ("cacl_set Failed to query old descriptor\n"));
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 6f2ba3ce4c..7b2dc8c583 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -785,7 +785,7 @@ NTSTATUS cli_push(struct cli_state *cli, uint16_t fnum, uint16_t mode,
/* The following definitions come from libsmb/clisecdesc.c */
-struct security_descriptor *cli_query_secdesc(struct cli_state *cli, uint16_t fnum,
+struct security_descriptor *cli_query_secdesc_old(struct cli_state *cli, uint16_t fnum,
TALLOC_CTX *mem_ctx);
NTSTATUS cli_set_secdesc(struct cli_state *cli, uint16_t fnum,
struct security_descriptor *sd);
diff --git a/source3/torture/test_nttrans_create.c b/source3/torture/test_nttrans_create.c
index 9869f020e9..ffd8cfa59a 100644
--- a/source3/torture/test_nttrans_create.c
+++ b/source3/torture/test_nttrans_create.c
@@ -78,7 +78,7 @@ bool run_nttrans_create(int dummy)
goto fail;
}
- cli_query_secdesc(cli, fnum, talloc_tos());
+ cli_query_secdesc_old(cli, fnum, talloc_tos());
status2 = cli_ntcreate(cli, fname, 0, WRITE_DAC_ACCESS,
FILE_ATTRIBUTE_NORMAL,
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 1ec34c210c..947ae96c88 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4864,7 +4864,7 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
if (!NT_STATUS_IS_OK(cli_ntcreate(cli, "\\", 0, READ_CONTROL_ACCESS, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
- root_sd = cli_query_secdesc(cli, fnum, mem_ctx);
+ root_sd = cli_query_secdesc_old(cli, fnum, mem_ctx);
}
for (i=0; i<num_tokens; i++) {
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 76509c2bc6..f5019af346 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -185,7 +185,7 @@ NTSTATUS net_copy_fileattr(struct net_context *c,
if (copy_acls) {
/* get the security descriptor */
- sd = cli_query_secdesc(cli_share_src, fnum_src, mem_ctx);
+ sd = cli_query_secdesc_old(cli_share_src, fnum_src, mem_ctx);
if (!sd) {
DEBUG(0,("failed to get security descriptor: %s\n",
cli_errstr(cli_share_src)));
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 4a7c6a6f13..6183146762 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -722,7 +722,7 @@ static struct security_descriptor *get_secdesc(struct cli_state *cli, const char
return NULL;
}
- sd = cli_query_secdesc(cli, fnum, talloc_tos());
+ sd = cli_query_secdesc_old(cli, fnum, talloc_tos());
cli_close(cli, fnum);