# HG changeset patch # User Stu Tomlinson # Date 1208968564 0 # Node ID 3d092dd95ec18b797ef10efcdcea12ba5953c7ee # Parent 9a810bee2ffda09a08dfd3093fd23091543cb60b Fix for changing silc private key passphrase to or from the empty string, preventing silc toolkit library trying to read from stdin (!) diff -r 9a810bee2ffd -r 3d092dd95ec1 libpurple/protocols/silc/silc.c --- a/libpurple/protocols/silc/silc.c Wed Apr 23 15:00:03 2008 +0000 +++ b/libpurple/protocols/silc/silc.c Wed Apr 23 16:36:04 2008 +0000 @@ -1192,11 +1192,11 @@ static void silcpurple_change_passwd(PurpleConnection *gc, const char *old, const char *new) { - char prd[256]; + char prd[256]; g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.pub", silcpurple_silcdir()); silc_change_private_key_passphrase(purple_account_get_string(gc->account, "private-key", - prd), old, new); + prd), old ? old : "", new ? new : ""); } static void diff -r 9a810bee2ffd -r 3d092dd95ec1 libpurple/protocols/silc10/silc.c --- a/libpurple/protocols/silc10/silc.c Wed Apr 23 15:00:03 2008 +0000 +++ b/libpurple/protocols/silc10/silc.c Wed Apr 23 16:36:04 2008 +0000 @@ -962,11 +962,11 @@ static void silcpurple_change_passwd(PurpleConnection *gc, const char *old, const char *new) { - char prd[256]; + char prd[256]; g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.pub", silcpurple_silcdir()); silc_change_private_key_passphrase(purple_account_get_string(gc->account, "private-key", - prd), old, new); + prd), old ? old : "", new ? new : ""); } static void