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
|
--- ezbounce-1.04a/mdidentd/identd.cpp
+++ ezbounce-1.04a/mdidentd/identd.cpp 2003-10-20 20:23:26.000000000 +0000
@@ -44,6 +44,7 @@
#include <unistd.h>
#include <sys/socket.h>
+#include <pwd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <arpa/inet.h>
@@ -76,6 +77,7 @@
static bool foreground, auto_kill; /* Some options */
bool no_real;
static uid_t uid; /* Become this user after binding sock */
+static gid_t gid; /* Primary group of uid */
static unsigned int hard_limit; /* Max # of fake idents */
static unsigned int num_conns;
static unsigned int num_unix;
@@ -179,10 +181,16 @@
id = argv[y+1];
if (!id)
{
- fprintf(stderr, "Option '-u' requires numeric user id to follow it\n");
+ fprintf(stderr, "Option '-u' requires user id to follow it\n");
exit(1);
}
- uid = (uid_t) atoi(id);
+ struct passwd *pw_ent;
+ if (!(pw_ent = getpwnam(id))) {
+ fprintf(stderr, "Option '-u' requires valid user id to follow it\n");
+ exit(1);
+ }
+ uid = pw_ent->pw_uid;
+ gid = pw_ent->pw_gid;
y++;
break;
case 'h':
@@ -277,9 +285,6 @@
unix_listen_fd = -1;
return 0;
}
- /* Must make it world writable if we expect to receive connections
- on it */
- fchmod(unix_listen_fd, 0777);
return 1;
}
@@ -396,7 +401,7 @@
* see if matches any of our fake ones, if not..
* its time to load the user's other identd.
*
- * Currently replies system name as 'OTHER'.
+ * Currently replies system name as 'UNIX'.
*/
static int reply(conn * c)
{
@@ -422,8 +427,8 @@
if (table->lookup(p1, p2, ident, sizeof(ident)))
{
syslog(LOG_INFO, "Request from %s for: %d , %d ", inet_ntoa(sin.sin_addr), p1, p2);
- syslog(LOG_INFO, "(fake) reply: %d, %d : USERID : OTHER :%s", p1, p2, ident);
- fdprintf(c->fd, "%d , %d : USERID : OTHER :%s\r\n",
+ syslog(LOG_INFO, "(fake) reply: %d , %d : USERID : UNIX : %s", p1, p2, ident);
+ fdprintf(c->fd, "%d , %d : USERID : UNIX : %s\r\n",
p1, p2, ident);
if (auto_kill)
table->remove(p1, p2, ident);
@@ -491,7 +496,8 @@
/* we already did this. but it doesn't work. i dunno why.
* i am messing up somwhere. dunno where. but we will do it again.
* and it will work. so there!! */
- chmod(MDIDENTD_SOCK_PATH, 0777);
+ chmod(MDIDENTD_SOCK_PATH, 0770);
+ chown(MDIDENTD_SOCK_PATH, uid, gid);
#ifndef NOFORK
if (!foreground)
{
|
GitWeb