Page MenuHomeFreeBSD
Files F154274077

D4547.id11220.diff
No OneTemporary
Actions

D4547.id11220.diff
View Options

Index: usr.sbin/ypldap/ldapclient.c
===================================================================
--- usr.sbin/ypldap/ldapclient.c
+++ usr.sbin/ypldap/ldapclient.c
@@ -172,7 +172,7 @@
fatalx("unknown event");
if (events & EV_READ) {
- if ((n = imsg_read(ibuf)) == -1)
+ if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
fatal("imsg_read error");
if (n == 0)
shut = 1;
@@ -275,7 +275,7 @@
fatalx("unknown event");
if (events & EV_READ) {
- if ((n = imsg_read(ibuf)) == -1)
+ if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
fatal("imsg_read error");
if (n == 0)
shut = 1;
@@ -377,8 +377,10 @@
bzero(&env, sizeof(env));
TAILQ_INIT(&env.sc_idms);
- if ((pw = getpwnam(YPLDAP_USER)) == NULL)
+ if ((pw = getpwnam(YPLDAP_USER)) == NULL) {
+ printf("ldapclient.c error\n");
fatal("getpwnam");
+ }
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_dns) == -1)
fatal("socketpair");
@@ -386,12 +388,14 @@
close(pipe_dns[1]);
#ifndef DEBUG
+/*
if (chroot(pw->pw_dir) == -1)
fatal("chroot");
if (chdir("/") == -1)
fatal("chdir");
+*/
#else
-#warning disabling chrooting in DEBUG mode
+//#warning disabling chrooting in DEBUG mode
#endif
setproctitle("ldap client");
ypldap_process = PROC_CLIENT;
@@ -402,7 +406,7 @@
setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
fatal("cannot drop privileges");
#else
-#warning disabling privilege revocation in DEBUG mode
+//#warning disabling privilege revocation in DEBUG mode
#endif
event_init();
Index: usr.sbin/ypldap/ypldap.c
===================================================================
--- usr.sbin/ypldap/ypldap.c
+++ usr.sbin/ypldap/ypldap.c
@@ -361,7 +361,7 @@
fatalx("unknown event");
if (events & EV_READ) {
- if ((n = imsg_read(ibuf)) == -1)
+ if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
fatal("imsg_read error");
if (n == 0)
shut = 1;
@@ -598,8 +598,10 @@
yp_init(&env);
- if ((pw = getpwnam(YPLDAP_USER)) == NULL)
+ if ((pw = getpwnam(YPLDAP_USER)) == NULL) {
+ printf("ypldap.c error\n");
fatal("getpwnam");
+ }
#ifndef DEBUG
if (setgroups(1, &pw->pw_gid) ||
@@ -607,7 +609,7 @@
setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
fatal("cannot drop privileges");
#else
-#warning disabling privilege revocation in debug mode
+//#warning disabling privilege revocation in debug mode
#endif
bzero(&tv, sizeof(tv));
Index: usr.sbin/ypldap/ypldap_dns.c
===================================================================
--- usr.sbin/ypldap/ypldap_dns.c
+++ usr.sbin/ypldap/ypldap_dns.c
@@ -140,7 +140,7 @@
fatalx("unknown event");
if (events & EV_READ) {
- if ((n = imsg_read(ibuf)) == -1)
+ if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
fatal("imsg_read error");
if (n == 0)
shut = 1;

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 1:08 PM (10 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32279872
Default Alt Text
D4547.id11220.diff (2 KB)

Event Timeline