Attachment #151699 for bug #185899

View | Details | Raw Unified | Return to bug 185899 | Differences between

and this patch




#include <krb5.h>
#include <gssapi/gssapi.h>
#ifndef OM_uint64
#ifndef GSSAPI_GSSAPI_H_
typedef uint64_t OM_uint64;
#endif
#endif
#include <gssapi/gssapi_krb5.h>

static int

	int retcode = 0;

	printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");
	maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
						1, &return_ctx);
	if (maj_stat != GSS_S_COMPLETE) {
		pgsserr("gss_krb5_export_lucid_sec_context",
			maj_stat, min_stat, &krb5oid);
		goto out_err;
	}

	else
		retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf);

	maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx);
	if (maj_stat != GSS_S_COMPLETE) {
		pgsserr("gss_krb5_export_lucid_sec_context",
			maj_stat, min_stat, &krb5oid);
		printerr(0, "WARN: failed to free lucid sec context\n");
	}

Lines 294-303 limit_krb5_enctypes(struct rpc_gss_sec * Link Here

(-)nfs-utils-1.1.0/utils/gssd/krb5_util.c (-2 / +2 lines)
294	return -1;	294	return -1;
295	}	295	}
296		296
297	maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid,	297	maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
298	num_enctypes, &enctypes);	298	num_enctypes, &enctypes);
299	if (maj_stat != GSS_S_COMPLETE) {	299	if (maj_stat != GSS_S_COMPLETE) {
300	pgsserr("gss_set_allowable_enctypes",	300	pgsserr("gss_krb5_set_allowable_enctypes",
301	maj_stat, min_stat, &krb5oid);	301	maj_stat, min_stat, &krb5oid);
302	gss_release_cred(&min_stat, &credh);	302	gss_release_cred(&min_stat, &credh);
303	return -1;	303	return -1;

Return to bug 185899

Lines 48-55 Link Here

(-)nfs-utils-1.1.0/utils/gssd/context_lucid.c (-4 / +6 lines)
48	#include <krb5.h>	48	#include <krb5.h>
49	#include <gssapi/gssapi.h>	49	#include <gssapi/gssapi.h>
50	#ifndef OM_uint64	50	#ifndef OM_uint64
		51	#ifndef GSSAPI_GSSAPI_H_
51	typedef uint64_t OM_uint64;	52	typedef uint64_t OM_uint64;
52	#endif	53	#endif
		54	#endif
53	#include <gssapi/gssapi_krb5.h>	55	#include <gssapi/gssapi_krb5.h>
54		56
55	static int	57	static int
Lines 171-180 serialize_krb5_ctx(gss_ctx_id_t ctx, gss Link Here
171	int retcode = 0;	173	int retcode = 0;
172		174
173	printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");	175	printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");
174	maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,	176	maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
175	1, &return_ctx);	177	1, &return_ctx);
176	if (maj_stat != GSS_S_COMPLETE) {	178	if (maj_stat != GSS_S_COMPLETE) {
177	pgsserr("gss_export_lucid_sec_context",	179	pgsserr("gss_krb5_export_lucid_sec_context",
178	maj_stat, min_stat, &krb5oid);	180	maj_stat, min_stat, &krb5oid);
179	goto out_err;	181	goto out_err;
180	}	182	}
Lines 198-206 serialize_krb5_ctx(gss_ctx_id_t ctx, gss Link Here
198	else	200	else
199	retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf);	201	retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf);
200		202
201	maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);	203	maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx);
202	if (maj_stat != GSS_S_COMPLETE) {	204	if (maj_stat != GSS_S_COMPLETE) {
203	pgsserr("gss_export_lucid_sec_context",	205	pgsserr("gss_krb5_export_lucid_sec_context",
204	maj_stat, min_stat, &krb5oid);	206	maj_stat, min_stat, &krb5oid);
205	printerr(0, "WARN: failed to free lucid sec context\n");	207	printerr(0, "WARN: failed to free lucid sec context\n");
206	}	208	}