Index: /branches/rel_apv_10_7_4/usr/click/lib/libca_snmp/snmp_cadmin.c
===================================================================
--- /branches/rel_apv_10_7_4/usr/click/lib/libca_snmp/snmp_cadmin.c	(revision 39778)
+++ /branches/rel_apv_10_7_4/usr/click/lib/libca_snmp/snmp_cadmin.c	(working copy)
@@ -1971,13 +1971,22 @@
 				return CA_ERR_SNMP_INVAL;
 			}
 		}
+		if (port == 161 || port == 162) {
+			pInfo->host[i].port = port;
+		} else {
+			printf("WARNING: Port %d is not a standard SNMP port.\n", port);
+			printf("Only 161 (Polling) and 162 (Traps) are recommended.\n");
+
+			/* Optional: Set to a default value or return an error code */
+			pInfo->host[i].port = 162;
+		}
 	} else {
 		/* snmpv1 or snmpv2c update auth_protocol and priv_protocol */
-		printf("Warning: This command only applicable for SNMP trap version v3!");
+		printf("Warning: This command only applicable for SNMP trap version v3!\n");
 		strncpy(auth_protocol, "", ENCRYPTSTR_LEN);
 		strncpy(priv_protocol, "", ENCRYPTSTR_LEN);
+		pInfo->host[i].port = 162;
 	}
-	pInfo->host[i].port = port;
 	if (trap_ver == 3) {
 		strlcpy(pInfo->host[i].auth_eng_id, engine_id, ENGINE_ID_MAX_LEN + 1);
 		strlcpy(pInfo->host[i].authPassword, encry_auth_passwd, MAX_ENCRPT_PASSWD_LEN + 1);
Index: /branches/rel_apv_10_7_4/usr/click/lib/libparser/commands.pm
===================================================================
--- /branches/rel_apv_10_7_4/usr/click/lib/libparser/commands.pm	(revision 39778)
+++ /branches/rel_apv_10_7_4/usr/click/lib/libparser/commands.pm	(working copy)
@@ -34187,7 +34187,7 @@
 		         },
 			 {
 				type=> "U16",
-				help_string => "host port to receive trap (range 0 - 65535, default 162)",
+				help_string => "host port to receive trap (161 or 162, default 162)",
 				optional => "YES",
 				default_value => "162",
 		         },