lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

gassapi: Fix check if it is enabled.

Browse Source
This commit is contained in:
Andreas Schneider
2013-07-22 10:26:42 +02:00
parent 329f4da1e1
commit da1eaea51a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auth.c
View File

@@ -289,7 +289,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok){
SSH_LOG(SSH_LOG_TRACE, SSH_LOG(SSH_LOG_TRACE,
"keyboard-interactive context, assuming SSH_USERAUTH_INFO_REQUEST"); "keyboard-interactive context, assuming SSH_USERAUTH_INFO_REQUEST");
rc=ssh_packet_userauth_info_request(session,type,packet,user); rc=ssh_packet_userauth_info_request(session,type,packet,user);
#if WITH_GSSAPI #ifdef WITH_GSSAPI
} else if (session->auth_state == SSH_AUTH_STATE_GSSAPI_REQUEST_SENT){ } else if (session->auth_state == SSH_AUTH_STATE_GSSAPI_REQUEST_SENT){
rc = ssh_packet_userauth_gssapi_response(session, type, packet, user); rc = ssh_packet_userauth_gssapi_response(session, type, packet, user);
#endif #endif
@@ -2123,7 +2123,7 @@ int ssh_userauth_kbdint_setanswer(ssh_session session, unsigned int i,
*/ */
int ssh_userauth_gssapi(ssh_session session) { int ssh_userauth_gssapi(ssh_session session) {
int rc = SSH_AUTH_DENIED; int rc = SSH_AUTH_DENIED;
#if WITH_GSSAPI #ifdef WITH_GSSAPI
switch(session->pending_call_state) { switch(session->pending_call_state) {
case SSH_PENDING_CALL_NONE: case SSH_PENDING_CALL_NONE:
break; break;

4
src/messages.c
View File

@@ -859,7 +859,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_request){
} }
goto end; goto end;
} }
#if WITH_GSSAPI #ifdef WITH_GSSAPI
if (strncmp(method, "gssapi-with-mic", method_size) == 0) { if (strncmp(method, "gssapi-with-mic", method_size) == 0) {
uint32_t n_oid; uint32_t n_oid;
ssh_string *oids; ssh_string *oids;
@@ -953,7 +953,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
ssh_message msg = NULL; ssh_message msg = NULL;
/* GSSAPI_TOKEN has same packed number. XXX fix this */ /* GSSAPI_TOKEN has same packed number. XXX fix this */
#if WITH_GSSAPI #ifdef WITH_GSSAPI
if (session->gssapi != NULL) { if (session->gssapi != NULL) {
return ssh_packet_userauth_gssapi_token(session, type, packet, user); return ssh_packet_userauth_gssapi_token(session, type, packet, user);
} }

2
src/packet.c
View File

@@ -100,7 +100,7 @@ static ssh_packet_callback default_packet_handlers[]= {
NULL, // SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE 63 NULL, // SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE 63
NULL, // SSH2_MSG_USERAUTH_GSSAPI_ERROR 64 NULL, // SSH2_MSG_USERAUTH_GSSAPI_ERROR 64
NULL, // SSH2_MSG_USERAUTH_GSSAPI_ERRTOK 65 NULL, // SSH2_MSG_USERAUTH_GSSAPI_ERRTOK 65
#if WITH_GSSAPI && WITH_SERVER #if defined(WITH_GSSAPI) && defined(WITH_SERVER)
ssh_packet_userauth_gssapi_mic, // SSH2_MSG_USERAUTH_GSSAPI_MIC 66 ssh_packet_userauth_gssapi_mic, // SSH2_MSG_USERAUTH_GSSAPI_MIC 66
#else /* WITH_GSSAPI && WITH_SERVER */ #else /* WITH_GSSAPI && WITH_SERVER */
NULL, NULL,