Attachment 151658 Details for Bug 235198 – ipmitool-K-enhancement.patch

[patch] ipmitool-K-enhancement.patch

ipmitool-K-enhancement.patch (text/plain), 2.31 KB, created by Jose Plans on 2007-04-04 13:50:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose Plans

Created: 2007-04-04 13:50:26 UTC

Size: 2.31 KB

patch

obsolete

>--- ipmitool-1.8.7/doc/ipmitool.1.K-enhancement	2007-03-29 20:38:22.000000000 +0100
>+++ ipmitool-1.8.7/doc/ipmitool.1	2007-03-29 20:40:13.000000000 +0100
>@@ -26,7 +26,7 @@ ipmitool [\fB\-c\fR|\fB\-h\fR|\fB\-v\fR|
>          [\fB\-o\fR <\fIoemtype\fP>]
>          [\fB\-O\fR <\fIsel oem\fP>]
>          [\fB\-C\fR <\fIciphersuite\fP>]
>-         [\fB\-k\fR <\fIkg_key\fP>]
>+         [\fB\-K\fR|\fB\-k\fR <\fIkg_key\fP>]
>          [\fB\-e\fR <\fIesc_char\fP>]
>          <\fIcommand\fP>
> .SH "DESCRIPTION"
>@@ -61,6 +61,9 @@ This is not available with all commands.
> Use supplied character for SOL session escape character.  The default
> is to use \fI~\fP but this can conflict with ssh sessions.
> .TP
>+\fB\-K\fR
>+Prompt for the Kg key for IPMIv2 authentication.
>+.TP
> \fB\-k\fR <\fIkey\fP>
> Use supplied Kg key for IPMIv2 authentication.  The default is not to
> use any Kg key.
>--- ipmitool-1.8.7/lib/ipmi_main.c.K-enhancement	2006-03-19 19:54:27.000000000 +0000
>+++ ipmitool-1.8.7/lib/ipmi_main.c	2007-04-04 11:16:17.000000000 +0100
>@@ -71,7 +71,7 @@
> #endif
> 
> #ifdef ENABLE_ALL_OPTIONS
>-# define OPTION_STRING	"I:hVvcgsEao:H:P:f:U:p:C:L:A:t:m:S:l:b:e:k:O:"
>+# define OPTION_STRING	"I:hVvcgsEKao:H:P:f:U:p:C:L:A:t:m:S:l:b:e:k:O:"
> #else
> # define OPTION_STRING	"I:hVvcH:f:U:p:S:"
> #endif
>@@ -224,6 +224,7 @@ ipmi_option_usage(const char * progname,
> 	lprintf(LOG_NOTICE, "       -S sdr         Use local file for remote SDR cache");
> #ifdef ENABLE_ALL_OPTIONS
> 	lprintf(LOG_NOTICE, "       -a             Prompt for remote password");
>+	lprintf(LOG_NOTICE, "       -K             Prompt for the Kg key for IPMIv2 authentication");
> 	lprintf(LOG_NOTICE, "       -e char        Set SOL escape character");
> 	lprintf(LOG_NOTICE, "       -C ciphersuite Cipher suite to be used by lanplus interface");
> 	lprintf(LOG_NOTICE, "       -k key         Use Kg key for IPMIv2 authentication");
>@@ -373,6 +374,22 @@ ipmi_main(int argc, char ** argv,
> 				goto out_free;
> 			}
> 			break;
>+		case 'K':
>+#ifdef HAVE_GETPASSPHRASE
>+			tmp = getpassphrase("Key: ");
>+#else
>+			tmp = getpass("Key: ");
>+#endif
>+			if (tmp != NULL) {
>+				if (kgkey)
>+					free(kgkey);
>+				kgkey = strdup(tmp);
>+				if (kgkey == NULL) {
>+					lprintf(LOG_ERR, "%s: malloc failure", progname);
>+					goto out_free;
>+				}
>+			}
>+			break;
> 		case 'U':
> 			username = strdup(optarg);
> 			if (username == NULL) {

Actions: View | Diff

Attachments on bug 235198: 151658