add some idmap parsing error messages

otherwise, we just get a return value of false from setting config failure, with no indication as to what actually failed in the log. Signed-off-by: Tycho Andersen <tycho@tycho.ws>

add some idmap parsing error messages
0ef8bff5 · Tycho Andersen · Christian Brauner · e0419ca1 · 0ef8bff5
Unverified Commit 0ef8bff5 authored Jan 09, 2018 by Tycho Andersen Committed by Christian Brauner Jan 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

confile_utils.c src/lxc/confile_utils.c +13 -4

No files found.
--- a/src/lxc/confile_utils.c
+++ b/src/lxc/confile_utils.c
@@ -59,8 +59,11 @@ int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
 		goto on_error;

 	/* Validate type. */
-	if (*slide != 'u' && *slide != 'g')
+	if (*slide != 'u' && *slide != 'g') {
+		ERROR("invalid mapping type: %c", *slide);
 		goto on_error;
+	}
+
 	/* Assign type. */
 	tmp_type = *slide;

@@ -85,8 +88,10 @@ int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
 	*slide = '\0';

 	/* Parse nsuid. */
-	if (lxc_safe_ulong(window, &tmp_nsid) < 0)
+	if (lxc_safe_ulong(window, &tmp_nsid) < 0) {
+		ERROR("couldn't parse nsuid: %s", window);
 		goto on_error;
+	}

 	/* Move beyond \0. */
 	slide++;
@@ -109,8 +114,10 @@ int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
 	*slide = '\0';

 	/* Parse hostid. */
-	if (lxc_safe_ulong(window, &tmp_hostid) < 0)
+	if (lxc_safe_ulong(window, &tmp_hostid) < 0) {
+		ERROR("couldn't parse hostid: %s", window);
 		goto on_error;
+	}

 	/* Move beyond \0. */
 	slide++;
@@ -139,8 +146,10 @@ int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
 	*slide = '\0';

 	/* Parse range. */
-	if (lxc_safe_ulong(window, &tmp_range) < 0)
+	if (lxc_safe_ulong(window, &tmp_range) < 0) {
+		ERROR("couldn't parse range: %s", window);
 		goto on_error;
+	}

 	*type = tmp_type;
 	*nsid = tmp_nsid;