nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-06 22:12:47 -05:00
Code Issues Projects Releases Wiki Activity

Fix compilation with NO_GSSAPI.

Browse Source 
This is a fairly shallow patch, which removes the UI and interactions
with external libraries. Some other machinery (which is dead code in
this configuration) is left in place.

Adapted by me from a patch by Jeroen Roovers.
This commit is contained in:
Jacob Nevins
2019-03-25 23:46:59 +00:00
parent fe408562fa
commit 7ad08649a2
6 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ssh.c
View File

@ -50,7 +50,9 @@ struct Ssh {
ssh_sharing_state *connshare;
bool attempting_connshare;
#ifndef NO_GSSAPI
struct ssh_connection_shared_gss_state gss_state;
#endif
char *savedhost;
int savedport;
@ -252,10 +254,18 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
conf_get_bool(ssh->conf, CONF_tryagent), username,
conf_get_bool(ssh->conf, CONF_change_username),
conf_get_bool(ssh->conf, CONF_try_ki_auth),
#ifndef NO_GSSAPI
conf_get_bool(ssh->conf, CONF_try_gssapi_auth),
conf_get_bool(ssh->conf, CONF_try_gssapi_kex),
conf_get_bool(ssh->conf, CONF_gssapifwd),
&ssh->gss_state);
&ssh->gss_state
#else
false,
false,
false,
NULL
#endif
);
ssh_connect_ppl(ssh, userauth_layer);
transport_child_layer = userauth_layer;
@ -267,7 +277,11 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
ssh->fullhostname,
ssh_verstring_get_local(old_bpp),
ssh_verstring_get_remote(old_bpp),
#ifndef NO_GSSAPI
&ssh->gss_state,
#else
NULL,
#endif
&ssh->stats, transport_child_layer, false);
ssh_connect_ppl(ssh, ssh->base_layer);