aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-07-22 10:26:42 +0200
committerAndreas Schneider <asn@cryptomilk.org>2013-07-22 10:42:30 +0200
commitda1eaea51a83552f129425bd7b6e4c98aedd9564 (patch)
tree0b3085e6f1a505271325462a306fb02504bda091
parent329f4da1e19adfe53a835116d4a45217b746a82e (diff)
downloadlibssh-da1eaea51a83552f129425bd7b6e4c98aedd9564.tar.gz
libssh-da1eaea51a83552f129425bd7b6e4c98aedd9564.tar.xz
libssh-da1eaea51a83552f129425bd7b6e4c98aedd9564.zip
gassapi: Fix check if it is enabled.
-rw-r--r--src/auth.c4
-rw-r--r--src/messages.c4
-rw-r--r--src/packet.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/auth.c b/src/auth.c
index c48546d5..39d50be7 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -289,7 +289,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok){
SSH_LOG(SSH_LOG_TRACE,
"keyboard-interactive context, assuming SSH_USERAUTH_INFO_REQUEST");
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){
rc = ssh_packet_userauth_gssapi_response(session, type, packet, user);
#endif
@@ -2123,7 +2123,7 @@ int ssh_userauth_kbdint_setanswer(ssh_session session, unsigned int i,
*/
int ssh_userauth_gssapi(ssh_session session) {
int rc = SSH_AUTH_DENIED;
-#if WITH_GSSAPI
+#ifdef WITH_GSSAPI
switch(session->pending_call_state) {
case SSH_PENDING_CALL_NONE:
break;
diff --git a/src/messages.c b/src/messages.c
index cb38bc6a..003ecf8e 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -859,7 +859,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_request){
}
goto end;
}
-#if WITH_GSSAPI
+#ifdef WITH_GSSAPI
if (strncmp(method, "gssapi-with-mic", method_size) == 0) {
uint32_t n_oid;
ssh_string *oids;
@@ -953,7 +953,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
ssh_message msg = NULL;
/* GSSAPI_TOKEN has same packed number. XXX fix this */
-#if WITH_GSSAPI
+#ifdef WITH_GSSAPI
if (session->gssapi != NULL) {
return ssh_packet_userauth_gssapi_token(session, type, packet, user);
}
diff --git a/src/packet.c b/src/packet.c
index c4b4a9a1..3302847a 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -100,7 +100,7 @@ static ssh_packet_callback default_packet_handlers[]= {
NULL, // SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE 63
NULL, // SSH2_MSG_USERAUTH_GSSAPI_ERROR 64
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
#else /* WITH_GSSAPI && WITH_SERVER */
NULL,