Changeset 221 for branches/samba-3.3.x/source/libsmb/libsmb_dir.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/libsmb/libsmb_dir.c (modified) (6 diffs)

branches/samba-3.3.x/source/libsmb/libsmb_dir.c

@@ -1502 +1502 @@
         char *password = NULL;
         char *workgroup = NULL;
+        char *targetpath = NULL;
+        struct cli_state *targetcli = NULL;
         char *path = NULL;
         uint16 mode;
@@ -1519 +1521 @@
         }
 
-        DEBUG(4, ("smbc_chmod(%s, 0%3o)\n", fname, newmode));
+        DEBUG(4, ("smbc_chmod(%s, 0%3o)\n", fname, (unsigned int)newmode));
 
         if (SMBC_parse_path(frame,
@@ -1552 +1554 @@
                 return -1;  /* errno set by SMBC_server */
         }
+        
+        /*d_printf(">>>unlink: resolving %s\n", path);*/
+        if (!cli_resolve_path(frame, "", srv->cli, path,
+                              &targetcli, &targetpath)) {
+                d_printf("Could not resolve %s\n", path);
+                TALLOC_FREE(frame);
+                return -1;
+        }
 
         mode = 0;
@@ -1560 +1570 @@
         if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= aHIDDEN;
 
-        if (!cli_setatr(srv->cli, path, mode, 0)) {
-                errno = SMBC_errno(context, srv->cli);
+        if (!cli_setatr(targetcli, targetpath, mode, 0)) {
+                errno = SMBC_errno(context, targetcli);
                 TALLOC_FREE(frame);
                 return -1;
@@ -1902 +1912 @@
         }
 
+        /* set the credentials to make DFS work */
+        smbc_set_credentials_with_fallback(ocontext,
+                                           workgroup,
+                                           user1,
+                                           password1);
+
         /*d_printf(">>>rename: resolving %s\n", path1);*/
         if (!cli_resolve_path(frame, "", srv->cli, path1,
@@ -1909 +1925 @@
                 return -1;
         }
+        
+        /* set the credentials to make DFS work */
+        smbc_set_credentials_with_fallback(ncontext,
+                                           workgroup,
+                                           user2,
+                                           password2);
+        
         /*d_printf(">>>rename: resolved path as %s\n", targetpath1);*/
         /*d_printf(">>>rename: resolving %s\n", path2);*/