View | Details | Raw Unified | Return to bug 1416 | Differences between
and this patch

Collapse All | Expand All

(-)../openssh-4.7p1.orig/readconf.c (+9 lines)
Lines 1113-1122 Link Here
1113 
		options->pubkey_authentication = 1;
 1113 
		options->pubkey_authentication = 1;
1114 
	if (options->challenge_response_authentication == -1)
 1114 
	if (options->challenge_response_authentication == -1)
1115 
		options->challenge_response_authentication = 1;
 1115 
		options->challenge_response_authentication = 1;
1116 
#ifdef __APPLE_GSSAPI_ENABLE__
1117 
	if (options->gss_authentication == -1)
1118 
		options->gss_authentication = 1;
1119 
	if (options->gss_keyex == -1)
1120 
		options->gss_keyex = 1;
1121 
#else
1116 
	if (options->gss_authentication == -1)
 1122 
	if (options->gss_authentication == -1)
1117 
		options->gss_authentication = 0;
 1123 
		options->gss_authentication = 0;
1118 
	if (options->gss_keyex == -1)
 1124 
	if (options->gss_keyex == -1)
1119 
		options->gss_keyex = 0;
 1125 
		options->gss_keyex = 0;
1126 
#endif
1127 
	if (options->gss_keyex == -1)
1128 
		options->gss_keyex = 0;
1120 
	if (options->gss_deleg_creds == -1)
 1129 
	if (options->gss_deleg_creds == -1)
1121 
		options->gss_deleg_creds = 0;
 1130 
		options->gss_deleg_creds = 0;
1122 
	if (options->gss_trust_dns == -1)
 1131 
	if (options->gss_trust_dns == -1)
(-)../openssh-4.7p1.orig/servconf.c (+9 lines)
Lines 204-213 Link Here
204 
		options->kerberos_ticket_cleanup = 1;
 204 
		options->kerberos_ticket_cleanup = 1;
205 
	if (options->kerberos_get_afs_token == -1)
 205 
	if (options->kerberos_get_afs_token == -1)
206 
		options->kerberos_get_afs_token = 0;
 206 
		options->kerberos_get_afs_token = 0;
207 
#ifdef __APPLE_GSSAPI_ENABLE__
208 
	if (options->gss_authentication == -1)
209 
		options->gss_authentication = 1;
210 
	if (options->gss_keyex == -1)
211 
		options->gss_keyex = 1;
212 
#else
207 
	if (options->gss_authentication == -1)
 213 
	if (options->gss_authentication == -1)
208 
		options->gss_authentication = 0;
 214 
		options->gss_authentication = 0;
209 
	if (options->gss_keyex == -1)
 215 
	if (options->gss_keyex == -1)
210 
		options->gss_keyex = 0;
 216 
		options->gss_keyex = 0;
217 
#endif
218 
	if (options->gss_keyex == -1)
219 
		options->gss_keyex = 0;
211 
	if (options->gss_cleanup_creds == -1)
 220 
	if (options->gss_cleanup_creds == -1)
212 
		options->gss_cleanup_creds = 1;
 221 
		options->gss_cleanup_creds = 1;
213 
	if (options->gss_strict_acceptor == -1)
 222 
	if (options->gss_strict_acceptor == -1)

Return to bug 1416