Deleted Added
sdiff udiff text old ( 184588 ) new ( 244370 )
full compact
gss_init_sec_context.c (184588) gss_init_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_init_sec_context.c 184588 2008-11-03 10:38:00Z dfr $");
29__FBSDID("$FreeBSD: head/sys/kgssapi/gss_init_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#include <sys/proc.h>
36
37#include <kgssapi/gssapi.h>
38#include <kgssapi/gssapi_impl.h>
39#include <rpc/rpc.h>
40
41#include "gssd.h"
42#include "kgss_if.h"

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

55 gss_buffer_t output_token,
56 OM_uint32 * ret_flags,
57 OM_uint32 * time_rec)
58{
59 struct init_sec_context_res res;
60 struct init_sec_context_args args;
61 enum clnt_stat stat;
62 gss_ctx_id_t ctx = *context_handle;
37#include <sys/proc.h>
38
39#include <kgssapi/gssapi.h>
40#include <kgssapi/gssapi_impl.h>
41#include <rpc/rpc.h>
42
43#include "gssd.h"
44#include "kgss_if.h"

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

57 gss_buffer_t output_token,
58 OM_uint32 * ret_flags,
59 OM_uint32 * time_rec)
60{
61 struct init_sec_context_res res;
62 struct init_sec_context_args args;
63 enum clnt_stat stat;
64 gss_ctx_id_t ctx = *context_handle;
65 CLIENT *cl;
63
64 *minor_status = 0;
65
66
67 *minor_status = 0;
68
66 if (!kgss_gssd_handle)
69 cl = kgss_gssd_client();
70 if (cl == NULL)
67 return (GSS_S_FAILURE);
68
69 args.uid = curthread->td_ucred->cr_uid;
70 if (initiator_cred_handle)
71 args.cred = initiator_cred_handle->handle;
72 else
73 args.cred = 0;
74 if (ctx)

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

83 if (input_token)
84 args.input_token = *input_token;
85 else {
86 args.input_token.length = 0;
87 args.input_token.value = NULL;
88 }
89
90 bzero(&res, sizeof(res));
71 return (GSS_S_FAILURE);
72
73 args.uid = curthread->td_ucred->cr_uid;
74 if (initiator_cred_handle)
75 args.cred = initiator_cred_handle->handle;
76 else
77 args.cred = 0;
78 if (ctx)

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

87 if (input_token)
88 args.input_token = *input_token;
89 else {
90 args.input_token.length = 0;
91 args.input_token.value = NULL;
92 }
93
94 bzero(&res, sizeof(res));
91 stat = gssd_init_sec_context_1(&args, &res, kgss_gssd_handle);
95 stat = gssd_init_sec_context_1(&args, &res, cl);
96 CLNT_RELEASE(cl);
92 if (stat != RPC_SUCCESS) {
93 *minor_status = stat;
94 return (GSS_S_FAILURE);
95 }
96
97 if (res.major_status != GSS_S_COMPLETE
98 && res.major_status != GSS_S_CONTINUE_NEEDED) {
99 *minor_status = res.minor_status;

--- 36 unchanged lines hidden --- 		97 if (stat != RPC_SUCCESS) {
98 *minor_status = stat;
99 return (GSS_S_FAILURE);
100 }
101
102 if (res.major_status != GSS_S_COMPLETE
103 && res.major_status != GSS_S_CONTINUE_NEEDED) {
104 *minor_status = res.minor_status;

--- 36 unchanged lines hidden ---