Changeset 204 for branches/samba-3.2.x/source/libsmb/libsmb_xattr.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/libsmb/libsmb_xattr.c (modified) (9 diffs)

branches/samba-3.2.x/source/libsmb/libsmb_xattr.c

@@ -747 +747 @@
         uint16 mode = 0;
         SMB_INO_T ino = 0;
-        struct cli_state *cli = srv->cli;
+        struct cli_state *cli = srv->cli;
         struct {
                 const char * create_time_attr;
@@ -884 +884 @@
          */
         if (ipc_cli && (all || some_nt || all_nt_acls)) {
+                char *targetpath = NULL;
+                struct cli_state *targetcli = NULL;
+
                 /* Point to the portion after "system.nt_sec_desc." */
                 name += 19;     /* if (all) this will be invalid but unused */
-                
+
+                if (!cli_resolve_path(ctx, "", cli, filename,
+                                &targetcli, &targetpath)) {
+                        DEBUG(5, ("cacl_get Could not resolve %s\n",
+                                filename));
+                        errno = ENOENT;
+                        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)));
-                        errno = 0;
-                        return -1;
-                }
-                
-                sd = cli_query_secdesc(cli, fnum, ctx);
-                
+                        DEBUG(5, ("cacl_get failed to open %s: %s\n",
+                                targetpath, cli_errstr(targetcli)));
+                        errno = 0;
+                        return -1;
+                }
+
+                sd = cli_query_secdesc(targetcli, fnum, ctx);
+
                 if (!sd) {
                         DEBUG(5,
@@ -905 +916 @@
                         return -1;
                 }
-                
-                cli_close(cli, fnum);
-                
+
+                cli_close(targetcli, fnum);
+
                 if (! exclude_nt_revision) {
                         if (all || all_nt) {
@@ -1504 +1515 @@
         char *p;
         bool numeric = True;
-        
+        char *targetpath = NULL;
+        struct cli_state *targetcli = NULL;
+
         /* the_acl will be null for REMOVE_ALL operations */
         if (the_acl) {
@@ -1533 +1546 @@
                 return -1;
         }
-        
+
+        if (!cli_resolve_path(ctx, "", cli, filename,
+                                &targetcli, &targetpath)) {
+                DEBUG(5,("cacl_set: 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) {
                 DEBUG(5, ("cacl_set Failed to query old descriptor\n"));
@@ -1553 +1573 @@
                 return -1;
         }
-        
-        cli_close(cli, fnum);
-        
+
+        cli_close(targetcli, fnum);
+
         switch (mode) {
         case SMBC_XATTR_MODE_REMOVE_ALL:
@@ -1561 +1581 @@
                 dacl = old->dacl;
                 break;
-                
+
         case SMBC_XATTR_MODE_REMOVE:
                 for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
                         bool found = False;
-                        
+
                         for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
                                 if (sec_ace_equal(&sd->dacl->aces[i],
@@ -1643 +1663 @@
                            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;
         }
@@ -1661 +1682 @@
         
 failed:
-        cli_close(cli, fnum);
+        cli_close(targetcli, fnum);
         
         if (err != 0) {