summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-02 22:58:22 +1000
committerDamien Miller <djm@mindrot.org>2003-09-02 22:58:22 +1000
commitfb10e9abe83d4d0b9ec36ee90587270d5bdc0cfd (patch)
treedea97440da976e91586281b2876a1fec27131e69 /servconf.c
parent46aa3b91398a18dc6865e801167a2a77ec9f402e (diff)
- markus@cvs.openbsd.org 2003/09/01 18:15:50
[readconf.c readconf.h servconf.c servconf.h ssh.c] remove unused kerberos code; ok henning@
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/servconf.c b/servconf.c
index 6051918c2..71e28b3cb 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.126 2003/08/28 12:54:34 markus Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.127 2003/09/01 18:15:50 markus Exp $");
14 14
15#include "ssh.h" 15#include "ssh.h"
16#include "log.h" 16#include "log.h"
@@ -72,7 +72,6 @@ initialize_server_options(ServerOptions *options)
72 options->kerberos_authentication = -1; 72 options->kerberos_authentication = -1;
73 options->kerberos_or_local_passwd = -1; 73 options->kerberos_or_local_passwd = -1;
74 options->kerberos_ticket_cleanup = -1; 74 options->kerberos_ticket_cleanup = -1;
75 options->kerberos_tgt_passing = -1;
76 options->gss_authentication=-1; 75 options->gss_authentication=-1;
77 options->gss_cleanup_creds = -1; 76 options->gss_cleanup_creds = -1;
78 options->password_authentication = -1; 77 options->password_authentication = -1;
@@ -182,8 +181,6 @@ fill_default_server_options(ServerOptions *options)
182 options->kerberos_or_local_passwd = 1; 181 options->kerberos_or_local_passwd = 1;
183 if (options->kerberos_ticket_cleanup == -1) 182 if (options->kerberos_ticket_cleanup == -1)
184 options->kerberos_ticket_cleanup = 1; 183 options->kerberos_ticket_cleanup = 1;
185 if (options->kerberos_tgt_passing == -1)
186 options->kerberos_tgt_passing = 0;
187 if (options->gss_authentication == -1) 184 if (options->gss_authentication == -1)
188 options->gss_authentication = 0; 185 options->gss_authentication = 0;
189 if (options->gss_cleanup_creds == -1) 186 if (options->gss_cleanup_creds == -1)
@@ -632,10 +629,6 @@ parse_flag:
632 intptr = &options->kerberos_ticket_cleanup; 629 intptr = &options->kerberos_ticket_cleanup;
633 goto parse_flag; 630 goto parse_flag;
634 631
635 case sKerberosTgtPassing:
636 intptr = &options->kerberos_tgt_passing;
637 goto parse_flag;
638
639 case sGssAuthentication: 632 case sGssAuthentication:
640 intptr = &options->gss_authentication; 633 intptr = &options->gss_authentication;
641 goto parse_flag; 634 goto parse_flag;