← Back to branch summary

~ubuntu-branches/ubuntu/lucid/curl/lucid-201010031940

« back to all changes in this revision

Viewing changes to lib/http_negotiate.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-04-29 11:10:29 UTC
  • mfrom: (3.2.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090429111029-2j5eiyokfw2bw049
Tags: 7.19.4-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop build dependencies: stunnel, libdb4.6-dev, libssh2-1-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Call automake-1.9 with --add-missing --copy --force
* drop debian/patches/security_CVE-2009-0037.patch 
  - this patch is part of 7.19.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/http_negotiate.c
18
18
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19
19
 * KIND, either express or implied.
20
20
 *
21
 
 * $Id: http_negotiate.c,v 1.29 2008-05-26 03:10:34 yangtse Exp $
 
21
 * $Id: http_negotiate.c,v 1.33 2008-10-23 11:49:19 bagder Exp $
22
22
 ***************************************************************************/
23
23
#include "setup.h"
24
24
 
37
37
 
38
38
#include "urldata.h"
39
39
#include "sendf.h"
40
 
#include "strequal.h"
41
 
#include "base64.h"
 
40
#include "rawstr.h"
 
41
#include "curl_base64.h"
42
42
#include "http_negotiate.h"
43
43
#include "memory.h"
44
44
 
45
45
#ifdef HAVE_SPNEGO
46
 
# include <spnegohelp.h>
47
 
# if defined(USE_OPENSSL) && !defined(USE_YASSLEMUL)
48
 
#  include <openssl/objects.h>
49
 
# else
50
 
#  error "Can't compile SPNEGO support without OpenSSL."
51
 
# endif
 
46
#  include <spnegohelp.h>
 
47
#  ifdef USE_SSLEAY
 
48
#    ifdef USE_OPENSSL
 
49
#      include <openssl/objects.h>
 
50
#    else
 
51
#      include <objects.h>
 
52
#    endif
 
53
#  else
 
54
#    error "Can't compile SPNEGO support without OpenSSL."
 
55
#  endif
52
56
#endif
53
57
 
54
58
#define _MPRINTF_REPLACE /* use our functions only */
97
101
}
98
102
 
99
103
static void
100
 
log_gss_error(struct connectdata *conn, OM_uint32 error_status, char *prefix)
 
104
log_gss_error(struct connectdata *conn, OM_uint32 error_status, const char *prefix)
101
105
{
102
106
  OM_uint32 maj_stat, min_stat;
103
107
  OM_uint32 msg_ctx = 0;
253
257
  if(GSS_ERROR(major_status)) {
254
258
    /* Curl_cleanup_negotiate(conn->data) ??? */
255
259
    log_gss_error(conn, minor_status,
256
 
                  (char *)"gss_init_sec_context() failed: ");
 
260
                  "gss_init_sec_context() failed: ");
257
261
    return -1;
258
262
  }
259
263