diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-06-23 18:01:11 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-06-23 18:01:11 +0100 |
commit | 6995497e5b66e090f25e85fbb207f033f7790199 (patch) | |
tree | 612589ffe3561d03b04f34940dccfc2778c4c15f /options-table.c | |
parent | a61200776de8218306730e2325cd29d013861e4c (diff) | |
parent | 95ed7d48c84198da0ec4b1b9b5de9358a47da753 (diff) |
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
-rw-r--r-- | options-table.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/options-table.c b/options-table.c index 9fbe85e6..0c0039fd 100644 --- a/options-table.c +++ b/options-table.c @@ -135,6 +135,13 @@ const struct options_table_entry options_table[] = { .separator = "," }, + { .name = "user-keys", + .type = OPTIONS_TABLE_ARRAY, + .scope = OPTIONS_TABLE_SERVER, + .default_str = "", + .separator = "," + }, + { .name = "assume-paste-time", .type = OPTIONS_TABLE_NUMBER, .scope = OPTIONS_TABLE_SESSION, |