[libvirt] [PATCH 3/3] util: virfile: Only setuid for virFileRemove if on NFS

[Cole Robinson]

On 03/09/2016 03:34 PM, John Ferlan wrote:
> 
> 
> On 03/09/2016 12:39 PM, Cole Robinson wrote:
>> NFS with root-squash is the only reason we need to do setuid/setgid
>> crazyness in virFileRemove, so limit that behavior to the NFS case.
>> ---
>> I'm not sure though if NFS is the only case we care about this here,
>> or if we want to conditionalize this path on NFS since that makes it
>> more of a pain to test... It's not required to fix the initial bug
>>
>>  src/util/virfile.c | 10 ++++++++--
>>  1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/util/virfile.c b/src/util/virfile.c
>> index cea2674..3d1b118 100644
>> --- a/src/util/virfile.c
>> +++ b/src/util/virfile.c
>> @@ -2322,7 +2322,7 @@ virFileOpenAs(const char *path, int openflags, mode_t mode,
>>   * owned by the passed uid/gid pair. Needed for NFS with root-squash
>>   */
>>  static bool
>> -virFileRemoveNeedsSetuid(uid_t uid, gid_t gid)
>> +virFileRemoveNeedsSetuid(const char *path, uid_t uid, gid_t gid)
> 
> You added a new parameter to document...
> 
> ACK with that adjustment.
> 

Thanks, I pushed #2 and #3 with your adjustments

- Cole