Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Feb 2022 19:07:54 GMT
From:      Ryan Stone <rstone@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: e88dbe4f4672 - stable/13 - MFC 315bca194a14:
Message-ID:  <202202251907.21PJ7sps060812@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by rstone:

URL: https://cgit.FreeBSD.org/src/commit/?id=e88dbe4f46721f8524de274a0f1e40a0fe6fe4f4

commit e88dbe4f46721f8524de274a0f1e40a0fe6fe4f4
Author:     Ryan Stone <rstone@FreeBSD.org>
AuthorDate: 2021-07-07 20:04:10 +0000
Commit:     Ryan Stone <rstone@FreeBSD.org>
CommitDate: 2022-02-25 19:06:46 +0000

    MFC 315bca194a14:
    
    Fix an early return in ctld UCL parser
    
    If the UCL ctld parser encountered a port that used the CTL
    ioctl device, it fell into a special case that had an erroneous
    early return.  This caused all configuration in the target
    following the port attribute to be skipped.  Fix this by replacing
    the return with a continue so that the rest of the config is
    parsed correctly.
    
    Sponsored by: Dell EMC Isilon
    MFC after: 2 weeks
    Differential Revision: https://reviews.freebsd.org/D31703
    Reviewed by: bapt
    
    (cherry picked from commit 315bca194a14f3b9ec683675bafa8d990d16bfaf)
---
 usr.sbin/ctld/uclparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c
index b73e6b48b2f6..d02530d1b808 100644
--- a/usr.sbin/ctld/uclparse.c
+++ b/usr.sbin/ctld/uclparse.c
@@ -847,7 +847,7 @@ uclparse_target(const char *name, const ucl_object_t *top)
 					return (1);
 				}
 
-				return (0);
+				continue;
 			}
 
 			pp = pport_find(conf, value);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202251907.21PJ7sps060812>