Changeset 138 for trunk/samba/source/smbd/msdfs.c

Timestamp:

Jul 3, 2008, 11:23:12 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.2.0 GA level

File:

• trunk/samba/source/smbd/msdfs.c (modified) (6 diffs)

trunk/samba/source/smbd/msdfs.c

@@ -368 +368 @@
                 DEBUG(10, ("parse_msdfs_symlink: Created alt path: %s\n",
                                         reflist[i].alternate_path));
-                *refcount += 1;
-        }
+        }
+
+        *refcount = count;
 
         TALLOC_FREE(alt_path);
@@ -1306 +1307 @@
 }
 
-bool create_msdfs_link(const struct junction_map *jucn,
-                bool exists)
+bool create_msdfs_link(const struct junction_map *jucn)
 {
         char *path = NULL;
@@ -1360 +1360 @@
                 path, msdfs_link));
 
-        if(exists) {
-                if(SMB_VFS_UNLINK(conn,path)!=0) {
+        if(SMB_VFS_SYMLINK(conn, msdfs_link, path) < 0) {
+                if (errno == EEXIST) {
+                        if(SMB_VFS_UNLINK(conn,path)!=0) {
+                                goto out;
+                        }
+                }
+                if (SMB_VFS_SYMLINK(conn, msdfs_link, path) < 0) {
+                        DEBUG(1,("create_msdfs_link: symlink failed "
+                                 "%s -> %s\nError: %s\n",
+                                 path, msdfs_link, strerror(errno)));
                         goto out;
                 }
-        }
-
-        if(SMB_VFS_SYMLINK(conn, msdfs_link, path) < 0) {
-                DEBUG(1,("create_msdfs_link: symlink failed "
-                        "%s -> %s\nError: %s\n", 
-                        path, msdfs_link, strerror(errno)));
-                goto out;
         }
 
@@ -1502 +1503 @@
                 goto out;
         }
+        jucn[cnt].comment = "";
         jucn[cnt].referral_count = 1;
 
@@ -1540 +1542 @@
                 char *link_target = NULL;
                 if (cnt >= jn_remain) {
-                        SMB_VFS_CLOSEDIR(&conn,dirp);
                         DEBUG(2, ("form_junctions: ran out of MSDFS "
                                 "junction slots"));
@@ -1562 +1563 @@
                                         goto out;
                                 }
+                                jucn[cnt].comment = "";
                                 cnt++;
                         }
+                        TALLOC_FREE(link_target);
                 }
         }