diff options
author | trasz <trasz@FreeBSD.org> | 2015-02-06 14:44:29 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2015-02-06 14:44:29 +0000 |
commit | 4876ad42c5088e2d6ba88ad222741b31a9b905a8 (patch) | |
tree | 05342d6e1aa8e7d873ce3b66f89495640b4d5d9c | |
parent | 9f75cacf3cebff5c0bc6e663a34ffebe4f9fcfef (diff) | |
download | FreeBSD-src-4876ad42c5088e2d6ba88ad222741b31a9b905a8.zip FreeBSD-src-4876ad42c5088e2d6ba88ad222741b31a9b905a8.tar.gz |
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
-rw-r--r-- | usr.sbin/ctladm/ctladm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index f2e933a..03c751b 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); } |