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

[kai/samba.git] / source3 / libsmb / libsmb_xattr.c

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index d04eb1122b92d5bc0074263a0369ea142ec46a20..f4c22e3422bee6d7c2ecef8b0e3b228100d968af 100644 (file)
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -889,9 +889,10 @@ cacl_get(SMBCCTX *context,
                 /* Point to the portion after "system.nt_sec_desc." */
                 name += 19;     /* if (all) this will be invalid but unused */
 
-               if (!cli_resolve_path(ctx, "", context->internal->auth_info,
-                               cli, filename,
-                               &targetcli, &targetpath)) {
+               status = cli_resolve_path(
+                       ctx, "", context->internal->auth_info,
+                       cli, filename, &targetcli, &targetpath);
+               if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(5, ("cacl_get Could not resolve %s\n",
                                filename));
                         errno = ENOENT;
@@ -910,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,
@@ -1548,9 +1549,9 @@ cacl_set(SMBCCTX *context,
                return -1;
        }
 
-       if (!cli_resolve_path(ctx, "", context->internal->auth_info,
-                       cli, filename,
-                       &targetcli, &targetpath)) {
+       status = cli_resolve_path(ctx, "", context->internal->auth_info,
+                                 cli, filename, &targetcli, &targetpath);
+       if (!NT_STATUS_IS_OK(status)) {
                DEBUG(5,("cacl_set: Could not resolve %s\n", filename));
                errno = ENOENT;
                return -1;
@@ -1559,15 +1560,17 @@ cacl_set(SMBCCTX *context,
        /* The desired access below is the only one I could find that works
           with NT4, W2KP and Samba */
 
-       if (!NT_STATUS_IS_OK(cli_ntcreate(targetcli, targetpath, 0, CREATE_ACCESS_READ, 0,
-                               FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
+       status = cli_ntcreate(targetcli, targetpath, 0, CREATE_ACCESS_READ, 0,
+                             FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN,
+                             0x0, 0x0, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(5, ("cacl_set failed to open %s: %s\n",
-                          targetpath, cli_errstr(targetcli)));
+                          targetpath, nt_errstr(status)));
                 errno = 0;
                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"));
@@ -1664,11 +1667,13 @@ cacl_set(SMBCCTX *context,
        sd = make_sec_desc(ctx, old->revision, SEC_DESC_SELF_RELATIVE,
                           owner_sid, group_sid, NULL, dacl, &sd_size);
 
-       if (!NT_STATUS_IS_OK(cli_ntcreate(targetcli, targetpath, 0,
-                             WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS, 0,
-                            FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
+       status = cli_ntcreate(targetcli, targetpath, 0,
+                             WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS, 0,
+                             FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN,
+                             0x0, 0x0, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
                DEBUG(5, ("cacl_set failed to open %s: %s\n",
-                          targetpath, cli_errstr(targetcli)));
+                          targetpath, nt_errstr(status)));
                 errno = 0;
                return -1;
        }