[systemd-commits] 2 commits - src/core src/libsystemd-network

[Zbigniew Jędrzejewski-Szmek]

 src/core/cgroup.c                         |    2 +-
 src/libsystemd-network/test-dhcp-client.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a3bd89ea99214db7ca2ad6ae59181d5119a54f09
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Jan 31 23:03:25 2015 -0500

    core/cgroup: fix embarrassing typo
    
    https://github.com/docker/docker/issues/10280

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 64d00b1..10fdcc9 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -380,7 +380,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
                 }
         }
 
-        if ((mask & CGROUP_MEMORY) & !is_root) {
+        if ((mask & CGROUP_MEMORY) && !is_root) {
                 if (c->memory_limit != (uint64_t) -1) {
                         char buf[DECIMAL_STR_MAX(uint64_t) + 1];
 

commit afa3509a4f4438a869725dae1d6a6f20dc0182f3
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Jan 31 12:25:12 2015 -0500

    test-dhcp-client: remove linebreak

diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index a3d69f3..8e2ede9 100644
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -474,8 +474,7 @@ static void test_addr_acq(sd_event *e) {
         assert_se(sd_dhcp_client_set_index(client, 42) >= 0);
         assert_se(sd_dhcp_client_set_mac(client, mac_addr, ETH_ALEN, ARPHRD_ETHER) >= 0);
 
-        assert_se(sd_dhcp_client_set_callback(client, test_addr_acq_acquired, e)
-                >= 0);
+        assert_se(sd_dhcp_client_set_callback(client, test_addr_acq_acquired, e) >= 0);
 
         callback_recv = test_addr_acq_recv_discover;