From owner-svn-src-user@FreeBSD.ORG Tue Nov 11 14:58:07 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD8701065672; Tue, 11 Nov 2008 14:58:07 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B792E8FC1C; Tue, 11 Nov 2008 14:58:07 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mABEw7Ew004715; Tue, 11 Nov 2008 14:58:07 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mABEw7Kr004712; Tue, 11 Nov 2008 14:58:07 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200811111458.mABEw7Kr004712@svn.freebsd.org> From: Doug Rabson Date: Tue, 11 Nov 2008 14:58:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184850 - in user/dfr/gssapi/6: kerberos5/lib/libgssapi usr.sbin/gssd X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2008 14:58:07 -0000 Author: dfr Date: Tue Nov 11 14:58:07 2008 New Revision: 184850 URL: http://svn.freebsd.org/changeset/base/184850 Log: Merge support for gss_pname_to_uid(). Added: user/dfr/gssapi/6/kerberos5/lib/libgssapi/pname_to_uid.c - copied, changed from r184848, user/dfr/gssapi/7/kerberos5/lib/libgssapi/pname_to_uid.c Modified: user/dfr/gssapi/6/kerberos5/lib/libgssapi/Makefile user/dfr/gssapi/6/usr.sbin/gssd/gssd.c Modified: user/dfr/gssapi/6/kerberos5/lib/libgssapi/Makefile ============================================================================== --- user/dfr/gssapi/6/kerberos5/lib/libgssapi/Makefile Tue Nov 11 14:55:59 2008 (r184849) +++ user/dfr/gssapi/6/kerberos5/lib/libgssapi/Makefile Tue Nov 11 14:58:07 2008 (r184850) @@ -78,6 +78,7 @@ SRCS= 8003.c \ inquire_cred_by_mech.c \ inquire_mechs_for_name.c \ inquire_names_for_mech.c \ + pname_to_uid.c \ process_context_token.c \ release_buffer.c \ release_cred.c \ Copied and modified: user/dfr/gssapi/6/kerberos5/lib/libgssapi/pname_to_uid.c (from r184848, user/dfr/gssapi/7/kerberos5/lib/libgssapi/pname_to_uid.c) ============================================================================== --- user/dfr/gssapi/7/kerberos5/lib/libgssapi/pname_to_uid.c Tue Nov 11 14:45:27 2008 (r184848, copy source) +++ user/dfr/gssapi/6/kerberos5/lib/libgssapi/pname_to_uid.c Tue Nov 11 14:58:07 2008 (r184850) @@ -31,7 +31,7 @@ #include "gssapi_locl.h" OM_uint32 -_gsskrb5_pname_to_uid(OM_uint32 *minor_status, const gss_name_t pname, +gss_pname_to_uid(OM_uint32 *minor_status, const gss_name_t pname, const gss_OID mech, uid_t *uidp) { krb5_const_principal name = (krb5_const_principal) pname; Modified: user/dfr/gssapi/6/usr.sbin/gssd/gssd.c ============================================================================== --- user/dfr/gssapi/6/usr.sbin/gssd/gssd.c Tue Nov 11 14:55:59 2008 (r184849) +++ user/dfr/gssapi/6/usr.sbin/gssd/gssd.c Tue Nov 11 14:58:07 2008 (r184850) @@ -450,7 +450,6 @@ 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]; @@ -487,11 +486,6 @@ 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