s3-libsmb: rename cli_query_secdesc() to cli_query_secdesc_old()

Will introduce new cli_query_secdesc() function

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/client/client.c b/source3/client/client.c
index 142eea27335a508c80c9949fc428a95627b96b93..5c4d63a8c1b7b82eaba61e41bef146379caa3427 100644 (file)
--- 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 d703b1f77443054ab315124973d8565b64073898..71358e8612f51a4ebb043639bddf947429c3e3d1 100644 (file)
--- 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 00f94122bc7b68a7b485bf43af096556484c5279..f4c22e3422bee6d7c2ecef8b0e3b228100d968af 100644 (file)
--- 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 6f2ba3ce4c78bafdeb43ea77db39675ef2a10943..7b2dc8c5831f4d52b0d58dc84b2bf58fe4ef91bb 100644 (file)
--- 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 9869f020e9bd1c8edd21edfaa29764c418814603..ffd8cfa59a149dc267ec4d4ddd68fae3c14bf1b0 100644 (file)
--- 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 1ec34c210caa7a7bf85f1c55c62929673d27dfd8..947ae96c8896a079b34cc8a81946517043712d2e 100644 (file)
--- 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 76509c2bc63210c1ef6f8762841ec3b4d5149936..f5019af346039c735a58865ad5e28c0a33e0ef49 100644 (file)
--- 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 4a7c6a6f13961f5ebfe2fb847cdefe9250e2b5af..618314676234ced33adfc08a26ef08ecd0e8fae9 100644 (file)
--- 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);