automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@23981 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx.c b/pbx.c
index 183a0acda0910988de7d53054359ed67ed7155f0..7cd94e6d2d0a56a7bc99c010e81d86afbf531b25 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -1172,10 +1172,12 @@ static int handle_show_functions(int fd, int argc, char *argv[])
        int count_acf = 0;
 
        ast_cli(fd, "Installed Custom Functions:\n--------------------------------------------------------------------------------\n");
+       ast_mutex_lock(&acflock);
        for (acf = acf_root ; acf; acf = acf->next) {
                ast_cli(fd, "%-20.20s  %-35.35s  %s\n", acf->name, acf->syntax, acf->synopsis);
                count_acf++;
        }
+       ast_mutex_unlock(&acflock);
        ast_cli(fd, "%d custom functions installed.\n", count_acf);
        return 0;
 }