named_acl: Remove systemname option from acl.conf, use asterisk.conf value

Review: https://reviewboard.asterisk.org/r/2057/

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370265 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/acl.conf.sample b/configs/acl.conf.sample
index ca6906d..b052606 100644 (file)
--- a/configs/acl.conf.sample
+++ b/configs/acl.conf.sample
@@ -11,12 +11,6 @@
 ;   acl show <name>                  Show contents of a particular named ACL
 ;   reload acl                       Reload configuration file
 ;
-;[general]
-;systemname=asterisksystem1          ; If a system name is specified, realtime
-;                                    ; ACLs will only be retrieved if they have
-;                                    ; a systemname field that matches this value.
-;                                    ; If it's less blank, the field is ignored.
-;
 ; Any configuration that uses ACLs which has been made to be able to use named
 ; ACLs will specify a named ACL with the 'acl' option in its configuration in
 ; a similar fashion to the usual 'permit' and 'deny' options. Example:

diff --git a/main/named_acl.c b/main/named_acl.c
index 5248797..cd6a8d6 100644 (file)
--- a/main/named_acl.c
+++ b/main/named_acl.c
@@ -39,13 +39,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/acl.h"
 #include "asterisk/astobj2.h"
+#include "asterisk/paths.h"
 
 #define NACL_CONFIG "acl.conf"
 #define ACL_FAMILY "acls"
 
 struct named_acl_global_config {
        AST_DECLARE_STRING_FIELDS(
-               AST_STRING_FIELD(systemname);
+               /* Nothing here yet. */
        );
 };
 
@@ -263,12 +264,8 @@ static struct named_acl *named_acl_find_realtime(const char *name)
        struct ast_ha *built_ha = NULL;
        struct named_acl *acl;
 
-       RAII_VAR(struct named_acl_config *, acl_options, ao2_global_obj_ref(globals), ao2_cleanup);
-
        /* If we have a systemname set in the global options, we only want to retrieve entries with a matching systemname field. */
-       if (acl_options) {
-               systemname = acl_options->global->systemname;
-       }
+       systemname = ast_config_AST_SYSTEM_NAME;
 
        if (ast_strlen_zero(systemname)) {
                cfg = ast_load_realtime_multientry(ACL_FAMILY, "name", name, SENTINEL);
@@ -543,9 +540,6 @@ int ast_named_acl_init()
                return 0;
        }
 
-       /* Register the global options */
-       aco_option_register(&cfg_info, "systemname", ACO_EXACT, global_options, NULL, OPT_STRINGFIELD_T, 0, STRFLDSET(struct named_acl_global_config, systemname));
-
        /* Register the per level options. */
        aco_option_register(&cfg_info, "permit", ACO_EXACT, named_acl_types, NULL, OPT_ACL_T, 1, FLDSET(struct named_acl, ha));
        aco_option_register(&cfg_info, "deny", ACO_EXACT, named_acl_types, NULL, OPT_ACL_T, 0, FLDSET(struct named_acl, ha));