Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-07-20 18:01:10 +01:00
6 changed files with 124 additions and 9 deletions

View File

@@ -82,6 +82,11 @@ const struct options_table_entry server_options_table[] = {
.default_num = 0
},
{ .name = "history-file",
.type = OPTIONS_TABLE_STRING,
.default_str = NULL
},
{ .name = "message-limit",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 0,