revoke -> revocate, to avoid alias

ok florian

3 files changed, 14 insertions, 14 deletions

diff --git a/usr.sbin/acme-client/main.c b/usr.sbin/acme-client/main.c
index 336df3bcb7e..67269d4474d 100644
--- a/usr.sbin/acme-client/main.c
+++ b/usr.sbin/acme-client/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.2 2016/08/31 22:20:53 florian Exp $ */
+/*	$Id: main.c,v 1.3 2016/08/31 22:57:36 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
 			  cert_fds[2], file_fds[2], dns_fds[2],
 			  rvk_fds[2];
 	pid_t		  pids[COMP__MAX];
-	int		  c, rc, newacct, remote, revoke, force,
+	int		  c, rc, newacct, remote, revocate, force,
 			  staging, multidir, newkey, backup;
 	extern int	  verbose;
 	extern enum comp  proccomp;
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
 	const char	**alts;
 
 	alts = NULL;
-	newacct = remote = revoke = verbose = force = 
+	newacct = remote = revocate = verbose = force = 
 		multidir = staging = newkey = backup = 0;
 	certdir = keyfile = acctkey = chngdir = NULL;
 	agreement = AGREEMENT;
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
 			newkey = 1;
 			break;
 		case ('r'):
-			revoke = 1;
+			revocate = 1;
 			break;
 		case ('s'):
 			staging = 1;
@@ -290,7 +290,7 @@ main(int argc, char *argv[])
 		c = netproc(key_fds[1], acct_fds[1], 
 			chng_fds[1], cert_fds[1], 
 			dns_fds[1], rvk_fds[1], 
-			newacct, revoke, staging,
+			newacct, revocate, staging,
 			(const char *const *)alts, altsz,
 			agreement);
 		free(alts);
@@ -427,7 +427,7 @@ main(int argc, char *argv[])
 	if (0 == pids[COMP_REVOKE]) {
 		proccomp = COMP_REVOKE;
 		c = revokeproc(rvk_fds[0], certdir, 
-			force, revoke,
+			force, revocate,
 			(const char *const *)alts, altsz);
 		free(alts);
 		exit(c ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/usr.sbin/acme-client/netproc.c b/usr.sbin/acme-client/netproc.c
index 039f51a8205..7602731c8b5 100644
--- a/usr.sbin/acme-client/netproc.c
+++ b/usr.sbin/acme-client/netproc.c
@@ -1,4 +1,4 @@
-/*	$Id: netproc.c,v 1.1 2016/08/31 22:01:42 florian Exp $ */
+/*	$Id: netproc.c,v 1.2 2016/08/31 22:57:36 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -583,7 +583,7 @@ dofullchain(struct conn *c, const char *addr)
  */
 int
 netproc(int kfd, int afd, int Cfd, int cfd, int dfd, int rfd,
-	int newacct, int revoke, int staging, 
+	int newacct, int revocate, int staging, 
 	const char *const *alts, size_t altsz, const char *agreement)
 {
 	int		 rc;
@@ -677,7 +677,7 @@ netproc(int kfd, int afd, int Cfd, int cfd, int dfd, int rfd,
 	 * certproc, which will in turn notify the fileproc.
 	 */
 
-	if (revoke) {
+	if (revocate) {
 		if (NULL == (cert = readstr(rfd, COMM_CSR)))
 			goto out;
 		if ( ! dorevoke(&c, paths.revokecert, cert)) 
diff --git a/usr.sbin/acme-client/revokeproc.c b/usr.sbin/acme-client/revokeproc.c
index 23f66764fdb..0d788f851e4 100644
--- a/usr.sbin/acme-client/revokeproc.c
+++ b/usr.sbin/acme-client/revokeproc.c
@@ -1,4 +1,4 @@
-/*	$Id: revokeproc.c,v 1.2 2016/08/31 22:43:02 deraadt Exp $ */
+/*	$Id: revokeproc.c,v 1.3 2016/08/31 22:57:36 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -99,7 +99,7 @@ X509expires(X509 *x)
 }
 
 int
-revokeproc(int fd, const char *certdir, int force, int revoke,
+revokeproc(int fd, const char *certdir, int force, int revocate,
 	const char *const *alts, size_t altsz)
 {
 	int		 rc, cc, i, extsz, ssz;
@@ -161,12 +161,12 @@ revokeproc(int fd, const char *certdir, int force, int revoke,
 	 * Ignore if the reader isn't reading in either case.
 	 */
 	
-	if (NULL == f && revoke) {
+	if (NULL == f && revocate) {
 		warnx("%s/%s: no certificate found",
 			certdir, CERT_PEM);
 		(void)writeop(fd, COMM_REVOKE_RESP, REVOKE_OK);
 		goto out;
-	} else if (NULL == f && ! revoke) {
+	} else if (NULL == f && ! revocate) {
 		if (writeop(fd, COMM_REVOKE_RESP, REVOKE_EXP) >= 0)
 			rc = 1;
 		goto out;
@@ -283,7 +283,7 @@ revokeproc(int fd, const char *certdir, int force, int revoke,
 	 * Then exit: we have nothing left to do.
 	 */
 	
-	if (revoke) {
+	if (revocate) {
 		dodbg("%s/%s: revocation", certdir, CERT_PEM);
 
 		/*