mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
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 commit is contained in:
parent
55bac30e1f
commit
73d6651f3c
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user