diff options
Diffstat (limited to 'src/command/commands.c')
| -rw-r--r-- | src/command/commands.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index 0c93143a..eed22ed5 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -340,13 +340,21 @@ cmd_account(gchar **args, struct cmd_help_t help) cons_show("Updated resource for account %s: %s", account_name, value); cons_show(""); } else if (strcmp(property, "password") == 0) { - accounts_set_password(account_name, value); - cons_show("Updated password for account %s", account_name); - cons_show(""); + if(accounts_get_account(account_name)->eval_password != NULL) { + cons_show("Cannot set password when eval_password is set."); + } else { + accounts_set_password(account_name, value); + cons_show("Updated password for account %s", account_name); + cons_show(""); + } } else if (strcmp(property, "eval_password") == 0) { - accounts_set_eval_password(account_name, value); - cons_show("Updated eval_password for account %s", account_name); - cons_show(""); + if(accounts_get_account(account_name)->password != NULL) { + cons_show("Cannot set eval_password when password is set."); + } else { + accounts_set_eval_password(account_name, value); + cons_show("Updated eval_password for account %s", account_name); + cons_show(""); + } } else if (strcmp(property, "muc") == 0) { accounts_set_muc_service(account_name, value); cons_show("Updated muc service for account %s: %s", account_name, value); @@ -431,6 +439,10 @@ cmd_account(gchar **args, struct cmd_help_t help) accounts_clear_password(account_name); cons_show("Removed password for account %s", account_name); cons_show(""); + } else if (strcmp(property, "eval_password") == 0) { + accounts_clear_password(account_name); + cons_show("Removed password for account %s", account_name); + cons_show(""); } else if (strcmp(property, "server") == 0) { accounts_clear_server(account_name); cons_show("Removed server for account %s", account_name); |