summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2007-05-27 17:14:33 +0000
committerRobert Watson <rwatson@FreeBSD.org>2007-05-27 17:14:33 +0000
commitbdcfa9589b925f03253e54860d3dbef3c3828e0f (patch)
tree1db0e282619dc280241e8e1c13ffd7c1a5537f98
parentb312d4b0ba53bf3b51348c039b7731a0dca9d9e8 (diff)
Notes
-rw-r--r--sys/netncp/ncp_conn.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 370b004e8c2d..6987b61b0330 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -223,10 +223,10 @@ ncp_conn_alloc(struct ncp_conn_args *cap, struct thread *td, struct ucred *cred,
if (cap->saddr.sa_family != AF_INET && cap->saddr.sa_family != AF_IPX)
return EPROTONOSUPPORT;
- isroot = ncp_suser(cred) == 0;
/*
- * Only root can change ownership
+ * Only root can change ownership.
*/
+ isroot = ncp_suser(cred) == 0;
if (cap->owner != NCP_DEFAULT_OWNER && !isroot)
return EPERM;
if (cap->group != NCP_DEFAULT_GROUP &&
@@ -234,6 +234,7 @@ ncp_conn_alloc(struct ncp_conn_args *cap, struct thread *td, struct ucred *cred,
return EPERM;
if (cap->owner != NCP_DEFAULT_OWNER) {
owner = crget();
+ crcopy(owner, cred);
owner->cr_uid = cap->owner;
} else
owner = crhold(cred);
@@ -243,7 +244,7 @@ ncp_conn_alloc(struct ncp_conn_args *cap, struct thread *td, struct ucred *cred,
lockinit(&ncp->nc_lock, PZERO, "ncplck", 0, 0);
ncp_conn_cnt++;
ncp->nc_id = ncp_next_ref++;
- ncp->nc_owner = cred;
+ ncp->nc_owner = owner;
ncp->seq = 0;
ncp->connid = 0xFFFF;
ncp->li = *cap;