Index: lib/ipmi_main.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_main.c,v
retrieving revision 1.38
diff -u -r1.38 ipmi_main.c
--- lib/ipmi_main.c	11 Jan 2013 11:21:26 -0000	1.38
+++ lib/ipmi_main.c	11 Jan 2013 12:24:47 -0000
@@ -493,6 +493,8 @@
 						"from file %s", optarg);
 			break;
 		case 'a':
+			if (password != NULL)
+				break;
 #ifdef HAVE_GETPASSPHRASE
 			tmp_pass = getpassphrase("Password: ");
 #else
@@ -540,6 +542,8 @@
 			}
 			break;
 		case 'Y':
+			if (kgkey != NULL)
+				break;
 #ifdef HAVE_GETPASSPHRASE
 			tmp_pass = getpassphrase("Key: ");
 #else