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 39889)
+++ /branches/rel_apv_10_7/usr/click/lib/libca_snmp/snmp_cadmin.c	(working copy)
@@ -1754,16 +1754,6 @@
 		snmp_server_unlock();
 		return CA_ERR_SNMP_INVAL;
 	}
-	uint16_t port = 162;
-	pInfo->host[i].port = port;
-	strlcpy(pInfo->host[i].ipstr, ipstr, IPADDR_STR_LEN);
-	pInfo->host[i].isipv6 = isipv6;
-	pInfo->host[i].snmp_version = trap_version;
-	if (isipv6) {
-		pInfo->host[i].ipaddr6 = in6;
-	} else {
-		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");
@@ -1781,6 +1771,16 @@
 		strlcpy(pInfo->host[i].community, comm_user, CA_SNMP_COMM_LEN + 1);
 		pInfo->host[i].user_name[0] = '\0';
 	}
+	uint16_t port = 162;
+	pInfo->host[i].port = port;
+	strlcpy(pInfo->host[i].ipstr, ipstr, IPADDR_STR_LEN);
+	pInfo->host[i].isipv6 = isipv6;
+	pInfo->host[i].snmp_version = trap_version;
+	if (isipv6) {
+		pInfo->host[i].ipaddr6 = in6;
+	} else {
+		pInfo->host[i].ipaddr = addr.s_addr;
+	}
 	pInfo->ipaddrcnt++;
 
 	if (trap_version != 3) {