From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 20 May 2021 06:04:15 +0000 (+0900)
Subject: nspawn: fix build failure
X-Git-Tag: v249-rc1~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=354dadb30fd8682c3f4f54ef0c3aa507acb868b3;p=thirdparty%2Fsystemd.git

nspawn: fix build failure

This fixes a conflict between #19555 and #19653.
---

diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c
index ebf7d4d9176..801a52b7a8d 100644
--- a/src/nspawn/nspawn-bind-user.c
+++ b/src/nspawn/nspawn-bind-user.c
@@ -205,7 +205,6 @@ int bind_user_prepare(
 
         _cleanup_(bind_user_context_freep) BindUserContext *c = NULL;
         uid_t current_uid = MAP_UID_START;
-        size_t n_allocated = 0;
         char **n;
         int r;
 
@@ -282,7 +281,7 @@ int bind_user_prepare(
                 if (r < 0)
                         return r;
 
-                if (!GREEDY_REALLOC(c->data, n_allocated, c->n_data + 1))
+                if (!GREEDY_REALLOC(c->data, c->n_data + 1))
                         return log_oom();
 
                 sm = strdup(u->home_directory);