From owner-svn-src-user@FreeBSD.ORG  Tue Nov  4 18:38:49 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 36D1E1065687;
	Tue,  4 Nov 2008 18:38:49 +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 256E28FC18;
	Tue,  4 Nov 2008 18:38:49 +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 mA4IcnVv004502;
	Tue, 4 Nov 2008 18:38:49 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA4IcnX8004501;
	Tue, 4 Nov 2008 18:38:49 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811041838.mA4IcnX8004501@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Tue, 4 Nov 2008 18:38:49 +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: r184648 - user/dfr/gssapi/7/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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2008 18:38:49 -0000

Author: dfr
Date: Tue Nov  4 18:38:48 2008
New Revision: 184648
URL: http://svn.freebsd.org/changeset/base/184648

Log:
  Stub out RPCs which use GSS-API features not present in RELENG_7.

Modified:
  user/dfr/gssapi/7/usr.sbin/gssd/gssd.c

Modified: user/dfr/gssapi/7/usr.sbin/gssd/gssd.c
==============================================================================
--- user/dfr/gssapi/7/usr.sbin/gssd/gssd.c	Tue Nov  4 18:31:16 2008	(r184647)
+++ user/dfr/gssapi/7/usr.sbin/gssd/gssd.c	Tue Nov  4 18:38:48 2008	(r184648)
@@ -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