From 5dcbe84df8f1a8d1d306b5f9c867096d5ed48ded Mon Sep 17 00:00:00 2001 From: Michael Sweet Date: Fri, 18 Nov 2016 09:05:49 -0500 Subject: [PATCH] Fix compiler warning. --- cups/auth.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/cups/auth.c b/cups/auth.c index f9187ffa8..409b66ac7 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,7 +1,7 @@ /* * Authentication functions for CUPS. * - * Copyright 2007-2014 by Apple Inc. + * Copyright 2007-2016 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * This file contains Kerberos support code, copyright 2006 by @@ -54,7 +54,7 @@ extern const char *cssmErrorString(int error); # else # define GSS_AUTH_IDENTITY_TYPE_1 1 # define gss_acquire_cred_ex_f __ApplePrivate_gss_acquire_cred_ex_f -typedef struct gss_auth_identity +typedef struct _gss_auth_identity { uint32_t type; uint32_t flags; @@ -62,7 +62,7 @@ typedef struct gss_auth_identity char *realm; char *password; gss_buffer_t *credentialsRef; -} gss_auth_identity_desc; +} _gss_auth_identity_desc; extern OM_uint32 gss_acquire_cred_ex_f(gss_status_id_t, const gss_name_t, OM_uint32, OM_uint32, const gss_OID, gss_cred_usage_t, gss_auth_identity_t, @@ -348,7 +348,7 @@ _cupsSetNegotiateAuthString( const char *username, /* Username string */ *password; /* Password string */ _cups_gss_acquire_t data; /* Callback data */ - gss_auth_identity_desc identity; /* Kerberos user identity */ + _gss_auth_identity_desc identity; /* Kerberos user identity */ _cups_globals_t *cg = _cupsGlobals(); /* Per-thread global data */ @@ -386,10 +386,7 @@ _cupsSetNegotiateAuthString( if (data.sem) { - major_status = gss_acquire_cred_ex_f(NULL, GSS_C_NO_NAME, 0, - GSS_C_INDEFINITE, GSS_KRB5_MECHANISM, - GSS_C_INITIATE, &identity, &data, - cups_gss_acquire); + major_status = gss_acquire_cred_ex_f(NULL, GSS_C_NO_NAME, 0, GSS_C_INDEFINITE, GSS_KRB5_MECHANISM, GSS_C_INITIATE, (gss_auth_identity_t)&identity, &data, cups_gss_acquire); if (major_status == GSS_S_COMPLETE) { -- 2.39.5