Deleted Added
full compact
gss_accept_sec_context.c (184588) gss_accept_sec_context.c (244370)
1/*-
2 * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
3 * Authors: Doug Rabson <dfr@rabson.org>
4 * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
3 * Authors: Doug Rabson <dfr@rabson.org>
4 * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/kgssapi/gss_accept_sec_context.c 184588 2008-11-03 10:38:00Z dfr $");
29__FBSDID("$FreeBSD: head/sys/kgssapi/gss_accept_sec_context.c 244370 2012-12-18 00:25:48Z rmacklem $");
30
31#include <sys/param.h>
32#include <sys/kernel.h>
33#include <sys/kobj.h>
30
31#include <sys/param.h>
32#include <sys/kernel.h>
33#include <sys/kobj.h>
34#include <sys/lock.h>
34#include <sys/malloc.h>
35#include <sys/malloc.h>
36#include <sys/mutex.h>
35
36#include <kgssapi/gssapi.h>
37#include <kgssapi/gssapi_impl.h>
38#include <rpc/rpc.h>
39
40#include "gssd.h"
41#include "kgss_if.h"
42

--- 10 unchanged lines hidden (view full) ---

53 gss_cred_id_t *delegated_cred_handle)
54{
55 struct accept_sec_context_res res;
56 struct accept_sec_context_args args;
57 enum clnt_stat stat;
58 gss_ctx_id_t ctx = *context_handle;
59 gss_name_t name;
60 gss_cred_id_t cred;
37
38#include <kgssapi/gssapi.h>
39#include <kgssapi/gssapi_impl.h>
40#include <rpc/rpc.h>
41
42#include "gssd.h"
43#include "kgss_if.h"
44

--- 10 unchanged lines hidden (view full) ---

55 gss_cred_id_t *delegated_cred_handle)
56{
57 struct accept_sec_context_res res;
58 struct accept_sec_context_args args;
59 enum clnt_stat stat;
60 gss_ctx_id_t ctx = *context_handle;
61 gss_name_t name;
62 gss_cred_id_t cred;
63 CLIENT *cl;
61
64
62 if (!kgss_gssd_handle)
65 cl = kgss_gssd_client();
66 if (cl == NULL) {
67 *minor_status = 0;
63 return (GSS_S_FAILURE);
68 return (GSS_S_FAILURE);
69 }
64
65 if (ctx)
66 args.ctx = ctx->handle;
67 else
68 args.ctx = 0;
69 if (acceptor_cred_handle)
70 args.cred = acceptor_cred_handle->handle;
71 else
72 args.cred = 0;
73 args.input_token = *input_token;
74 args.input_chan_bindings = input_chan_bindings;
75
76 bzero(&res, sizeof(res));
70
71 if (ctx)
72 args.ctx = ctx->handle;
73 else
74 args.ctx = 0;
75 if (acceptor_cred_handle)
76 args.cred = acceptor_cred_handle->handle;
77 else
78 args.cred = 0;
79 args.input_token = *input_token;
80 args.input_chan_bindings = input_chan_bindings;
81
82 bzero(&res, sizeof(res));
77 stat = gssd_accept_sec_context_1(&args, &res, kgss_gssd_handle);
83 stat = gssd_accept_sec_context_1(&args, &res, cl);
84 CLNT_RELEASE(cl);
78 if (stat != RPC_SUCCESS) {
79 *minor_status = stat;
80 return (GSS_S_FAILURE);
81 }
82
83 if (res.major_status != GSS_S_COMPLETE
84 && res.major_status != GSS_S_CONTINUE_NEEDED) {
85 *minor_status = res.minor_status;

--- 53 unchanged lines hidden ---
85 if (stat != RPC_SUCCESS) {
86 *minor_status = stat;
87 return (GSS_S_FAILURE);
88 }
89
90 if (res.major_status != GSS_S_COMPLETE
91 && res.major_status != GSS_S_CONTINUE_NEEDED) {
92 *minor_status = res.minor_status;

--- 53 unchanged lines hidden ---