From owner-svn-src-all@freebsd.org Wed Aug 8 20:30:13 2018 Return-Path: Delivered-To: svn-src-all@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 B7EB4106A096; Wed, 8 Aug 2018 20:30:13 +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 5F619927A0; Wed, 8 Aug 2018 20:30:13 +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 3CA407844; Wed, 8 Aug 2018 20:30:13 +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 w78KUDUc094660; Wed, 8 Aug 2018 20:30:13 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w78KUDS2094659; Wed, 8 Aug 2018 20:30:13 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201808082030.w78KUDS2094659@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 8 Aug 2018 20:30:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337502 - head/usr.sbin/pnfsdscopymr X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.sbin/pnfsdscopymr X-SVN-Commit-Revision: 337502 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2018 20:30:13 -0000 Author: rmacklem Date: Wed Aug 8 20:30:12 2018 New Revision: 337502 URL: https://svnweb.freebsd.org/changeset/base/337502 Log: Fix the err() arguments for a nfssvc(8) failure. argv has been incremented during argument handling, so elements of the array are no longer valid. Change the err() arguments so only the first string pointer in argv is used. Found during code inspection. Modified: head/usr.sbin/pnfsdscopymr/pnfsdscopymr.c Modified: head/usr.sbin/pnfsdscopymr/pnfsdscopymr.c ============================================================================== --- head/usr.sbin/pnfsdscopymr/pnfsdscopymr.c Wed Aug 8 20:21:45 2018 (r337501) +++ head/usr.sbin/pnfsdscopymr/pnfsdscopymr.c Wed Aug 8 20:30:12 2018 (r337502) @@ -295,7 +295,7 @@ main(int argc, char *argv[]) pnfsdarg.mdspath = *argv; ret = nfssvc(NFSSVC_PNFSDS, &pnfsdarg); if (ret < 0 && errno != EEXIST) - err(1, "Copymr failed args %s, %s", argv[1], argv[2]); + err(1, "Copymr failed for file %s", *argv); exit(0); }