diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-08-13 11:55:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:15:32 -0500 |
| commit | 8c291e67c5c30bd75a8639f04dfcb4168e939930 (patch) | |
| tree | d35aec412953d1d390edc7aa2b67fe73c8daa46b | |
| parent | 44523cfb8ec25596fcccaa94224265f0bb24dc29 (diff) | |
| download | samba-8c291e67c5c30bd75a8639f04dfcb4168e939930.tar.gz samba-8c291e67c5c30bd75a8639f04dfcb4168e939930.tar.bz2 samba-8c291e67c5c30bd75a8639f04dfcb4168e939930.zip | |
r17520: 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
(This used to be commit 73d6651f3c06d0d3bbfd9fe1a9d0f76fe19ba4af)
| -rw-r--r-- | source4/ntvfs/posix/pvfs_fsinfo.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_fsinfo.c b/source4/ntvfs/posix/pvfs_fsinfo.c index 1a7ad16776..c1df33be18 100644 --- a/source4/ntvfs/posix/pvfs_fsinfo.c +++ b/source4/ntvfs/posix/pvfs_fsinfo.c @@ -39,19 +39,22 @@ static NTSTATUS pvfs_blkid_fs_uuid(struct pvfs_state *pvfs, struct stat *st, str 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 |