From 768646c9a23c3b2d295af77826e82d3087076e36 Mon Sep 17 00:00:00 2001 From: Björn Baumbach Date: Fri, 22 Jul 2011 15:02:23 +0200 Subject: s3-libsmb: rename cli_query_secdesc() to cli_query_secdesc_old() Will introduce new cli_query_secdesc() function Signed-off-by: Stefan Metzmacher --- source3/libsmb/clisecdesc.c | 2 +- source3/libsmb/libsmb_xattr.c | 4 ++-- source3/libsmb/proto.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/libsmb') 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); -- cgit