aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2015-02-06 14:44:29 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2015-02-06 14:44:29 +0000
commitb56a6368c70ffab6ee40c71c56346793d5a88abc (patch)
tree05342d6e1aa8e7d873ce3b66f89495640b4d5d9c
parent02aa7d7b57f1037b0449603b4a20df6939328999 (diff)
downloadsrc-b56a6368c70ffab6ee40c71c56346793d5a88abc.tar.gz
src-b56a6368c70ffab6ee40c71c56346793d5a88abc.zip
Make "ctladm islist" ignore unknown elements, so the old version
continues to work with newer kernel. Other ctladm(8) "*list" subcommands seem to already handle it in a reasonable way. MFC after: 1 month Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=278316
-rw-r--r--usr.sbin/ctladm/ctladm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index f2e933a77cc1..03c751b21f31 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -3559,8 +3559,12 @@ cctl_islist_end_element(void *user_data, const char *name)
} else if (strcmp(name, "connection") == 0) {
islist->cur_conn = NULL;
} else if (strcmp(name, "ctlislist") == 0) {
- } else
- errx(1, "unknown element %s", name);
+ /* Nothing. */
+ } else {
+ /*
+ * Unknown element; ignore it for forward compatiblity.
+ */
+ }
free(str);
}