call lxc_container_put when appropriate

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index b9727a0f43611848b0417b9b60ac6145dc4309fc..7c26fc62008c90fc118f544f234af130fbd4fff8 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -85,6 +85,7 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                ERROR("Insufficent privileges to control %s:%s", my_args.lxcpath[0], my_args.name);
+               lxc_container_put(c);
                return -1;
        }
 

diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c
index e01c98b277ba714fba4e3b0dfb94f4b6825ce1cb..4639a90df8ac5040f2a82193ae89945719346851 100644 (file)
--- a/src/lxc/lxc_clone.c
+++ b/src/lxc/lxc_clone.c
@@ -163,6 +163,7 @@ int main(int argc, char *argv[])
 
        if (!c1->may_control(c1)) {
                fprintf(stderr, "Insufficent privileges to control %s\n", orig);
+               lxc_container_put(c1);
                return -1;
        }
 

diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
index f5d16fa6be74660e767cf9b42c871773ceaf272a..5dc3d49a08e67cdb9fe6bad5e1f07c6e5c3611d1 100644 (file)
--- a/src/lxc/lxc_console.c
+++ b/src/lxc/lxc_console.c
@@ -113,17 +113,21 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                fprintf(stderr, "Insufficent privileges to control %s\n", my_args.name);
+               lxc_container_put(c);
                return -1;
        }
 
        if (!c->is_running(c)) {
                fprintf(stderr, "%s is not running\n", my_args.name);
+               lxc_container_put(c);
                exit(EXIT_FAILURE);
        }
 
        ret = c->console(c, my_args.ttynum, 0, 1, 2, my_args.escape);
        if (ret < 0) {
+               lxc_container_put(c);
                exit(EXIT_FAILURE);
        }
+       lxc_container_put(c);
        return EXIT_SUCCESS;
 }

diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
index d50fcf121bfe18eecbb3eacfaee8abec025b8ed7..9983241d918bc535a77c44fd2c08526611809256 100644 (file)
--- a/src/lxc/lxc_destroy.c
+++ b/src/lxc/lxc_destroy.c
@@ -89,6 +89,7 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                fprintf(stderr, "Insufficent privileges to control %s\n", my_args.name);
+               lxc_container_put(c);
                return -1;
        }
 

diff --git a/src/lxc/lxc_freeze.c b/src/lxc/lxc_freeze.c
index 92d7aa272f199d5b1c7494a40c91d4c94f8bda8b..9e783bdacd658690acfa8ece8fea0928d632076d 100644 (file)
--- a/src/lxc/lxc_freeze.c
+++ b/src/lxc/lxc_freeze.c
@@ -74,6 +74,7 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                ERROR("Insufficent privileges to control %s:%s", my_args.lxcpath[0], my_args.name);
+               lxc_container_put(c);
                return -1;
        }
 

diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
index ac562878a62f94b1beee0f9b6897b8075dc9567d..aeaf9a896c750d57621606e42cbf02255efdaf07 100644 (file)
--- a/src/lxc/lxc_info.c
+++ b/src/lxc/lxc_info.c
@@ -109,6 +109,7 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                fprintf(stderr, "Insufficent privileges to control %s\n", c->name);
+               lxc_container_put(c);
                return -1;
        }
 
@@ -160,5 +161,6 @@ int main(int argc, char *argv[])
                }
        }
 
+       lxc_container_put(c);
        return 0;
 }

diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
index 573804b39beb21a4ca63b03dec7680276465284e..68e051db865f35fde5e540d8a0c4175761ece190 100644 (file)
--- a/src/lxc/lxc_snapshot.c
+++ b/src/lxc/lxc_snapshot.c
@@ -189,6 +189,7 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                fprintf(stderr, "Insufficent privileges to control %s\n", my_args.name);
+               lxc_container_put(c);
                return -1;
        }
 

diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/lxc_unfreeze.c
index 4c499ec1944d64d4e5501d5284d3485bcf1ae623..e5def1a278b5b2ffe87e4081a13810ffe05c19ae 100644 (file)
--- a/src/lxc/lxc_unfreeze.c
+++ b/src/lxc/lxc_unfreeze.c
@@ -73,6 +73,7 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                ERROR("Insufficent privileges to control %s:%s", my_args.lxcpath[0], my_args.name);
+               lxc_container_put(c);
                return -1;
        }
 

diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c
index 0a3487f172979a5e67aecd6c45d33344a2ae2319..b00377ccf6d43dadc3737f7fdb45c493b54a9cf9 100644 (file)
--- a/src/lxc/lxc_wait.c
+++ b/src/lxc/lxc_wait.c
@@ -98,6 +98,7 @@ int main(int argc, char *argv[])
 
        if (!c->may_control(c)) {
                fprintf(stderr, "Insufficent privileges to control %s\n", c->name);
+               lxc_container_put(c);
                return -1;
        }