diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-18 02:00:34 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-18 02:00:34 +0000 |
| commit | 79caed98062c0c29c1f6bb8f31e2b22f51f1fca7 (patch) | |
| tree | 7006f57f2b20e67260ab6427fd3a3035d56ee922 /asterisk.c | |
| parent | e9ff0e580aaeb8799ff153fea6b76cdf1f5df343 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8172 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
| -rw-r--r-- | asterisk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asterisk.c b/asterisk.c index 2bfbf452a..2d17fad51 100644 --- a/asterisk.c +++ b/asterisk.c @@ -127,7 +127,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /*! \brief Welcome message when starting a CLI interface */ #define WELCOME_MESSAGE \ - ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2005 Digium, Inc. and others.\n"); \ + ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n"); \ ast_verbose("Created by Mark Spencer <markster@digium.com>\n"); \ ast_verbose("Asterisk comes with ABSOLUTELY NO WARRANTY; type 'show warranty' for details.\n"); \ ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \ @@ -2138,6 +2138,10 @@ int main(int argc, char *argv[]) } } + if (option_console && !option_verbose) + ast_verbose("[ Reading Master Configuration ]"); + ast_readconfig(); + if (option_dumpcore) { struct rlimit l; memset(&l, 0, sizeof(l)); @@ -2148,10 +2152,6 @@ int main(int argc, char *argv[]) } } - if (option_console && !option_verbose) - ast_verbose("[ Reading Master Configuration ]"); - ast_readconfig(); - if ((!rungroup) && !ast_strlen_zero(ast_config_AST_RUN_GROUP)) rungroup = ast_config_AST_RUN_GROUP; if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER)) |