===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -c -r1.190 -r1.191
*** src/usr.bin/nc/netcat.c	2018/03/19 16:35:29	1.190
--- src/usr.bin/nc/netcat.c	2018/04/27 15:17:53	1.191
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.190 2018/03/19 16:35:29 jsing Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.191 2018/04/27 15:17:53 beck Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
***************
*** 349,361 ****
  		if (setrtable(rtableid) == -1)
  			err(1, "setrtable");
  
  	if (family == AF_UNIX) {
  		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
  			err(1, "pledge");
  	} else if (Fflag && Pflag) {
  		if (pledge("stdio inet dns sendfd tty", NULL) == -1)
  			err(1, "pledge");
! 	} else if (Fflag) { 
  		if (pledge("stdio inet dns sendfd", NULL) == -1)
  			err(1, "pledge");
  	} else if (Pflag && usetls) {
--- 349,376 ----
  		if (setrtable(rtableid) == -1)
  			err(1, "setrtable");
  
+ 	/* Cruft to make sure options are clean, and used properly. */
+ 	if (argv[0] && !argv[1] && family == AF_UNIX) {
+ 		host = argv[0];
+ 		uport = NULL;
+ 	} else if (argv[0] && !argv[1]) {
+ 		if (!lflag)
+ 			usage(1);
+ 		uport = argv[0];
+ 		host = NULL;
+ 	} else if (argv[0] && argv[1]) {
+ 		host = argv[0];
+ 		uport = argv[1];
+ 	} else
+ 		usage(1);
+ 
  	if (family == AF_UNIX) {
  		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
  			err(1, "pledge");
  	} else if (Fflag && Pflag) {
  		if (pledge("stdio inet dns sendfd tty", NULL) == -1)
  			err(1, "pledge");
! 	} else if (Fflag) {
  		if (pledge("stdio inet dns sendfd", NULL) == -1)
  			err(1, "pledge");
  	} else if (Pflag && usetls) {
***************
*** 369,389 ****
  			err(1, "pledge");
  	} else if (pledge("stdio inet dns", NULL) == -1)
  		err(1, "pledge");
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
- 		host = argv[0];
- 		uport = NULL;
- 	} else if (argv[0] && !argv[1]) {
- 		if (!lflag)
- 			usage(1);
- 		uport = argv[0];
- 		host = NULL;
- 	} else if (argv[0] && argv[1]) {
- 		host = argv[0];
- 		uport = argv[1];
- 	} else
- 		usage(1);
  
  	if (lflag && sflag)
  		errx(1, "cannot use -s and -l");
--- 384,389 ----