diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | servconf.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 28d579080..357eefbb0 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -138,7 +138,7 @@ openssh (1:5.1p1-1) UNRELEASED; urgency=low | |||
138 | + ssh(1) now reports multiplexing errors via the multiplex slave's | 138 | + ssh(1) now reports multiplexing errors via the multiplex slave's |
139 | stderr where possible (subject to LogLevel in the mux master). | 139 | stderr where possible (subject to LogLevel in the mux master). |
140 | + Prevent sshd(8) from erroneously applying public key restrictions | 140 | + Prevent sshd(8) from erroneously applying public key restrictions |
141 | leaned from ~/.ssh/authorized_keys to other authentication methods | 141 | gleaned from ~/.ssh/authorized_keys to other authentication methods |
142 | when public key authentication subsequently fails (LP: #161047). | 142 | when public key authentication subsequently fails (LP: #161047). |
143 | + Fixed an UMAC alignment problem that manifested on Itanium | 143 | + Fixed an UMAC alignment problem that manifested on Itanium |
144 | platforms. | 144 | platforms. |
diff --git a/servconf.c b/servconf.c index 6760401ff..66ce39026 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1599,7 +1599,9 @@ dump_config(ServerOptions *o) | |||
1599 | dump_cfg_fmtint(sKerberosTicketCleanup, o->kerberos_ticket_cleanup); | 1599 | dump_cfg_fmtint(sKerberosTicketCleanup, o->kerberos_ticket_cleanup); |
1600 | dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token); | 1600 | dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token); |
1601 | dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); | 1601 | dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); |
1602 | dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); | ||
1602 | dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); | 1603 | dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); |
1604 | dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); | ||
1603 | dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication); | 1605 | dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication); |
1604 | dump_cfg_fmtint(sKbdInteractiveAuthentication, | 1606 | dump_cfg_fmtint(sKbdInteractiveAuthentication, |
1605 | o->kbd_interactive_authentication); | 1607 | o->kbd_interactive_authentication); |
@@ -1611,6 +1613,7 @@ dump_config(ServerOptions *o) | |||
1611 | dump_cfg_fmtint(sX11UseLocalhost, o->x11_use_localhost); | 1613 | dump_cfg_fmtint(sX11UseLocalhost, o->x11_use_localhost); |
1612 | dump_cfg_fmtint(sStrictModes, o->strict_modes); | 1614 | dump_cfg_fmtint(sStrictModes, o->strict_modes); |
1613 | dump_cfg_fmtint(sTCPKeepAlive, o->tcp_keep_alive); | 1615 | dump_cfg_fmtint(sTCPKeepAlive, o->tcp_keep_alive); |
1616 | dump_cfg_fmtint(sPermitBlacklistedKeys, o->permit_blacklisted_keys); | ||
1614 | dump_cfg_fmtint(sEmptyPasswd, o->permit_empty_passwd); | 1617 | dump_cfg_fmtint(sEmptyPasswd, o->permit_empty_passwd); |
1615 | dump_cfg_fmtint(sPermitUserEnvironment, o->permit_user_env); | 1618 | dump_cfg_fmtint(sPermitUserEnvironment, o->permit_user_env); |
1616 | dump_cfg_fmtint(sUseLogin, o->use_login); | 1619 | dump_cfg_fmtint(sUseLogin, o->use_login); |