lxcapi_clone: restore the unexpanded config len

Otherwise it gets shortened with the temporary len but never
restored - which will only break API users which do a clone
then continue to use the original container, meaning this is
a hard one to detect.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index adc29c5cc6e0641d6b3dd8aba532d065716c84cc..69816da23644a20bdc220f841de03556c044bf0e 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3059,6 +3059,7 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char
        int ret, storage_copied = 0;
        char *origroot = NULL, *saved_unexp_conf = NULL;
        struct clone_update_data data;
+       size_t saved_unexp_len;
        FILE *fout;
        pid_t pid;
 
@@ -3106,6 +3107,7 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char
        }
 
        saved_unexp_conf = c->lxc_conf->unexpanded_config;
+       saved_unexp_len = c->lxc_conf->unexpanded_len;
        c->lxc_conf->unexpanded_config = strdup(saved_unexp_conf);
        if (!c->lxc_conf->unexpanded_config) {
                ERROR("Out of memory");
@@ -3118,6 +3120,7 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char
        free(c->lxc_conf->unexpanded_config);
        c->lxc_conf->unexpanded_config = saved_unexp_conf;
        saved_unexp_conf = NULL;
+       c->lxc_conf->unexpanded_len = saved_unexp_len;
 
        sprintf(newpath, "%s/%s/rootfs", lxcpath, newname);
        if (mkdir(newpath, 0755) < 0) {