Changeset 740 for vendor/current/source3/libsmb/clisecdesc.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/libsmb/clisecdesc.c (modified) (7 diffs)

vendor/current/source3/libsmb/clisecdesc.c

@@ -3 +3 @@
    client security descriptor functions
    Copyright (C) Andrew Tridgell 2000
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -19 +19 @@
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
 
 /****************************************************************************
   query the security descriptor for a open file
  ****************************************************************************/
-SEC_DESC *cli_query_secdesc(struct cli_state *cli, uint16_t fnum, 
+struct security_descriptor *cli_query_secdesc(struct cli_state *cli, uint16_t fnum,
                             TALLOC_CTX *mem_ctx)
 {
         uint8_t param[8];
-        uint8_t *rparam=NULL, *rdata=NULL;
-        unsigned int rparam_count=0, rdata_count=0;
-        SEC_DESC *psd = NULL;
+        uint8_t *rdata=NULL;
+        uint32_t rdata_count=0;
+        struct security_descriptor *psd = NULL;
         NTSTATUS status;
 
@@ -41 +42 @@
                            param, 8, 4, /* param, length, max */
                            NULL, 0, 0x10000, /* data, length, max */
-                           NULL, NULL, /* rsetup, length */
-                           &rparam, &rparam_count,
-                           &rdata, &rdata_count);
+                           NULL,             /* recv_flags2 */
+                           NULL, 0, NULL, /* rsetup, length */
+                           NULL, 0, NULL,
+                           &rdata, 0, &rdata_count);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -62 +64 @@
  cleanup:
 
-        TALLOC_FREE(rparam);
         TALLOC_FREE(rdata);
 
@@ -71 +72 @@
   set the security descriptor for a open file
  ****************************************************************************/
-bool cli_set_secdesc(struct cli_state *cli, uint16_t fnum, SEC_DESC *sd)
+NTSTATUS cli_set_secdesc(struct cli_state *cli, uint16_t fnum,
+                         struct security_descriptor *sd)
 {
-        char param[8];
-        char *rparam=NULL, *rdata=NULL;
-        unsigned int rparam_count=0, rdata_count=0;
+        uint8_t param[8];
         uint32 sec_info = 0;
-        TALLOC_CTX *frame = talloc_stackframe();
-        bool ret = False;
         uint8 *data;
         size_t len;
@@ -87 +85 @@
                 DEBUG(10, ("marshall_sec_desc failed: %s\n",
                            nt_errstr(status)));
-                goto cleanup;
+                return status;
         }
 
@@ -93 +91 @@
 
         if (sd->dacl)
-                sec_info |= DACL_SECURITY_INFORMATION;
+                sec_info |= SECINFO_DACL;
         if (sd->owner_sid)
-                sec_info |= OWNER_SECURITY_INFORMATION;
+                sec_info |= SECINFO_OWNER;
         if (sd->group_sid)
-                sec_info |= GROUP_SECURITY_INFORMATION;
+                sec_info |= SECINFO_GROUP;
         SSVAL(param, 4, sec_info);
 
-        if (!cli_send_nt_trans(cli, 
-                               NT_TRANSACT_SET_SECURITY_DESC, 
-                               0, 
-                               NULL, 0, 0,
-                               param, 8, 0,
-                               (char *)data, len, 0)) {
-                DEBUG(1,("Failed to send NT_TRANSACT_SET_SECURITY_DESC\n"));
-                goto cleanup;
+        status = cli_trans(talloc_tos(), cli, SMBnttrans,
+                           NULL, -1, /* name, fid */
+                           NT_TRANSACT_SET_SECURITY_DESC, 0,
+                           NULL, 0, 0, /* setup */
+                           param, 8, 0, /* param */
+                           data, len, 0, /* data */
+                           NULL,         /* recv_flags2 */
+                           NULL, 0, NULL, /* rsetup */
+                           NULL, 0, NULL, /* rparam */
+                           NULL, 0, NULL); /* rdata */
+        TALLOC_FREE(data);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(1, ("Failed to send NT_TRANSACT_SET_SECURITY_DESC: %s\n",
+                          nt_errstr(status)));
         }
-
-
-        if (!cli_receive_nt_trans(cli, 
-                                  &rparam, &rparam_count,
-                                  &rdata, &rdata_count)) {
-                DEBUG(1,("NT_TRANSACT_SET_SECURITY_DESC failed\n"));
-                goto cleanup;
-        }
-
-        ret = True;
-
-  cleanup:
-
-        SAFE_FREE(rparam);
-        SAFE_FREE(rdata);
-
-        TALLOC_FREE(frame);
-
-        return ret;
+        return status;
 }