[systemd-devel] [PATCH] label: suppress warning on without selinux

[WaLyong Cho]

On 09/24/2014 10:25 AM, Zbigniew Jędrzejewski-Szmek wrote:
> On Tue, Sep 23, 2014 at 04:16:55PM +0900, WaLyong Cho wrote:
>> ---
>>  src/shared/label.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/shared/label.c b/src/shared/label.c
>> index 02b41f0..b6af38d 100644
>> --- a/src/shared/label.c
>> +++ b/src/shared/label.c
>> @@ -252,9 +252,10 @@ fail:
>>  
>>  int label_get_our_label(char **label) {
>>          int r = -EOPNOTSUPP;
>> -        char *l = NULL;
>>  
>>  #ifdef HAVE_SELINUX
>> +        char *l = NULL;
>> +
>>          r = getcon(&l);
>>          if (r < 0)
>>                  return r;
> Heh, I pushed an identical patch earlier today.

Good.
Anyway, such kind of patch make a conflict again on my previous patch.
http://lists.freedesktop.org/archives/systemd-devel/2014-September/023125.html

I think I should re-work to solve the conflict. When I should do that
again? :)

Thanks,
WaLyong

> 
> Zbyszek
>