summaryrefslogtreecommitdiff
path: root/gss-serv.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:07:05 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:07:05 +1100
commit6fd6defbce4c03820b8070b106bfe52bf2bed60a (patch)
treeeb1f1bcbce5ba51e98ad62904f04b2cd419c2d33 /gss-serv.c
parent20afc24363eb4e88351d66792275ee9d4b1eaaa4 (diff)
- stevesk@cvs.openbsd.org 2005/10/13 22:24:31
[auth2-gss.c gss-genr.c gss-serv.c monitor.c] KNF; ok djm@
Diffstat (limited to 'gss-serv.c')
-rw-r--r--gss-serv.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/gss-serv.c b/gss-serv.c
index 56ff9f612..26eec25bd 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gss-serv.c,v 1.12 2005/10/13 19:08:08 stevesk Exp $ */ 1/* $OpenBSD: gss-serv.c,v 1.13 2005/10/13 22:24:31 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -134,14 +134,14 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
134 OM_uint32 offset; 134 OM_uint32 offset;
135 OM_uint32 oidl; 135 OM_uint32 oidl;
136 136
137 tok=ename->value; 137 tok = ename->value;
138 138
139 /* 139 /*
140 * Check that ename is long enough for all of the fixed length 140 * Check that ename is long enough for all of the fixed length
141 * header, and that the initial ID bytes are correct 141 * header, and that the initial ID bytes are correct
142 */ 142 */
143 143
144 if (ename->length<6 || memcmp(tok,"\x04\x01", 2)!=0) 144 if (ename->length < 6 || memcmp(tok, "\x04\x01", 2) != 0)
145 return GSS_S_FAILURE; 145 return GSS_S_FAILURE;
146 146
147 /* 147 /*
@@ -160,7 +160,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
160 */ 160 */
161 if (tok[4] != 0x06 || tok[5] != oidl || 161 if (tok[4] != 0x06 || tok[5] != oidl ||
162 ename->length < oidl+6 || 162 ename->length < oidl+6 ||
163 !ssh_gssapi_check_oid(ctx,tok+6,oidl)) 163 !ssh_gssapi_check_oid(ctx, tok+6, oidl))
164 return GSS_S_FAILURE; 164 return GSS_S_FAILURE;
165 165
166 offset = oidl+6; 166 offset = oidl+6;
@@ -175,7 +175,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
175 return GSS_S_FAILURE; 175 return GSS_S_FAILURE;
176 176
177 name->value = xmalloc(name->length+1); 177 name->value = xmalloc(name->length+1);
178 memcpy(name->value,tok+offset,name->length); 178 memcpy(name->value, tok+offset,name->length);
179 ((char *)name->value)[name->length] = 0; 179 ((char *)name->value)[name->length] = 0;
180 180
181 return GSS_S_COMPLETE; 181 return GSS_S_COMPLETE;
@@ -259,9 +259,8 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
259 259
260 if (gssapi_client.store.envvar != NULL && 260 if (gssapi_client.store.envvar != NULL &&
261 gssapi_client.store.envval != NULL) { 261 gssapi_client.store.envval != NULL) {
262
263 debug("Setting %s to %s", gssapi_client.store.envvar, 262 debug("Setting %s to %s", gssapi_client.store.envvar,
264 gssapi_client.store.envval); 263 gssapi_client.store.envval);
265 child_set_env(envp, envsizep, gssapi_client.store.envvar, 264 child_set_env(envp, envsizep, gssapi_client.store.envvar,
266 gssapi_client.store.envval); 265 gssapi_client.store.envval);
267 } 266 }