svn commit: r282956 - stable/10/usr.sbin/ctladm

[Edward Tomasz Napierala]

Author: trasz
Date: Fri May 15 10:53:06 2015
New Revision: 282956
URL: https://svnweb.freebsd.org/changeset/base/282956

Log:
  MFC r278316:
  
  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.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/ctladm/ctladm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/10/usr.sbin/ctladm/ctladm.c	Fri May 15 10:50:58 2015	(r282955)
+++ stable/10/usr.sbin/ctladm/ctladm.c	Fri May 15 10:53:06 2015	(r282956)
@@ -3559,8 +3559,12 @@ cctl_islist_end_element(void *user_data,
 	} 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);
 }