Date: Mon, 10 Nov 2008 18:09:52 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184822 - in user/dfr/gssapi/6: sys/kgssapi usr.sbin usr.sbin/gssd Message-ID: <200811101809.mAAI9qsi076871@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dfr Date: Mon Nov 10 18:09:52 2008 New Revision: 184822 URL: http://svn.freebsd.org/changeset/base/184822 Log: Fix gssd build. Modified: user/dfr/gssapi/6/sys/kgssapi/gssd.x user/dfr/gssapi/6/usr.sbin/Makefile user/dfr/gssapi/6/usr.sbin/gssd/Makefile user/dfr/gssapi/6/usr.sbin/gssd/gssd.c Modified: user/dfr/gssapi/6/sys/kgssapi/gssd.x ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gssd.x Mon Nov 10 18:08:05 2008 (r184821) +++ user/dfr/gssapi/6/sys/kgssapi/gssd.x Mon Nov 10 18:09:52 2008 (r184822) @@ -32,7 +32,7 @@ %#ifdef _KERNEL %#include <kgssapi/gssapi.h> %#else -%#include <gssapi/gssapi.h> +%#include <gssapi.h> %#endif %extern bool_t xdr_gss_buffer_desc(XDR *xdrs, gss_buffer_desc *buf); Modified: user/dfr/gssapi/6/usr.sbin/Makefile ============================================================================== --- user/dfr/gssapi/6/usr.sbin/Makefile Mon Nov 10 18:08:05 2008 (r184821) +++ user/dfr/gssapi/6/usr.sbin/Makefile Mon Nov 10 18:09:52 2008 (r184822) @@ -236,7 +236,7 @@ _bluetooth= bluetooth _keyserv= keyserv .endif -.if ${MK_GSSAPI} != no +.if !defined(NO_KERBEROS) _gssd= gssd .endif Modified: user/dfr/gssapi/6/usr.sbin/gssd/Makefile ============================================================================== --- user/dfr/gssapi/6/usr.sbin/gssd/Makefile Mon Nov 10 18:08:05 2008 (r184821) +++ user/dfr/gssapi/6/usr.sbin/gssd/Makefile Mon Nov 10 18:09:52 2008 (r184822) @@ -8,7 +8,7 @@ CFLAGS+= -I. WARNS?= 1 DPADD= ${LIBGSSAPI} -LDADD= -lgssapi +LDADD= -lgssapi -lkrb5 -lasn1 -lroken -lcrypto -lcrypt -lcom_err CLEANFILES= gssd_svc.c gssd.h Modified: user/dfr/gssapi/6/usr.sbin/gssd/gssd.c ============================================================================== --- user/dfr/gssapi/6/usr.sbin/gssd/gssd.c Mon Nov 10 18:08:05 2008 (r184821) +++ user/dfr/gssapi/6/usr.sbin/gssd/gssd.c Mon Nov 10 18:09:52 2008 (r184822) @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <gssapi/gssapi.h> +#include <gssapi.h> #include <rpc/rpc.h> #include <rpc/rpc_com.h> @@ -450,6 +450,7 @@ gssd_release_name_1_svc(release_name_arg bool_t gssd_pname_to_uid_1_svc(pname_to_uid_args *argp, pname_to_uid_res *result, struct svc_req *rqstp) { +#if 0 gss_name_t name = gssd_find_resource(argp->pname); uid_t uid; char buf[128]; @@ -486,6 +487,11 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg } return (TRUE); +#else + memset(result, 0, sizeof(*result)); + result->major_status = GSS_S_FAILURE; + return (TRUE); +#endif } bool_t @@ -523,6 +529,7 @@ gssd_acquire_cred_1_svc(acquire_cred_arg bool_t gssd_set_cred_option_1_svc(set_cred_option_args *argp, set_cred_option_res *result, struct svc_req *rqstp) { +#if 0 gss_cred_id_t cred = gssd_find_resource(argp->cred); memset(result, 0, sizeof(*result)); @@ -535,6 +542,11 @@ gssd_set_cred_option_1_svc(set_cred_opti &cred, argp->option_name, &argp->option_value); return (TRUE); +#else + memset(result, 0, sizeof(*result)); + result->major_status = GSS_S_FAILURE; + return (TRUE); +#endif } bool_t
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811101809.mAAI9qsi076871>