diff options
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/gssapi/gssd_handle.c | 32 | ||||
| -rw-r--r-- | usr/src/uts/common/io/lvm/md/md_med.c | 19 | ||||
| -rw-r--r-- | usr/src/uts/common/rpc/rpc_subr.c | 10 | ||||
| -rw-r--r-- | usr/src/uts/common/rpc/sec/key_call.c | 26 |
4 files changed, 38 insertions, 49 deletions
diff --git a/usr/src/uts/common/gssapi/gssd_handle.c b/usr/src/uts/common/gssapi/gssd_handle.c index 78563b6e81..cd1676e84a 100644 --- a/usr/src/uts/common/gssapi/gssd_handle.c +++ b/usr/src/uts/common/gssapi/gssd_handle.c @@ -19,13 +19,16 @@ * * CDDL HEADER END */ + +/* + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + */ + /* * Copyright 2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Kernel code to obtain client handle to gssd server */ @@ -39,7 +42,6 @@ #include <sys/vnode.h> #include <sys/uio.h> #include <sys/pathname.h> -#include <sys/utsname.h> #define GSSD_RETRY 5 @@ -94,7 +96,6 @@ getgssd_handle(void) struct vnode *vp; int error; CLIENT *clnt; - char *gssname; enum clnt_stat stat; struct netbuf tmpaddr; struct gss_globals *gssg; @@ -107,7 +108,7 @@ getgssd_handle(void) */ if (gssg->gss_config.knc_rdev == 0) { if ((error = lookupname("/dev/ticotsord", UIO_SYSSPACE, - FOLLOW, NULLVPP, &vp)) != 0) { + FOLLOW, NULLVPP, &vp)) != 0) { GSSLOG(1, "getgssd_handle: lookupname: %d\n", error); return (NULL); } @@ -125,27 +126,20 @@ getgssd_handle(void) netaddrp = &gssg->gss_netaddr; if (netaddrp->len == 0 || gssg->gss_last_stat != RPC_SUCCESS) { - char *nodename = uts_nodename(); - - /* Set up netaddr to be <nodename>. */ - netaddrp->len = strlen(nodename) + 1; - if (netaddrp->buf != (char *)NULL) + if (netaddrp->buf != NULL) kmem_free(netaddrp->buf, netaddrp->maxlen); - gssname = kmem_zalloc(netaddrp->len, KM_SLEEP); - - (void) strncpy(gssname, nodename, netaddrp->len - 1); - /* Append "." to end of gssname */ - (void) strncpy(gssname+(netaddrp->len-1), ".", 1); - netaddrp->buf = gssname; - netaddrp->maxlen = netaddrp->len; + /* Set up netaddr to be "localhost." (strlen is 10) */ + netaddrp->len = netaddrp->maxlen = 10; + netaddrp->buf = kmem_alloc(netaddrp->len, KM_SLEEP); + (void) strncpy(netaddrp->buf, "localhost.", netaddrp->len); /* Get address of gssd from rpcbind */ stat = rpcbind_getaddr(&gssg->gss_config, GSSPROG, GSSVERS, netaddrp); if (stat != RPC_SUCCESS) { kmem_free(netaddrp->buf, netaddrp->maxlen); - netaddrp->buf = (char *)NULL; + netaddrp->buf = NULL; netaddrp->len = netaddrp->maxlen = 0; mutex_exit(&gssrpcb_lock); return (NULL); @@ -166,7 +160,7 @@ getgssd_handle(void) mutex_exit(&gssrpcb_lock); error = clnt_tli_kcreate(&gssg->gss_config, &tmpaddr, GSSPROG, - GSSVERS, 0, GSSD_RETRY, kcred, &clnt); + GSSVERS, 0, GSSD_RETRY, kcred, &clnt); kmem_free(tmpaddr.buf, tmpaddr.maxlen); diff --git a/usr/src/uts/common/io/lvm/md/md_med.c b/usr/src/uts/common/io/lvm/md/md_med.c index 37c002e860..4f3f576563 100644 --- a/usr/src/uts/common/io/lvm/md/md_med.c +++ b/usr/src/uts/common/io/lvm/md/md_med.c @@ -18,6 +18,11 @@ * * CDDL HEADER END */ + +/* + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + */ + /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -1070,14 +1075,12 @@ med_net_callrpc( } if (strcmp(uap->ua_kn.knc_protofmly, NC_LOOPBACK) == 0) { - size_t alen = strlen(utsname.nodename) + 1 + 1; - - dst.buf = kmem_zalloc(alen, KM_SLEEP); - dst.maxlen = (uint_t)alen; - - (void) strcpy(dst.buf, utsname.nodename); - (void) strcat(dst.buf, "."); - + /* + * strlen("localhost.") is 10 + */ + dst.len = dst.maxlen = 10; + dst.buf = kmem_alloc(dst.len, KM_SLEEP); + (void) strncpy(dst.buf, "localhost.", dst.len); } else if (strcmp(uap->ua_kn.knc_protofmly, NC_INET) == 0) { struct sockaddr_in *s; diff --git a/usr/src/uts/common/rpc/rpc_subr.c b/usr/src/uts/common/rpc/rpc_subr.c index d53a4eeb4a..ceb153cf84 100644 --- a/usr/src/uts/common/rpc/rpc_subr.c +++ b/usr/src/uts/common/rpc/rpc_subr.c @@ -19,6 +19,11 @@ * * CDDL HEADER END */ + +/* + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -27,9 +32,6 @@ * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -/* - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. - */ /* SVr4.0 1.1 */ @@ -496,7 +498,7 @@ out: /* * Try to get the address for the desired service by using the rpcbind * protocol. Ignores signals. If addr is a loopback address, it is - * expected to be initialized to "<hostname>.". + * expected to be initialized to "localhost.". * rpcbind_getaddr() is able to work with RPCBIND protocol version 3 and 4 * and PORTMAP protocol version 2. * It tries version 4 at first, then version 3 and finally (if both failed) diff --git a/usr/src/uts/common/rpc/sec/key_call.c b/usr/src/uts/common/rpc/sec/key_call.c index 382924bffe..1903a42fb3 100644 --- a/usr/src/uts/common/rpc/sec/key_call.c +++ b/usr/src/uts/common/rpc/sec/key_call.c @@ -18,6 +18,11 @@ * * CDDL HEADER END */ + +/* + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + */ + /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -31,8 +36,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * key_call.c, Interface to keyserver * key_encryptsession(agent, deskey, cr)-encrypt a session key to talk to agent @@ -53,7 +56,6 @@ #include <sys/vnode.h> #include <sys/uio.h> #include <sys/debug.h> -#include <sys/utsname.h> #include <sys/cmn_err.h> #include <rpc/rpc.h> @@ -64,7 +66,6 @@ struct auth_globals { struct knetconfig auth_config; - char auth_keyname[SYS_NMLN+16]; }; static struct timeval keytrytimeout = { KEY_TIMEOUT, 0 }; @@ -236,26 +237,15 @@ key_call(rpcproc_t procn, xdrproc_t xdr_args, caddr_t args, vnode_t *vp; int error; struct auth_globals *authg; - char *keyname; struct knetconfig *configp; k_sigset_t smask; authg = zone_getspecific(auth_zone_key, curproc->p_zone); - keyname = authg->auth_keyname; configp = &authg->auth_config; - /* - * Using a global here is obviously busted and fraught with danger. - */ - (void) strcpy(keyname, uts_nodename()); - netaddr.len = strlen(keyname); - (void) strcpy(&keyname[netaddr.len], ".keyserv"); - - netaddr.buf = keyname; - /* - * 8 = strlen(".keyserv"); - */ - netaddr.len = netaddr.maxlen = netaddr.len + 8; + /* strlen("localhost.keyserv") is 17 */ + netaddr.len = netaddr.maxlen = 17; + netaddr.buf = "localhost.keyserv"; /* * filch a knetconfig structure. |