Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-08-28 14:01:11 +01:00
16 changed files with 118 additions and 129 deletions

View File

@@ -205,11 +205,6 @@ const struct options_table_entry session_options_table[] = {
.default_str = "lock -np"
},
{ .name = "lock-server",
.type = OPTIONS_TABLE_FLAG,
.default_num = 1
},
{ .name = "message-attr",
.type = OPTIONS_TABLE_ATTRIBUTES,
.default_num = 0,