From c9cceb313cca58a2120a280891bd1d2a1ab8d679 Mon Sep 17 00:00:00 2001
From: Ricardo Mestre <mestre@cvs.openbsd.org>
Date: Mon, 7 Nov 2016 23:04:56 +0000
Subject: - Remove -? since parameters don't make sense for this command (but
 still keep default case to have usage() explaining that) - Replace exit(3)
 with return to enable SSP

---
 usr.sbin/vipw/vipw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr.sbin/vipw')

diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 3838b9ab51d..3339be1137f 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vipw.c,v 1.18 2015/10/16 22:54:15 deraadt Exp $	 */
+/*	$OpenBSD: vipw.c,v 1.19 2016/11/07 23:04:55 mestre Exp $	 */
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -53,7 +53,6 @@ main(int argc, char *argv[])
 
 	while ((ch = getopt(argc, argv, "")) != -1) {
 		switch (ch) {
-		case '?':
 		default:
 			usage();
 		}
@@ -90,7 +89,8 @@ main(int argc, char *argv[])
 			break;
 		pw_prompt();
 	}
-	exit(0);
+
+	return 0;
 }
 
 void
-- 
cgit v1.2.3