diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.394 2012/10/30 21:29:55 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.395 2012/11/04 10:38:43 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1559,6 +1559,13 @@ main(int ac, char **av) | |||
1559 | if (options.challenge_response_authentication) | 1559 | if (options.challenge_response_authentication) |
1560 | options.kbd_interactive_authentication = 1; | 1560 | options.kbd_interactive_authentication = 1; |
1561 | 1561 | ||
1562 | /* Check that options are sensible */ | ||
1563 | if (options.authorized_keys_command_user == NULL && | ||
1564 | (options.authorized_keys_command != NULL && | ||
1565 | strcasecmp(options.authorized_keys_command, "none") != 0)) | ||
1566 | fatal("AuthorizedKeysCommand set without " | ||
1567 | "AuthorizedKeysCommandUser"); | ||
1568 | |||
1562 | /* set default channel AF */ | 1569 | /* set default channel AF */ |
1563 | channel_set_af(options.address_family); | 1570 | channel_set_af(options.address_family); |
1564 | 1571 | ||