summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/readconf.c b/readconf.c
index d7ef58936..13987ffa7 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.120 2003/09/01 12:50:46 markus Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.121 2003/09/01 18:15:50 markus Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -92,7 +92,6 @@ typedef enum {
92 oForwardAgent, oForwardX11, oGatewayPorts, 92 oForwardAgent, oForwardX11, oGatewayPorts,
93 oPasswordAuthentication, oRSAAuthentication, 93 oPasswordAuthentication, oRSAAuthentication,
94 oChallengeResponseAuthentication, oXAuthLocation, 94 oChallengeResponseAuthentication, oXAuthLocation,
95 oKerberosAuthentication, oKerberosTgtPassing,
96 oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward, 95 oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
97 oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand, 96 oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
98 oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, 97 oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
@@ -383,14 +382,6 @@ parse_flag:
383 intptr = &options->challenge_response_authentication; 382 intptr = &options->challenge_response_authentication;
384 goto parse_flag; 383 goto parse_flag;
385 384
386 case oKerberosAuthentication:
387 intptr = &options->kerberos_authentication;
388 goto parse_flag;
389
390 case oKerberosTgtPassing:
391 intptr = &options->kerberos_tgt_passing;
392 goto parse_flag;
393
394 case oGssAuthentication: 385 case oGssAuthentication:
395 intptr = &options->gss_authentication; 386 intptr = &options->gss_authentication;
396 goto parse_flag; 387 goto parse_flag;
@@ -821,8 +812,6 @@ initialize_options(Options * options)
821 options->rsa_authentication = -1; 812 options->rsa_authentication = -1;
822 options->pubkey_authentication = -1; 813 options->pubkey_authentication = -1;
823 options->challenge_response_authentication = -1; 814 options->challenge_response_authentication = -1;
824 options->kerberos_authentication = -1;
825 options->kerberos_tgt_passing = -1;
826 options->gss_authentication = -1; 815 options->gss_authentication = -1;
827 options->gss_deleg_creds = -1; 816 options->gss_deleg_creds = -1;
828 options->password_authentication = -1; 817 options->password_authentication = -1;
@@ -895,10 +884,6 @@ fill_default_options(Options * options)
895 options->pubkey_authentication = 1; 884 options->pubkey_authentication = 1;
896 if (options->challenge_response_authentication == -1) 885 if (options->challenge_response_authentication == -1)
897 options->challenge_response_authentication = 1; 886 options->challenge_response_authentication = 1;
898 if (options->kerberos_authentication == -1)
899 options->kerberos_authentication = 1;
900 if (options->kerberos_tgt_passing == -1)
901 options->kerberos_tgt_passing = 1;
902 if (options->gss_authentication == -1) 887 if (options->gss_authentication == -1)
903 options->gss_authentication = 1; 888 options->gss_authentication = 1;
904 if (options->gss_deleg_creds == -1) 889 if (options->gss_deleg_creds == -1)