spacing

4 files changed, 20 insertions, 19 deletions

diff --git a/usr.sbin/ikectl/ikeca.c b/usr.sbin/ikectl/ikeca.c
index 9f95b892aaa..60bdbd28374 100644
--- a/usr.sbin/ikectl/ikeca.c
+++ b/usr.sbin/ikectl/ikeca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikeca.c,v 1.19 2010/10/08 16:15:22 reyk Exp $	*/
+/*	$OpenBSD: ikeca.c,v 1.20 2011/05/27 12:01:02 reyk Exp $	*/
 /*	$vantronix: ikeca.c,v 1.13 2010/06/03 15:52:52 reyk Exp $	*/
 
 /*
@@ -204,8 +204,8 @@ ca_sign(struct ca *ca, char *keyname, int type, char *envargs)
 		    " -passin file:%s", name, envargs, PATH_OPENSSL,
 		    ca->sslpath, keyname, ca->sslpath, ca->sslpath,
 		    ca->extcnf, ca->sslpath, keyname, ca->passfile);
-	} else 
-	    err(1, "unknown host type %d", type);
+	} else
+		err(1, "unknown host type %d", type);
 
 	system(cmd);
 
@@ -233,7 +233,7 @@ ca_certificate(struct ca *ca, char *keyname, int type, int action)
 	ca_key_create(ca, keyname);
 	ca_request(ca, keyname);
 	ca_sign(ca, keyname, type, envargs);
-	
+
 	return (0);
 }
 
@@ -373,7 +373,7 @@ ca_install(struct ca *ca, char *dir)
 	char		 src[PATH_MAX];
 	char		 dst[PATH_MAX];
 	char		*p = NULL;
-	
+
 	snprintf(src, sizeof(src), "%s/ca.crt", ca->sslpath);
 	if (stat(src, &st) == -1) {
 		printf("CA '%s' does not exist\n", ca->caname);
@@ -572,9 +572,9 @@ ca_export(struct ca *ca, char *keyname, char *myname, char *password)
 		snprintf(cmd, sizeof(cmd), "env EXPASS=%s %s pkcs12 -export"
 		    " -name %s -CAfile %s/ca.crt -inkey %s/private/%s.key"
 		    " -in %s/%s.crt -out %s/private/%s.pfx -passout env:EXPASS"
-		    " -passin file:%s", pass, PATH_OPENSSL, keyname, ca->sslpath,
-		    ca->sslpath, keyname, ca->sslpath, keyname, ca->sslpath,
-		    oname, ca->passfile);
+		    " -passin file:%s", pass, PATH_OPENSSL, keyname,
+		    ca->sslpath, ca->sslpath, keyname, ca->sslpath, keyname,
+		    ca->sslpath, oname, ca->passfile);
 		system(cmd);
 	}
 
diff --git a/usr.sbin/ikectl/ikectl.c b/usr.sbin/ikectl/ikectl.c
index 64bdbd5d6b2..cc4dca67ea7 100644
--- a/usr.sbin/ikectl/ikectl.c
+++ b/usr.sbin/ikectl/ikectl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikectl.c,v 1.11 2010/10/08 11:41:56 jsg Exp $	*/
+/*	$OpenBSD: ikectl.c,v 1.12 2011/05/27 12:01:02 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
@@ -72,7 +72,8 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-q] [-s socket] command [arg ...]\n", __progname);
+	fprintf(stderr, "usage: %s [-q] [-s socket] command [arg ...]\n",
+	    __progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/ikectl/parser.c b/usr.sbin/ikectl/parser.c
index 19e721dec99..ed240dd3e54 100644
--- a/usr.sbin/ikectl/parser.c
+++ b/usr.sbin/ikectl/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.9 2010/10/08 10:13:47 jsg Exp $	*/
+/*	$OpenBSD: parser.c,v 1.10 2011/05/27 12:01:02 reyk Exp $	*/
 
 /*
  * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
@@ -95,9 +95,9 @@ static const struct token t_main[] = {
 };
 
 static const struct token t_log[] = {
-	{ KEYWORD,	"verbose",	LOG_VERBOSE, 	NULL },
-	{ KEYWORD,	"brief",	LOG_BRIEF, 	NULL },
-	{ ENDTOKEN, 	"",		NONE,		NULL }
+	{ KEYWORD,	"verbose",	LOG_VERBOSE,	NULL },
+	{ KEYWORD,	"brief",	LOG_BRIEF,	NULL },
+	{ ENDTOKEN,	"",		NONE,		NULL }
 };
 
 static const struct token t_reset[] = {
@@ -111,7 +111,7 @@ static const struct token t_reset[] = {
 
 static const struct token t_load[] = {
 	{ PATH,		"",		NONE,		NULL },
-	{ ENDTOKEN, 	"",		NONE,		NULL }
+	{ ENDTOKEN,	"",		NONE,		NULL }
 };
 
 static const struct token t_ca[] = {
@@ -126,7 +126,7 @@ static const struct token t_ca_modifiers[] = {
 	{ KEYWORD,	"certificate",	CA_CERTIFICATE,	t_ca_cert },
 	{ KEYWORD,	"key",		NONE,		t_ca_key },
 	{ KEYWORD,	"export",	CA_EXPORT,	t_ca_export },
-	{ ENDTOKEN, 	"",		NONE,		NULL }
+	{ ENDTOKEN,	"",		NONE,		NULL }
 };
 
 static const struct token t_ca_pass_val[] = {
@@ -201,7 +201,7 @@ static const struct token t_ca_key_modifiers[] = {
 
 static const struct token t_ca_key_path[] = {
 	{ PATH,		"",		NONE,		NULL },
-	{ PATH, 	"",		NONE,		NULL }
+	{ PATH,		"",		NONE,		NULL }
 };
 
 static const struct token t_show[] = {
diff --git a/usr.sbin/ikectl/parser.h b/usr.sbin/ikectl/parser.h
index 1c40381a2b3..afa70507eaf 100644
--- a/usr.sbin/ikectl/parser.h
+++ b/usr.sbin/ikectl/parser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.h,v 1.9 2010/10/08 10:13:47 jsg Exp $	*/
+/*	$OpenBSD: parser.h,v 1.10 2011/05/27 12:01:02 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
@@ -60,7 +60,7 @@ struct parse_result {
 	enum actions	 action;
 	struct imsgbuf	*ibuf;
 	char		*path;
-	char 		*caname;
+	char		*caname;
 	char		*pass;
 	char		*host;
 	char		*peer;