From: Automatic source maintenance Date: Sun, 18 Oct 2009 00:12:53 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_2_0_1~652 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc32ce2e8f38e5bbac677ced17502af8fdddfa14;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/tools.cc b/src/tools.cc index 7b2a36f51a..77141dbde2 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -1244,32 +1244,32 @@ restoreCapabilities(int keep) #if HAVE_SYS_CAPABILITY_H cap_t caps; if (keep) - caps = cap_get_proc(); + caps = cap_get_proc(); else - caps = cap_init(); + caps = cap_init(); if (!caps) { - IpInterceptor.StopTransparency("Can't get current capabilities"); + IpInterceptor.StopTransparency("Can't get current capabilities"); } else { - int ncaps = 0; - int rc = 0; - cap_value_t cap_list[10]; - cap_list[ncaps++] = CAP_NET_BIND_SERVICE; + int ncaps = 0; + int rc = 0; + cap_value_t cap_list[10]; + cap_list[ncaps++] = CAP_NET_BIND_SERVICE; - if (IpInterceptor.TransparentActive()) { - cap_list[ncaps++] = CAP_NET_ADMIN; + if (IpInterceptor.TransparentActive()) { + cap_list[ncaps++] = CAP_NET_ADMIN; #if LINUX_TPROXY2 - cap_list[ncaps++] = CAP_NET_BROADCAST; + cap_list[ncaps++] = CAP_NET_BROADCAST; #endif - } + } - cap_clear_flag(caps, CAP_EFFECTIVE); - rc |= cap_set_flag(caps, CAP_EFFECTIVE, ncaps, cap_list, CAP_SET); - rc |= cap_set_flag(caps, CAP_PERMITTED, ncaps, cap_list, CAP_SET); + cap_clear_flag(caps, CAP_EFFECTIVE); + rc |= cap_set_flag(caps, CAP_EFFECTIVE, ncaps, cap_list, CAP_SET); + rc |= cap_set_flag(caps, CAP_PERMITTED, ncaps, cap_list, CAP_SET); if (rc || cap_set_proc(caps) != 0) { IpInterceptor.StopTransparency("Error enabling needed capabilities."); } - cap_free(caps); + cap_free(caps); } #else IpInterceptor.StopTransparency("Missing needed capability support.");