svn commit: r184850 - in user/dfr/gssapi/6: kerberos5/lib/libgssapi usr.sbin/gssd

[Doug Rabson]

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