From owner-svn-src-projects@freebsd.org Sat Jun 30 20:10:29 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23788FDA79A for ; Sat, 30 Jun 2018 20:10:29 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CAB7A8B213; Sat, 30 Jun 2018 20:10:28 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD1C0148B6; Sat, 30 Jun 2018 20:10:28 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5UKASlx048774; Sat, 30 Jun 2018 20:10:28 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5UKASsu048773; Sat, 30 Jun 2018 20:10:28 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806302010.w5UKASsu048773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 30 Jun 2018 20:10:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335826 - projects/pnfs-planb-server/usr.bin/pnfsdsfile X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.bin/pnfsdsfile X-SVN-Commit-Revision: 335826 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2018 20:10:29 -0000 Author: rmacklem Date: Sat Jun 30 20:10:28 2018 New Revision: 335826 URL: https://svnweb.freebsd.org/changeset/base/335826 Log: The previous patch checked for other incompatible options too agressively. "-s" can be used with "-z" and this patch again allows that. Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Sat Jun 30 20:09:43 2018 (r335825) +++ projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Sat Jun 30 20:10:28 2018 (r335826) @@ -130,18 +130,18 @@ main(int argc, char *argv[]) break; case 's': /* Translate the server name to an IP address. */ - if (zerofh != 0 || zerods != 0 || mirrorit != 0 || - newres != NULL || res != NULL) - errx(1, "-c, -m, -r, -s and -z are mutually " - "exclusive and only can be used once"); + if (zerods != 0 || mirrorit != 0 || newres != NULL || + res != NULL) + errx(1, "-c, -m and -r are mutually exclusive " + "from use with -s and -z"); if (getaddrinfo(optarg, NULL, NULL, &res) != 0) errx(1, "Can't get IP# for %s", optarg); break; case 'z': if (zerofh != 0 || zerods != 0 || mirrorit != 0 || - newres != NULL || res != NULL) - errx(1, "-c, -m, -r, -s and -z are mutually " - "exclusive and only can be used once"); + newres != NULL) + errx(1, "-c, -m and -r are mutually exclusive " + "from use with -s and -z"); zerofh = 1; break; default: