From 94e7ad44aff5d77dacad2f0f51b1e24c68ae4d32 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 23 Apr 2008 21:14:41 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8184 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_sofia/sofia_reg.c | 2 +- src/switch_console.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c index b6e1452a53..ff667b3ec5 100644 --- a/src/mod/endpoints/mod_sofia/sofia_reg.c +++ b/src/mod/endpoints/mod_sofia/sofia_reg.c @@ -344,7 +344,7 @@ void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t sql = switch_mprintf("insert into sip_authentication (nonce, expires) values('%q', %ld)", uuid_str, switch_timestamp(NULL) + profile->nonce_ttl); switch_assert(sql != NULL); - sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); //sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); diff --git a/src/switch_console.c b/src/switch_console.c index dcdadf4dd3..11f52518be 100644 --- a/src/switch_console.c +++ b/src/switch_console.c @@ -169,7 +169,7 @@ char *expand_alias(char *cmd, char *arg) char *exp = NULL; switch_core_db_t *db = switch_core_db_handle(); - sql = switch_mprintf("select command from aliases where alias='%s'", cmd); + sql = switch_mprintf("select command from aliases where alias='%q' or alias='%q %q'", cmd, cmd, arg); switch_core_db_exec(db, sql, alias_callback, &r, &errmsg); if (errmsg) {