From nobody Mon Aug 4 19:46:45 2025 X-Original-To: dev-commits-src-main@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 4bwnBG5nWvz63QlQ; Mon, 04 Aug 2025 19:46:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwnBG0f4Tz4KbH; Mon, 04 Aug 2025 19:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754336806; 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=KbSGemAj7CPilXt3cI++onYPUm0JQmC4XkbZKUh4qzA=; b=c6W3jyCnUQda3snVXCjV8oJ8tFUa8+gBa8LmmSHUJNYEMv3rNGpIeSgfjqHcoUlseKmQXp WFgMVrDgHj194I1b8x5ex+ZBxsE43hbXMtofpcf8SViXqwIt2CTY8n6kzUZsb1fET6FKgO NWf7fqHiKrXQ9eOvgQO8LcEsu/I5SxnZ1k+znn/fVHyvOtAbG/KvSF2Kd9a9Iz3oSs+ZFW wbmg/AV/sn7g+INF6ri49SA8TTnBNImtvy7OVWvO4JZ007CS1mtAR3CW/nP9W1Pfy2kI+K DEIc6EFvWiHANX2jCQDCdbPw0l8T5iFey+40tfM4ikqGXmPjvmxpiHzUAsTSrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754336806; 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=KbSGemAj7CPilXt3cI++onYPUm0JQmC4XkbZKUh4qzA=; b=q/qeDWGblo36DftcnB+/GhCZE962BubFJFIfvLwJehWyITd0NnEVu87gIT54RpwZOpwzUh 8EKkDdkZ4PBYTkuA57IH4W9WkYWCb9L7hY5CjmYWL5vY+o9B8/LstbK92Gx+o/faz5CEPp g8RVfw5skmUbpNRaUc7M7TOF0CxlTCnw4gGQaVnDg5TGttRuxi0trrLvuY2gU6G1rdWt79 eSRL2gMXrJPxExgbFY7J7K940Ew3DVu9HascIa9ZAElZvSaJAtfk8vuzD+JYYjKuiVlbrp FqaxJkzDCpcSSNU7v/JTeCWeweGiPwFpVI8SCMsQhveL6eU6VOlR7VfuRfbxCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754336806; a=rsa-sha256; cv=none; b=yt3QHUu6l66qkpZLsBBY3RXz04bLhzDIOKYvGBMtaUrGyNMPnL3G4KTn2f+UA9dxCFkrYJ Y8r9ajc0hnPyIkmHMCf8tfSnyDLpc1vQCXwynI+2X/ReZ2YSi4IQuE42mf2n4Rdz8HVgUN Hh7NuH7AMK/zWzkLrzNRH7QHMQTa24WcqZXNGc/4qfJ3wvdLj56XhmBPJINesJZeZUchGU SOFxN1oXICfEAQ0n22v0QVEHLFDdt24xbIpe5SogqUitkObLSCe98J1VHB6AQFEm0Z0Coc QzDl1fUm6ghseiJcZQCfDmW6+rdvbdIBl6wRuXIUwu6npR8064fHO6zcmWXA8g== 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 4bwnBG00DQz12nL; Mon, 04 Aug 2025 19:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 574JkjPB098993; Mon, 4 Aug 2025 19:46:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 574Jkj1e098990; Mon, 4 Aug 2025 19:46:45 GMT (envelope-from git) Date: Mon, 4 Aug 2025 19:46:45 GMT Message-Id: <202508041946.574Jkj1e098990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6b51ff931135 - main - ctld: Factor out a function for adding a private auth_group for a target List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b51ff931135b7a18f12305c9b22f68863fb7898 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6b51ff931135b7a18f12305c9b22f68863fb7898 commit 6b51ff931135b7a18f12305c9b22f68863fb7898 Author: John Baldwin AuthorDate: 2025-08-04 19:38:06 +0000 Commit: John Baldwin CommitDate: 2025-08-04 19:38:06 +0000 ctld: Factor out a function for adding a private auth_group for a target Sponsored by: Chelsio Communications Pull Request: https://github.com/freebsd/freebsd-src/pull/1794 --- usr.sbin/ctld/conf.cc | 67 +++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 48 deletions(-) diff --git a/usr.sbin/ctld/conf.cc b/usr.sbin/ctld/conf.cc index c9e1a2fb9968..10ce75237e35 100644 --- a/usr.sbin/ctld/conf.cc +++ b/usr.sbin/ctld/conf.cc @@ -515,13 +515,13 @@ target_finish(void) target = NULL; } -bool -target_add_chap(const char *user, const char *secret) +static bool +target_use_private_auth(const char *keyword) { if (target->t_auth_group != NULL) { if (target->t_auth_group->ag_name != NULL) { log_warnx("cannot use both auth-group and " - "chap for target \"%s\"", target->t_name); + "%s for target \"%s\"", keyword, target->t_name); return (false); } } else { @@ -529,6 +529,14 @@ target_add_chap(const char *user, const char *secret) if (target->t_auth_group == NULL) return (false); } + return (true); +} + +bool +target_add_chap(const char *user, const char *secret) +{ + if (!target_use_private_auth("chap")) + return (false); return (auth_new_chap(target->t_auth_group, user, secret)); } @@ -536,17 +544,8 @@ bool target_add_chap_mutual(const char *user, const char *secret, const char *user2, const char *secret2) { - if (target->t_auth_group != NULL) { - if (target->t_auth_group->ag_name != NULL) { - log_warnx("cannot use both auth-group and " - "chap-mutual for target \"%s\"", target->t_name); - return (false); - } - } else { - target->t_auth_group = auth_group_new(conf, target); - if (target->t_auth_group == NULL) - return (false); - } + if (!target_use_private_auth("chap-mutual")) + return (false); return (auth_new_chap_mutual(target->t_auth_group, user, secret, user2, secret2)); } @@ -554,35 +553,16 @@ target_add_chap_mutual(const char *user, const char *secret, bool target_add_initiator_name(const char *name) { - if (target->t_auth_group != NULL) { - if (target->t_auth_group->ag_name != NULL) { - log_warnx("cannot use both auth-group and " - "initiator-name for target \"%s\"", target->t_name); - return (false); - } - } else { - target->t_auth_group = auth_group_new(conf, target); - if (target->t_auth_group == NULL) - return (false); - } + if (!target_use_private_auth("initiator-name")) + return (false); return (auth_name_new(target->t_auth_group, name)); } bool target_add_initiator_portal(const char *addr) { - if (target->t_auth_group != NULL) { - if (target->t_auth_group->ag_name != NULL) { - log_warnx("cannot use both auth-group and " - "initiator-portal for target \"%s\"", - target->t_name); - return (false); - } - } else { - target->t_auth_group = auth_group_new(conf, target); - if (target->t_auth_group == NULL) - return (false); - } + if (!target_use_private_auth("initiator-portal")) + return (false); return (auth_portal_new(target->t_auth_group, addr)); } @@ -684,17 +664,8 @@ target_set_auth_group(const char *name) bool target_set_auth_type(const char *type) { - if (target->t_auth_group != NULL) { - if (target->t_auth_group->ag_name != NULL) { - log_warnx("cannot use both auth-group and " - "auth-type for target \"%s\"", target->t_name); - return (false); - } - } else { - target->t_auth_group = auth_group_new(conf, target); - if (target->t_auth_group == NULL) - return (false); - } + if (!target_use_private_auth("auth-type")) + return (false); return (_auth_group_set_type(target->t_auth_group, type)); }