oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

support SCM_CREDS (for NetBSD)

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14558 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-02-03 12:33:05 +00:00
parent 29e616b3f6
commit 885c805e3b
1 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
kcm/connect.c
View File

@@ -70,6 +70,84 @@ reinit_descrs (struct descr *d, int n)
d[i].sa = (struct sockaddr *)&d[i].__ss;
}
/*
* Update peer credentials from socket.
*
* SCM_CREDS can only be updated the first time there is read data to
* read from the filedescriptor, so if we read do it before this
* point, the cred data might not be is not there yet.
*/
static int
update_client_creds(int s, kcm_client *peer)
{
#ifdef SO_PEERCRED
{
socklen_t pclen;
struct ucred pc;
if (getsockopt(d[index].s, SOL_SOCKET, SO_PEERCRED, (void *)&pc,
&pclen) != 0) {
krb5_warn(kcm_context, errno, "failed to determine peer identity");
return 1;
}
peer->uid = pc.uid;
peer->gid = pc.gid;
peer->pid = pc.pid;
return 0;
}
#endif
#if defined(SOCKCREDSIZE) && defined(SCM_CREDS)
if (peer->uid == -1) {
struct msghdr msg;
socklen_t crmsgsize;
void *crmsg;
struct cmsghdr *cmp;
struct sockcred *sc;
memset(&msg, 0, sizeof(msg));
crmsgsize = CMSG_SPACE(SOCKCREDSIZE(NGROUPS));
if (crmsgsize == 0)
return 1 ;
crmsg = malloc(crmsgsize);
if (crmsg == NULL)
return 1;
memset(crmsg, 0, crmsgsize);
msg.msg_control = crmsg;
msg.msg_controllen = crmsgsize;
if (recvmsg(s, &msg, 0) < 0) {
free(crmsg);
return 1;
}
if (msg.msg_controllen == 0 || (msg.msg_flags & MSG_CTRUNC) != 0) {
free(crmsg);
return 1;
}
cmp = CMSG_FIRSTHDR(&msg);
if (cmp->cmsg_level != SOL_SOCKET || cmp->cmsg_type != SCM_CREDS) {
free(crmsg);
return 1;
}
sc = (struct sockcred *)(void *)CMSG_DATA(cmp);
peer->uid = sc->sc_euid;
peer->gid = sc->sc_egid;
peer->pid = 0;
free(crmsg);
}
#endif
return 0;
}
/*
* Create the socket (family, type, port) in `d'
*/
@@ -267,6 +345,10 @@ add_new_stream (struct descr *d, int parent, int child)
if (child == -1)
return;
d[child].peercred.pid = -1;
d[child].peercred.uid = -1;
d[child].peercred.gid = -1;
d[child].sock_len = sizeof(d[child].__ss);
s = accept(d[parent].s, d[child].sa, &d[child].sock_len);
if(s < 0) {
@@ -333,28 +415,17 @@ handle_stream(struct descr *d, int index, int min_free)
return;
}
d[index].peercred.pid = 0;
d[index].peercred.uid = -1;
d[index].peercred.gid = -1;
#ifdef SO_PEERCRED
{
socklen_t pclen;
struct ucred pc;
if (getsockopt(d[index].s, SOL_SOCKET, SO_PEERCRED, (void *)&pc,
&pclen) != 0) {
krb5_warn(kcm_context, errno, "failed to determine peer identity");
if (update_client_creds(d[index].s, &d[index].peercred)) {
krb5_warnx(kcm_context, "failed to update peer identity");
clear_descr(d + index);
return;
}
d[index].peercred.uid = pc.uid;
d[index].peercred.gid = pc.gid;
d[index].peercred.pid = pc.pid;
}
#else
krb5_warnx(kcm_context, "code unimplemented to get peer identity");
if (d[index].peercred.uid == -1) {
krb5_warnx(kcm_context, "failed to determine peer identity");
clear_descr (d + index);
return;
#endif
}
n = recvfrom(d[index].s, buf, sizeof(buf), 0, NULL, NULL);
if (n < 0) {
@@ -465,6 +536,7 @@ kcm_loop(void)
}
}
kcm_run_events(kcm_context, time(NULL));
break;
}
}
if (d->path != NULL)