git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright dates 2014, 2015
[exim.git]
/
src
/
src
/
auths
/
heimdal_gssapi.c
diff --git
a/src/src/auths/heimdal_gssapi.c
b/src/src/auths/heimdal_gssapi.c
index e01789e31e49b67179006e53270178c60dc3a298..94e689d58a7416cb298d0da312ecff17bc86a138 100644
(file)
--- a/
src/src/auths/heimdal_gssapi.c
+++ b/
src/src/auths/heimdal_gssapi.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
2
*/
+/* Copyright (c) University of Cambridge 1995 - 201
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) Twitter Inc 2012
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) Twitter Inc 2012
@@
-43,7
+43,9
@@
Without rename, we could add an option for GS2 support in the future.
#ifndef AUTH_HEIMDAL_GSSAPI
/* dummy function to satisfy compilers when we link in an "empty" file. */
#ifndef AUTH_HEIMDAL_GSSAPI
/* dummy function to satisfy compilers when we link in an "empty" file. */
-static void dummy(int x) { dummy(x-1); }
+static void dummy(int x);
+static void dummy2(int x) { dummy(x-1); }
+static void dummy(int x) { dummy2(x-1); }
#else
#include <gssapi/gssapi.h>
#else
#include <gssapi/gssapi.h>
@@
-318,7
+320,7
@@
auth_heimdal_gssapi_server(auth_instance *ablock, uschar *initial_data)
break;
case 1:
break;
case 1:
- gbufdesc_in.length =
auth_
b64decode(from_client, USS &gbufdesc_in.value);
+ gbufdesc_in.length = b64decode(from_client, USS &gbufdesc_in.value);
if (gclient) {
maj_stat = gss_release_name(&min_stat, &gclient);
gclient = GSS_C_NO_NAME;
if (gclient) {
maj_stat = gss_release_name(&min_stat, &gclient);
gclient = GSS_C_NO_NAME;
@@
-398,7
+400,7
@@
auth_heimdal_gssapi_server(auth_instance *ablock, uschar *initial_data)
break;
case 3:
break;
case 3:
- gbufdesc_in.length =
auth_
b64decode(from_client, USS &gbufdesc_in.value);
+ gbufdesc_in.length = b64decode(from_client, USS &gbufdesc_in.value);
maj_stat = gss_unwrap(&min_stat,
gcontext,
&gbufdesc_in, /* data from client */
maj_stat = gss_unwrap(&min_stat,
gcontext,
&gbufdesc_in, /* data from client */
@@
-526,7
+528,7
@@
exim_gssapi_error_defer(uschar *store_reset_point,
va_start(ap, format);
if (!string_vformat(buffer, sizeof(buffer), format, ap))
log_write(0, LOG_MAIN|LOG_PANIC_DIE,
va_start(ap, format);
if (!string_vformat(buffer, sizeof(buffer), format, ap))
log_write(0, LOG_MAIN|LOG_PANIC_DIE,
- "exim_gssapi_error_defer expansion larger than %
d
",
+ "exim_gssapi_error_defer expansion larger than %
lu
",
sizeof(buffer));
va_end(ap);
sizeof(buffer));
va_end(ap);