Changeset 165 for branches/samba-3.0/source/libsmb/libsmbclient.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/libsmb/libsmbclient.c (modified) (7 diffs)

branches/samba-3.0/source/libsmb/libsmbclient.c

@@ -4527 +4527 @@
          */
         if (ipc_cli && (all || some_nt || all_nt_acls)) {
+                pstring targetpath;
+                struct cli_state *targetcli;
+
                 /* Point to the portion after "system.nt_sec_desc." */
                 name += 19;     /* if (all) this will be invalid but unused */
 
+                if (!cli_resolve_path("", cli, filename,
+                                      &targetcli, targetpath))
+                {
+                        d_printf("Could not resolve %s\n", filename);
+                        return -1;
+                }
+
                 /* ... then obtain any NT attributes which were requested */
-                fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+                fnum = cli_nt_create(targetcli, targetpath, CREATE_ACCESS_READ);
 
                 if (fnum == -1) {
                         DEBUG(5, ("cacl_get failed to open %s: %s\n",
-                                  filename, cli_errstr(cli)));
+                                  targetpath, cli_errstr(targetcli)));
                         errno = 0;
                         return -1;
                 }
 
-                sd = cli_query_secdesc(cli, fnum, ctx);
+                sd = cli_query_secdesc(targetcli, fnum, ctx);
 
                 if (!sd) {
@@ -4549 +4559 @@
                 }
 
-                cli_close(cli, fnum);
+                cli_close(targetcli, fnum);
 
                 if (! exclude_nt_revision) {
@@ -5149 +5159 @@
         BOOL numeric = True;
 
+        pstring targetpath;
+        struct cli_state *targetcli;
+
         /* the_acl will be null for REMOVE_ALL operations */
         if (the_acl) {
@@ -5178 +5191 @@
         }
 
+        if (!cli_resolve_path("", cli, filename,
+                              &targetcli, targetpath))
+        {
+                d_printf("Could not resolve %s\n", filename);
+                errno = ENOENT;
+                return -1;
+        }
+
         /* The desired access below is the only one I could find that works
            with NT4, W2KP and Samba */
 
-        fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+        fnum = cli_nt_create(targetcli, targetpath, CREATE_ACCESS_READ);
 
         if (fnum == -1) {
                 DEBUG(5, ("cacl_set failed to open %s: %s\n",
-                          filename, cli_errstr(cli)));
+                          targetpath, cli_errstr(targetcli)));
                 errno = 0;
                 return -1;
         }
 
-        old = cli_query_secdesc(cli, fnum, ctx);
+        old = cli_query_secdesc(targetcli, fnum, ctx);
 
         if (!old) {
@@ -5198 +5219 @@
         }
 
-        cli_close(cli, fnum);
+        cli_close(targetcli, fnum);
 
         switch (mode) {
@@ -5287 +5308 @@
                            owner_sid, group_sid, NULL, dacl, &sd_size);
 
-        fnum = cli_nt_create(cli, filename,
+        fnum = cli_nt_create(targetcli, targetpath,
                              WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS);
 
         if (fnum == -1) {
                 DEBUG(5, ("cacl_set failed to open %s: %s\n",
-                          filename, cli_errstr(cli)));
+                          targetpath, cli_errstr(targetcli)));
                 errno = 0;
                 return -1;
         }
 
-        if (!cli_set_secdesc(cli, fnum, sd)) {
-                DEBUG(5, ("ERROR: secdesc set failed: %s\n", cli_errstr(cli)));
+        if (!cli_set_secdesc(targetcli, fnum, sd)) {
+                DEBUG(5, ("ERROR: secdesc set failed: %s\n", cli_errstr(targetcli)));
                 ret = -1;
         }
@@ -5305 +5326 @@
 
  failed:
-        cli_close(cli, fnum);
+        cli_close(targetcli, fnum);
 
         if (err != 0) {