Ignore:
Timestamp:
2016-11-20T08:40:36Z (8 years ago)
Author:
dequis <dx@…>
Children:
3f44e43
Parents:
ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge master up to commit '9f03c47' into parson

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/account.c

    rba52ac5 r537d9b9  
    6363
    6464        s = set_add(&a->set, "password", NULL, set_eval_account, a);
    65         s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
     65        s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD | ACC_SET_LOCKABLE;
    6666
    6767        s = set_add(&a->set, "tag", NULL, set_eval_account, a);
     
    6969
    7070        s = set_add(&a->set, "username", NULL, set_eval_account, a);
    71         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
     71        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | ACC_SET_LOCKABLE;
    7272        set_setstr(&a->set, "username", user);
    7373
Note: See TracChangeset for help on using the changeset viewer.