From nobody Sat Aug 19 06:44:59 2023 X-Original-To: dev-commits-src-all@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 4RSTkg4gmbz4qJ9J; Sat, 19 Aug 2023 06:44:59 +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 4RSTkg49nKz4Qrg; Sat, 19 Aug 2023 06:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427499; 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=oD71L/JyLiRE6Ar8hhmV1IWCNo6EUKzUAZ2M3XRYGmo=; b=rtHT33mNFF2hsHWOxK47ydTDqsL5jRMMpxY8Qp4kYbxLtH4xSgINjFdpJ1LtofJWoV/Psg zxBrzrCniktroXmYiRO9LH3MZdnUwV7n70HftuGWvXKnBu4lC+ZKFcV+82SvKZvnx6L059 /8xWTIJ0Ff5txSOxPkxPadyNYKeBKgX8SZ7jCZWXdKxGCzDDObFSrOJOtJjUp7aPDdy3aJ HC0NbA8pDBf9bXsSPa+Z5fIZ7yvY8WI61r88f6yExz9B0O8No92NnPWo8EXr1Vk0ZjIPBz XVJwrMTheiYKLk+tDNDrb0Pk80yCE2kUSUhlJKRSRdgepDJAdLP2g75IK6HRLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427499; 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=oD71L/JyLiRE6Ar8hhmV1IWCNo6EUKzUAZ2M3XRYGmo=; b=DDQkPXqbNcPiIItqZ0i35DYkm4Alo8zQ5am5QzOf+IWn6Nm3AVXBI0AojR2FpH3EEhJUWG H3q/EF5iM59zxwdrlsdr1YTk8RII8SCg5ys6rkj9ZsSWcOg0SYQKPa5LVG6L3C6z5QOJLp Kst1hQgeFdxgN42EcKR+3bFqI+omXc/tRqROsyL0dzJDe5EHofc5qYjcS0S60nbshgSrt2 zpNQH2UpZNInxWE/7SybE74ofUoCVjkwU1nf63irz/qoTN+CuykrLT0AIUQOqPWrBV6Cky WbQBVHkGBMfPPeeDA4/WVQCHM57fjbpSix/tmIZUbBk2dBgxvHa2G9t9IIBq7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692427499; a=rsa-sha256; cv=none; b=cPppeiVyzWHOh3z7ReDuaKZ6Bjq8fPVSdbu7H9W1V/O5bBxN6pATQ2R4afv+whqaU7s0iz EE/sshwVWiZUGpvGvimypETg/Cc/+enC+rWzmIP4R6Ga0QnWYOfJzH4lJw/Xe4HL3PblLS cHSDAVg39kz/g+3a4K3yYWlBROy5sEEr1t18PjbovSua0FCGECFNqlf4F1eRbFpQloMF6U GpWa0dBA+7yoopB+gW0i8Dhut3ph7tYnd5T75L79xSnfghZtNQ0Fp4eHX287naFlfUB0Xy vZHO6ty8uqpe1P2MpJj9KE1qardiYHIp5u8fRFXSZr+B192tikNp3u509sPajQ== 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 4RSTkg31QgznnF; Sat, 19 Aug 2023 06:44:59 +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 37J6ixPn068375; Sat, 19 Aug 2023 06:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J6ixSK068372; Sat, 19 Aug 2023 06:44:59 GMT (envelope-from git) Date: Sat, 19 Aug 2023 06:44:59 GMT Message-Id: <202308190644.37J6ixSK068372@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: 9397112d89df - stable/13 - tftpd: fix wrong conflict resolution List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 9397112d89df25a9e1ab8d84e8fc88fe789e1324 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=9397112d89df25a9e1ab8d84e8fc88fe789e1324 commit 9397112d89df25a9e1ab8d84e8fc88fe789e1324 Author: Eugene Grosbein AuthorDate: 2023-08-19 06:43:08 +0000 Commit: Eugene Grosbein CommitDate: 2023-08-19 06:43:08 +0000 tftpd: fix wrong conflict resolution This is direct commit to stable/13 after wrong previous one. Fixes: b71dde1aeba2972522a6742bbae77c2c6497eb01 --- libexec/tftpd/tftpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 3b08fab33dca..ed030b23da30 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -139,7 +139,7 @@ main(int argc, char *argv[]) acting_as_client = 0; tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP); - while ((ch = getopt(argc, argv, "cCd::F:lnoOp:s:Su:U:wW")) != -1) { + while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:Su:U:wW")) != -1) { switch (ch) { case 'c': ipchroot = 1;