Changeset 232 for branches/samba-3.2.x/source/modules/vfs_fileid.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/modules/vfs_fileid.c (modified) (1 diff)

branches/samba-3.2.x/source/modules/vfs_fileid.c

@@ -189 +189 @@
         }
 
-        data->device_mapping_fn = fileid_device_mapping_fsid;
+        /*
+         * "fileid:mapping" is only here as fallback for old setups
+         * "fileid:algorithm" is the option new setups should use
+         */
+        algorithm = lp_parm_const_string(SNUM(handle->conn),
+                                         "fileid", "mapping",
+                                         "fsname");
         algorithm = lp_parm_const_string(SNUM(handle->conn),
                                          "fileid", "algorithm",
-                                         "fsname");
+                                         algorithm);
         if (strcmp("fsname", algorithm) == 0) {
                 data->device_mapping_fn = fileid_device_mapping_fsname;