Author: abartlet
Date: 2006-08-13 11:55:13 +0000 (Sun, 13 Aug 2006)
New Revision: 17520

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17520

Log:
If the blkid library fails, I don't see any reason to return more of
an error than if we don't have it.  We might not be on a volume that
can store/return such a GUID.

(Try to fix one of the build farm failures).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fsinfo.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fsinfo.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fsinfo.c 2006-08-13 11:00:56 UTC 
(rev 17519)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fsinfo.c 2006-08-13 11:55:13 UTC 
(rev 17520)
@@ -39,19 +39,22 @@
 
        devname = blkid_devno_to_devname(st->st_dev);
        if (!devname) {
-               return NT_STATUS_DEVICE_CONFIGURATION_ERROR;
+               ZERO_STRUCTP(uuid);
+               return NT_STATUS_OK;
        }
 
        uuid_value = blkid_get_tag_value(NULL, "UUID", devname);
        free(devname);
        if (!uuid_value) {
-               return NT_STATUS_DEVICE_CONFIGURATION_ERROR;
+               ZERO_STRUCTP(uuid);
+               return NT_STATUS_OK;
        }
 
        status = GUID_from_string(uuid_value, uuid);
        free(uuid_value);
        if (!NT_STATUS_IS_OK(status)) {
-               return NT_STATUS_DEVICE_CONFIGURATION_ERROR;
+               ZERO_STRUCTP(uuid);
+               return NT_STATUS_OK;
        }
        return NT_STATUS_OK;
 #else

Reply via email to