diff options
author | Steve Holme <steve_holme@hotmail.com> | 2016-04-08 18:59:33 +0100 |
---|---|---|
committer | Steve Holme <steve_holme@hotmail.com> | 2016-04-08 18:59:33 +0100 |
commit | 9d89a038729b6b393784bea54cc90fd635fe2885 (patch) | |
tree | 4ddaf00a4ce990f141e813f44eaab11c7cb94e27 /lib/krb5.c | |
parent | 39d68b47e19c9dc42d578a923cb842f061eac165 (diff) | |
download | curl-9d89a038729b6b393784bea54cc90fd635fe2885.tar.gz |
ftp/imap/pop3/smtp: Allow the service name to be overridden
Allow the service name to be overridden for DIGIST-MD5 and Kerberos 5
authentication in FTP, IMAP, POP3 and SMTP.
Diffstat (limited to 'lib/krb5.c')
-rw-r--r-- | lib/krb5.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/krb5.c b/lib/krb5.c index 65869c99d..992da5456 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -152,7 +152,10 @@ krb5_auth(void *app_data, struct connectdata *conn) curl_socklen_t l = sizeof(conn->local_addr); struct SessionHandle *data = conn->data; CURLcode result; - const char *service = "ftp", *srv_host = "host"; + const char *service = data->set.str[STRING_SERVICE_NAME] ? + data->set.str[STRING_SERVICE_NAME] : + "ftp"; + const char *srv_host = "host"; gss_buffer_desc input_buffer, output_buffer, _gssresp, *gssresp; OM_uint32 maj, min; gss_name_t gssname; @@ -180,9 +183,9 @@ krb5_auth(void *app_data, struct connectdata *conn) /* this really shouldn't be repeated here, but can't help it */ if(service == srv_host) { result = Curl_ftpsendf(conn, "AUTH GSSAPI"); - if(result) return -2; + if(Curl_GetFTPResponse(&nread, conn, NULL)) return -1; |