Re: ldpd engine process exits with pledge "cpath"

[wlund]

Hi!

Ricardo Mestre <ser...@helheim.mooo.com> wrote:
> this is getting in my nerves, I made a wrong assumption here and I
> prefer to commit this than backout my previous commit so I'm asking for
> commits for the below.

attached. I hope I understood your intention.

> 
> On 14:43 Fri 19 Jun     , Ricardo Mestre wrote:
> > mea culpa, but I'd rather just remove the unlink of the socket.
> > 
> > OK?
> > 
> > Index: control.c
> > ===================================================================
> > RCS file: /cvs/src/usr.sbin/ldpd/control.c,v
> > retrieving revision 1.29
> > diff -u -p -u -r1.29 control.c
> > --- control.c       3 Mar 2017 23:30:57 -0000       1.29
> > +++ control.c       19 Jun 2020 13:40:46 -0000
> > @@ -98,11 +98,10 @@ control_listen(void)
> >  }
> >  
> >  void
> > -control_cleanup(char *path)
> > +control_cleanup(void)
> >  {
> >     accept_del(control_fd);
> >     close(control_fd);
> > -   unlink(path);
> >  }
> >  
> >  /* ARGSUSED */
> > Index: control.h
> > ===================================================================
> > RCS file: /cvs/src/usr.sbin/ldpd/control.h,v
> > retrieving revision 1.9
> > diff -u -p -u -r1.9 control.h
> > --- control.h       3 Mar 2017 23:30:57 -0000       1.9
> > +++ control.h       19 Jun 2020 13:40:46 -0000
> > @@ -32,7 +32,7 @@ extern struct ctl_conns ctl_conns;
> >  
> >  int        control_init(char *);
> >  int        control_listen(void);
> > -void       control_cleanup(char *);
> > +void       control_cleanup(void);
> >  int        control_imsg_relay(struct imsg *);
> >  
> >  #endif     /* _CONTROL_H_ */
> > Index: ldpe.c
> > ===================================================================
> > RCS file: /cvs/src/usr.sbin/ldpd/ldpe.c,v
> > retrieving revision 1.76
> > diff -u -p -u -r1.76 ldpe.c
> > --- ldpe.c  10 Aug 2019 01:30:53 -0000      1.76
> > +++ ldpe.c  19 Jun 2020 13:40:46 -0000
> > @@ -171,7 +171,7 @@ ldpe_shutdown(void)
> >     msgbuf_clear(&iev_main->ibuf.w);
> >     close(iev_main->ibuf.fd);
> >  
> > -   control_cleanup(global.csock);
> > +   control_cleanup();
> >     config_clear(leconf);
> >  
> >     if (sysdep.no_pfkey == 0) {
> > 


diff refs/heads/master 1544d4b6d260a07402505aca7822cc1399dacf31
blob - fe0eebdbea6bc8a5090782a5cd91f4c803651caf
blob + 071953e26373fd816177e39876fa1065f7c32835
--- usr.sbin/ldpd/control.c
+++ usr.sbin/ldpd/control.c
@@ -98,11 +98,10 @@ control_listen(void)
 }
 
 void
-control_cleanup(char *path)
+control_cleanup(void)
 {
        accept_del(control_fd);
        close(control_fd);
-       unlink(path);
 }
 
 /* ARGSUSED */
blob - f4f5525707d23ffb059e229177b0840fc1e31230
blob + 7e74ac093d7e8b16e7b9ea19362d3116d3edf2e9
--- usr.sbin/ldpd/control.h
+++ usr.sbin/ldpd/control.h
@@ -32,7 +32,7 @@ extern struct ctl_conns ctl_conns;
 
 int    control_init(char *);
 int    control_listen(void);
-void   control_cleanup(char *);
+void   control_cleanup(void);
 int    control_imsg_relay(struct imsg *);
 
 #endif /* _CONTROL_H_ */
blob - 6200d552882ca678e391c59922ccf358439ddac4
blob + a8d2a8a9c842d045588defa9a53dcb1caeda765a
--- usr.sbin/ldpd/ldpe.c
+++ usr.sbin/ldpd/ldpe.c
@@ -171,7 +171,7 @@ ldpe_shutdown(void)
        msgbuf_clear(&iev_main->ibuf.w);
        close(iev_main->ibuf.fd);
 
-       control_cleanup(global.csock);
+       control_cleanup();
        config_clear(leconf);
 
        if (sysdep.no_pfkey == 0) {