From nobody Sat Aug 19 19:29:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSpjC28LBz4mNJq; Sat, 19 Aug 2023 19:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSpjC1KHtz4gC6; Sat, 19 Aug 2023 19:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692473391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6yBMmjoopWzLMWNXYV+Jpb+bj/jqkIuffedB70kYTU=; b=HsJJaC6GMwURnpykqtQqi/6uBrzrGOxqCDngCfqdgORk5Bh2ypvmAL3i9YNYGv4zWcPBvI g6JlStpFTJA7L3w52j5Z1pesVfx0vljEyKNNn2UDK5Pwe97GGZBJ4Yj6tQtkSUJpyd+Hdc BzUEn8YUmdHlP0h/ScLn7RfrULKly2HCRPXzcnTNBhXfKb2gHNv+1aHAng720zaT9bwIlF wfdeW3gitLE9kW59dgKYNWGRnxVK3I2N1nQohNOIQx2Yhw/GFLBFepq4NM6lC8tkmPVOzj QqJ+QpqJFK3m2vhDLiTffeiz7LiZPBL2rOpIA9J4Pe3yg5NPjn8YpEvl5LoqNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692473391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6yBMmjoopWzLMWNXYV+Jpb+bj/jqkIuffedB70kYTU=; b=MqRbyJGuTyuN4jmIN5Z4CeeFeLDYP3ZpkeetjuHlBLdxjORCITznJ1gD9t15bjc5XjOhmq GVA6VVc5QSfPVBMdE3VBhpXrNg4u37DCefhvEoKBWf6QeoXFZ6bFgT+SwoXqotClpF6i/H 8K14zKFDFZ5njcsDrj+QWAn4SsQI3BcaPB/IjONZ5H4Jq4fAXEsIM5CEo4xEsMQ5q0+8jt E9kHUCPGQHNETpjQAYxfogg3WdWhBMCWYL7zKdhdNKREArftgyov7p93pgaaOMGwZg5kfC RbLv4X7VFHuOzWL8NjFsBTgHCh3K9OYupzJpNONmKF2yP/RZ/bKlbl4c43znKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692473391; a=rsa-sha256; cv=none; b=Uxa7PHFdkxuZwjeZNbgAvPQdPv/Jf2WqS0Mr0c0cDC7MyWcGNsViMlt8bS5rfEx44RmKH6 Dxoy6uEtnK055LFJHF7mF4pJ9u7h9uqydHjC3DxHGHzGnLgwvkYMVEwrVxBCDzo04rvqUQ WRtZTrJSQz6DKnPwZqzmG7qzDV6kTLY0cMJ23TxZxG8XCZmkEEjVsBYpD8O86bgYpX6p6d KW5uh3YvcQhI1O5i1Esr/VQCqBT/IOj9q5Vbm2YdUI+tgBqTrM3hE6DjZp8DAKk6o5AEQ/ O/REhwcnMm4lHOjvKzySsTBrFrwXqtDGvCAN4R+ahGmbGwY4XFfeLlkPCE2iOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSpjC0Nr5z186q; Sat, 19 Aug 2023 19:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JJTonA035167; Sat, 19 Aug 2023 19:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JJTokk035164; Sat, 19 Aug 2023 19:29:50 GMT (envelope-from git) Date: Sat, 19 Aug 2023 19:29:50 GMT Message-Id: <202308191929.37JJTokk035164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c6dc07c6f1a8 - stable/12 - tftpd: cleanup after conflict resolution List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e commit c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e Author: Eugene Grosbein AuthorDate: 2023-08-19 19:28:49 +0000 Commit: Eugene Grosbein CommitDate: 2023-08-19 19:28:49 +0000 tftpd: cleanup after conflict resolution Fixes: a99bf9966590859d21d28ec63798820dc07e0ba8 --- libexec/tftpd/tftpd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 56b97d4791bc..ed030b23da30 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -140,7 +140,6 @@ main(int argc, char *argv[]) tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:Su:U:wW")) != -1) { ->>>>>>> 273a307d0b80 (tftpd: introduce new option -S) switch (ch) { case 'c': ipchroot = 1;