[Asterisk-code-review] acl: Update logger message to match 15+. (asterisk[13])

Joshua Colp asteriskteam at digium.com
Mon Nov 20 16:48:16 CST 2017


Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/7238 )

Change subject: acl: Update logger message to match 15+.
......................................................................

acl: Update logger message to match 15+.

This patch causes a logger message to be the same as it is in 15+.  This
will allow a follow-up patch to be cherry-picked to all 3 branches.

Change-Id: Ic0665a3d49987e4eb6df28dcd9e90b1c3ca191e0
---
M main/acl.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/main/acl.c b/main/acl.c
index 94a242a..d4b3089 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -479,7 +479,7 @@
 		AST_LIST_TRAVERSE(working_list, current, list) {
 			if (!strcasecmp(current->name, tmp)) { /* ACL= */
 				/* Inclusion of the same ACL multiple times isn't a catastrophic error, but it will raise the error flag and skip the entry. */
-				ast_log(LOG_ERROR, "Named ACL '%s' is already included in the ast_acl container.", tmp);
+				ast_log(LOG_ERROR, "Named ACL '%s' occurs multiple times in ACL definition. Please update your ACL configuration.", tmp);
 				if (error) {
 					*error = 1;
 				}

-- 
To view, visit https://gerrit.asterisk.org/7238
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0665a3d49987e4eb6df28dcd9e90b1c3ca191e0
Gerrit-Change-Number: 7238
Gerrit-PatchSet: 3
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171120/7862ae67/attachment-0001.html>


More information about the asterisk-code-review mailing list