Index: /branches/rel_apv_10_7/usr/click/lib/libca_snmp/snmp_cadmin.c
===================================================================
--- /branches/rel_apv_10_7/usr/click/lib/libca_snmp/snmp_cadmin.c	(revision 39869)
+++ /branches/rel_apv_10_7/usr/click/lib/libca_snmp/snmp_cadmin.c	(working copy)
@@ -1765,6 +1765,16 @@
 		pInfo->host[i].ipaddr = addr.s_addr;
 	}
 	if (trap_version == 3) {
+		if (strcmp(comm_user, "public") == 0) {
+			printf("Error: User 'public' is not allowed for SNMPv3.\n");
+			printf("Please enter a valid user name\n");
+			snmp_server_unlock();
+			return CA_ERR_SNMP_INVAL; 
+		} else if (is_snmpv3user_exist(comm_user) == 0) {
+			printf("%s does not exist in user database of SNMP\n", comm_user);
+			snmp_server_unlock();
+			return CA_ERR_SNMP_INVAL; 
+		}
 		strlcpy(pInfo->host[i].user_name, comm_user, SNMPV3_USERNAME_MAXLEN + 1);
 		pInfo->host[i].community[0] = '\0';
 	} else {
Index: /branches/rel_apv_10_7/usr/click/lib/libparser/commands.pm
===================================================================
--- /branches/rel_apv_10_7/usr/click/lib/libparser/commands.pm	(revision 39869)
+++ /branches/rel_apv_10_7/usr/click/lib/libparser/commands.pm	(working copy)
@@ -34190,13 +34190,13 @@
 		         },
 		         {
 				type=> "STRING",
-				help_string => "{authNopriv|authPriv}, security level",
+				help_string => "{authNopriv|authPriv}, security level. Should be same as in SNMP V3 user config",
 				optional => "YES",
 				default_value => "\"authNopriv\"",
 		         },
 		         {
 				type=> "STRING",
-				help_string => "private password for encryption (ranges from 8 to 32 characters)",
+				help_string => "private password for encryption (ranges from 8 to 32 characters). Should be same as in SNMP V3 user config",
 				optional => "YES",
 				default_value => "\"\"",
 		         },
@@ -34208,13 +34208,13 @@
 		         },
 				{
 				type=> "STRING",
-				help_string => "authentication protocol (MD5 or SHA1, default:MD5)",
+				help_string => "authentication protocol (MD5 or SHA1, default:MD5). Should be same as in SNMP V3 user config",
 				optional => "YES",
 				default_value => "\"MD5\"",
 		        },
 				{
 				type=> "STRING",
-				help_string => "encryption protocol(DES or AES, default:DES)",
+				help_string => "encryption protocol(DES or AES, default:DES). Should be same as in SNMP V3 user config",
 				optional => "YES",
 				default_value => "\"DES\"",
 		        },