From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 29 Mar 2015 16:31:55 +0000 (+0200)
Subject: lldpcli: ensure optional local port description cannot be repeated
X-Git-Tag: 0.7.14~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec5a36012c23fe0881deddf0206a550de8182025;p=thirdparty%2Flldpd.git

lldpcli: ensure optional local port description cannot be repeated

Also fix some descriptions (no capitalization).
---

diff --git a/src/client/conf-lldp.c b/src/client/conf-lldp.c
index d8ec8382..f6ade7a1 100644
--- a/src/client/conf-lldp.c
+++ b/src/client/conf-lldp.c
@@ -201,15 +201,18 @@ register_commands_configure_lldp(struct cmd_node *configure)
 				commands_new(configure_lldp_portid_type,
 					     b_map->string, "Local",
 					     NULL, NULL, NULL),
-				NULL, "PortID",
+				NULL, "Port ID",
 				NULL, cmd_store_env_value, "port-id");
 			commands_new(port_id,
-				NEWLINE, NULL,
+				NEWLINE, "Set local port ID",
 				NULL, cmd_portid_type_local,
 				b_map->string);
-			commands_new(port_id,
-				NULL, "Port Description",
-				NULL, cmd_store_env_value_and_pop, "port-descr");
+			commands_new(
+				commands_new(port_id,
+				    NULL, "Port description",
+				    NULL, cmd_store_env_value, "port-descr"),
+				NEWLINE, "Set local port ID and description",
+				NULL, cmd_portid_type_local, NULL);
 		} else if (!strcmp(b_map->string, "macaddress")) {
 			commands_new(
 				commands_new(configure_lldp_portid_type,