Index: usr/click/lib/libexauth/auth_ext_cli.c
===================================================================
--- usr/click/lib/libexauth/auth_ext_cli.c	(revision 38388)
+++ usr/click/lib/libexauth/auth_ext_cli.c	(working copy)
@@ -315,7 +315,7 @@
 
 	if (id_num == 0)
 	{
-                if (g_exauth_conf.exau_method != METHOD_RADIUS) {
+                if ((g_exauth_conf.exau_method == METHOD_LDAPS) || (g_exauth_conf.exau_method == METHOD_LDAP)) {
                     printf ("Invalid method selected for : %s\n", EXAUTH_SERVER_ID1);
                     return 0;
                 }
@@ -324,7 +324,7 @@
 
 	if (id_num == 1)
 	{	
-                if (g_exauth_conf.exau_method != METHOD_TAC_X) {
+                if ((g_exauth_conf.exau_method == METHOD_LDAPS) || (g_exauth_conf.exau_method == METHOD_LDAP)) {
                     printf ("Invalid method selected for : %s \n", EXAUTH_SERVER_ID2);
                     return 0;
                 }
@@ -678,7 +678,7 @@
 	{
 		if (g_exauth_conf.exauth_servers[i].id && g_exauth_conf.exauth_servers[i].id[0] != '\0')
 		{
-                    if (g_exauth_conf.exau_method == METHOD_LDAP) {
+                    if (!strcmp (g_exauth_conf.exauth_servers[i].id, "es03")) {
                         printf ("%s ldap %s \"%s\" %d \"%s\" \"%s\" \n",
                                     CLI_EXAUTH_SERVER,
                                     g_exauth_conf.exauth_servers[i].id,
@@ -687,7 +687,7 @@
                                         g_exauth_conf.exauth_servers[i].dn,
                                         g_exauth_conf.exauth_servers[i].memberOf
                                         );
-                    } else if (g_exauth_conf.exau_method == METHOD_LDAPS) {
+                    } else if (!strcmp (g_exauth_conf.exauth_servers[i].id, "es04")) {
                         printf ("%s ldaps settings %s \"%s\" %d \"%s\" \"%s\"\n",
                                     CLI_EXAUTH_SERVER,
                                     g_exauth_conf.exauth_servers[i].id,