summaryrefslogtreecommitdiff
path: root/lib/krb5.c
diff options
context:
space:
mode:
authorJulien Chaffraix <julien.chaffraix@gmail.com>2011-06-10 08:16:06 -0700
committerJulien Chaffraix <julien.chaffraix@gmail.com>2011-07-12 07:06:25 -0700
commit20485a48858ea35351ca69060f56353eace0521c (patch)
tree72331e802c6a61e7b768479af7e94887fd0c11c0 /lib/krb5.c
parent6488e03f4421a039d0882561e8f96b2ae16ed7c4 (diff)
downloadcurl-20485a48858ea35351ca69060f56353eace0521c.tar.gz
Added Curl_gss_init_sec_context.
This function wraps our calls to gss_init_sec_context so that we have a unified way to talk to GSSAPI.
Diffstat (limited to 'lib/krb5.c')
-rw-r--r--lib/krb5.c39
1 files changed, 14 insertions, 25 deletions
diff --git a/lib/krb5.c b/lib/krb5.c
index 0233b9373..9b67524d2 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -47,21 +47,10 @@
#endif
#include <string.h>
-#ifdef HAVE_GSSGNU
-# include <gss.h>
-#elif defined HAVE_GSSMIT
- /* MIT style */
-# include <gssapi/gssapi.h>
-# include <gssapi/gssapi_generic.h>
-# include <gssapi/gssapi_krb5.h>
-#else
- /* Heimdal-style */
-# include <gssapi.h>
-#endif
-
#include "urldata.h"
#include "curl_base64.h"
#include "ftp.h"
+#include "gssapi.h"
#include "sendf.h"
#include "krb4.h"
#include "curl_memory.h"
@@ -242,19 +231,19 @@ krb5_auth(void *app_data, struct connectdata *conn)
taken care by a final gss_release_buffer. */
gss_release_buffer(&min, &output_buffer);
ret = AUTH_OK;
- maj = gss_init_sec_context(&min,
- GSS_C_NO_CREDENTIAL,
- context,
- gssname,
- GSS_C_NO_OID,
- GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG,
- 0,
- &chan,
- gssresp,
- NULL,
- &output_buffer,
- NULL,
- NULL);
+ maj = Curl_gss_init_sec_context(&min,
+ GSS_C_NO_CREDENTIAL,
+ context,
+ gssname,
+ GSS_C_NO_OID,
+ GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG,
+ 0,
+ &chan,
+ gssresp,
+ NULL,
+ &output_buffer,
+ NULL,
+ NULL);
if(gssresp) {
free(_gssresp.value);