1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
--- libgamin/gam_api.c.orig Thu Mar 24 19:07:08 2005
+++ libgamin/gam_api.c Thu Mar 24 19:26:39 2005
@@ -181,7 +181,6 @@ gamin_get_socket_dir(void)
snprintf(path, MAXPATHLEN, "/tmp/fam-%s", user);
path[MAXPATHLEN] = 0;
ret = strdup(path);
- free(user);
return (ret);
}
@@ -421,9 +420,35 @@ gamin_write_credential_byte(int fd)
{
char data[2] = { 0, 0 };
int written;
+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
+ struct {
+ struct cmsghdr hdr;
+ struct cmsgcred cred;
+ } cmsg;
+ struct iovec iov;
+ struct msghdr msg;
+
+ iov.iov_base = &data[0];
+ iov.iov_len = 1;
+
+ memset (&msg, 0, sizeof (msg));
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+
+ msg.msg_control = &cmsg;
+ msg.msg_controllen = sizeof (cmsg);
+ memset (&cmsg, 0, sizeof (cmsg));
+ cmsg.hdr.cmsg_len = sizeof (cmsg);
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_CREDS;
+#endif
retry:
+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
+ written = sendmsg(fd, &msg, 0);
+#else
written = write(fd, &data[0], 1);
+#endif
if (written < 0) {
if (errno == EINTR)
goto retry;
@@ -616,8 +641,10 @@ gamin_check_cred(GAMDataPtr conn, int fd
gid_t c_gid;
#ifdef HAVE_CMSGCRED
- char cmsgmem[CMSG_SPACE(sizeof(struct cmsgcred))];
- struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
+ struct {
+ struct cmsghdr hdr;
+ struct cmsgcred cred;
+ } cmsg;
#endif
s_uid = getuid();
@@ -642,9 +669,9 @@ gamin_check_cred(GAMDataPtr conn, int fd
msg.msg_iovlen = 1;
#ifdef HAVE_CMSGCRED
- memset(cmsgmem, 0, sizeof(cmsgmem));
- msg.msg_control = cmsgmem;
- msg.msg_controllen = sizeof(cmsgmem);
+ memset(&cmsg, 0, sizeof(cmsg));
+ msg.msg_control = &cmsg;
+ msg.msg_controllen = sizeof(cmsg);
#endif
retry:
@@ -661,7 +688,7 @@ retry:
goto failed;
}
#ifdef HAVE_CMSGCRED
- if (cmsg->cmsg_len < sizeof(cmsgmem) || cmsg->cmsg_type != SCM_CREDS) {
+ if (cmsg.hdr.cmsg_len < sizeof(cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) {
GAM_DEBUG(DEBUG_INFO,
"Message from recvmsg() was not SCM_CREDS\n");
goto failed;
@@ -687,13 +714,9 @@ retry:
goto failed;
}
#elif defined(HAVE_CMSGCRED)
- struct cmsgcred *cred;
-
- cred = (struct cmsgcred *) CMSG_DATA(cmsg);
-
- c_pid = cred->cmcred_pid;
- c_uid = cred->cmcred_euid;
- c_gid = cred->cmcred_groups[0];
+ c_pid = cmsg.cred.cmcred_pid;
+ c_uid = cmsg.cred.cmcred_euid;
+ c_gid = cmsg.cred.cmcred_groups[0];
#else /* !SO_PEERCRED && !HAVE_CMSGCRED */
GAM_DEBUG(DEBUG_INFO,
"Socket credentials not supported on this OS\n");
|
