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

[Lennart Poettering]

 src/cryptsetup/cryptsetup.c        |    2 +-
 src/libsystemd/sd-event/sd-event.c |    2 +-
 src/libsystemd/sd-rtnl/sd-rtnl.c   |    6 ++++++
 src/network/networkd-netdev.c      |    5 +++++
 src/network/networkd-network.c     |    5 +++++
 5 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit ac1a87b9f2d085ef1f976a79042fe8797da9b329
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 24 23:45:58 2014 +0100

    cryptsetup: minor typo fix

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 4dc2b08..9b9074c 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -356,7 +356,7 @@ static int attach_tcrypt(struct crypt_device *cd,
                 return r;
         }
 
-        return crypt_activate_by_volume_key(cd, name, NULL, 0, flags);;
+        return crypt_activate_by_volume_key(cd, name, NULL, 0, flags);
 }
 
 static int attach_luks_or_plain(struct crypt_device *cd,

commit 79e16ce3bf734434081e57f1170333277830a592
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 24 23:45:33 2014 +0100

    networkd: fix a couple of memory leaks

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 4552f4d..a4b6743 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -2170,7 +2170,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
                         r = flush_timer(e, e->boottime_alarm.fd, ev_queue[i].events, &e->boottime_alarm.next);
                 else if (ev_queue[i].data.ptr == INT_TO_PTR(SOURCE_SIGNAL))
                         r = process_signal(e, ev_queue[i].events);
-                else if (ev_queue[i].data.ptr ==  INT_TO_PTR(SOURCE_WATCHDOG))
+                else if (ev_queue[i].data.ptr == INT_TO_PTR(SOURCE_WATCHDOG))
                         r = flush_timer(e, e->watchdog_fd, ev_queue[i].events, NULL);
                 else
                         r = process_io(e, ev_queue[i].data.ptr, ev_queue[i].events);
diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
index 551e95b..695a2da 100644
--- a/src/libsystemd/sd-rtnl/sd-rtnl.c
+++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
@@ -178,6 +178,12 @@ sd_rtnl *sd_rtnl_unref(sd_rtnl *rtnl) {
                         }
 
                         safe_close(rtnl->fd);
+
+                        sd_event_source_unref(rtnl->io_event_source);
+                        sd_event_source_unref(rtnl->time_event_source);
+                        sd_event_source_unref(rtnl->exit_event_source);
+                        sd_event_unref(rtnl->event);
+
                         free(rtnl);
 
                         return NULL;
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index cdf07ad..e333c47 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -67,6 +67,11 @@ void netdev_free(NetDev *netdev) {
         free(netdev->description);
         free(netdev->name);
 
+        condition_free_list(netdev->match_host);
+        condition_free_list(netdev->match_virt);
+        condition_free_list(netdev->match_kernel);
+        condition_free_list(netdev->match_arch);
+
         free(netdev);
 }
 
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 776a9d3..47fab4e 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -176,6 +176,11 @@ void network_free(Network *network) {
         if (network->manager && network->manager->networks)
                 LIST_REMOVE(networks, network->manager->networks, network);
 
+        condition_free_list(network->match_host);
+        condition_free_list(network->match_virt);
+        condition_free_list(network->match_kernel);
+        condition_free_list(network->match_arch);
+
         free(network);
 }