git: 9397112d89df - stable/13 - tftpd: fix wrong conflict resolution
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 19 Aug 2023 06:44:59 UTC
The branch stable/13 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=9397112d89df25a9e1ab8d84e8fc88fe789e1324
commit 9397112d89df25a9e1ab8d84e8fc88fe789e1324
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-08-19 06:43:08 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
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;