Add a new flag '-k' to ifconfig(8), indicating that it is alright to

print potentially sensitive keying material to stdout.  With the new
802.11 support, ifconfig(8) is now capable of printing 802.11 keys,
and did by default for the root user, which is undesirable in some
environments.  Now it will not print keying material unless requested
(and available to the user).

MFC after:	1 week

1 files changed, 5 insertions, 1 deletions

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 40e6787..3f4fe71 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -91,6 +91,7 @@ int	newaddr = 1;
 int	verbose;
 
 int	supmedia = 0;
+int	printkeys = 0;		/* Print keying material for interfaces. */
 int	printname = 0;		/* Print the name of the created interface. */
 
 static	int ifconfig(int argc, char *const *argv, const struct afswtch *afp);
@@ -156,7 +157,7 @@ main(int argc, char *argv[])
 	all = downonly = uponly = namesonly = verbose = 0;
 
 	/* Parse leading line options */
-	strlcpy(options, "adlmuv", sizeof(options));
+	strlcpy(options, "adklmuv", sizeof(options));
 	for (p = opts; p != NULL; p = p->next)
 		strlcat(options, p->opt, sizeof(options));
 	while ((c = getopt(argc, argv, options)) != -1) {
@@ -167,6 +168,9 @@ main(int argc, char *argv[])
 		case 'd':	/* restrict scan to "down" interfaces */
 			downonly++;
 			break;
+		case 'k':
+			printkeys++;
+			break;
 		case 'l':	/* scan interface names only */
 			namesonly++;
 			break;