summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2005-12-04 20:40:46 +0000
committerRussell Bryant <russell@russellbryant.com>2005-12-04 20:40:46 +0000
commitec05153ac4e80313e89a0326bfefe17a4ae21f9c (patch)
tree6f52bce69ee88362d0b801e94372ecc39c5091d2 /res
parentb6b32ebd9148b30dd2c3899237a6bb3ca3bd7c1a (diff)
convert most of the option_*'s to a single ast_flags structure. Also, fix some
formatting, remove some unnecessary casts, and other little code cleanups. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_crypto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_crypto.c b/res/res_crypto.c
index 037ff8e79..3ada0d224 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -268,7 +268,7 @@ static struct ast_key *try_load_key (char *dir, char *fname, int ifd, int ofd, i
ast_log(LOG_NOTICE, "Key '%s' needs passcode.\n", key->name);
key->ktype |= KEY_NEEDS_PASSCODE;
if (!notice) {
- if (!option_initcrypto)
+ if (!ast_opt_init_keys)
ast_log(LOG_NOTICE, "Add the '-i' flag to the asterisk command line if you want to automatically initialize passcodes at launch.\n");
notice++;
}
@@ -592,7 +592,7 @@ int reload(void)
int load_module(void)
{
crypto_init();
- if (option_initcrypto)
+ if (ast_opt_init_keys)
crypto_load(STDIN_FILENO, STDOUT_FILENO);
else
crypto_load(-1, -1);