2015-11-09 23:32:33

by Laurent Bigonville

Subject: [PATCH] Delete the unix socket only if we have created it

From: Laurent Bigonville <[email protected]>

If systemd has created the unix socket on our behalf, we shouldn't try
to delete it.

https://bugzilla.redhat.com/show_bug.cgi?id=1279076

Signed-off-by: Laurent Bigonville <[email protected]>
---
src/rpcbind.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/rpcbind.c b/src/rpcbind.c
index 045daa1..c4265cd 100644
--- a/src/rpcbind.c
+++ b/src/rpcbind.c
@@ -87,6 +87,7 @@ static inline void __nss_configure_lookup(const char *db, const char *s) {}
int debugging = 0; /* Tell me what's going on */
int doabort = 0; /* When debugging, do an abort on errors */
int dofork = 1; /* fork? */
+int createdsocket = 0; /* Did I create the socket or systemd did it for me? */

rpcblist_ptr list_rbl; /* A list of version 3/4 rpcbind services */

@@ -445,6 +446,7 @@ init_transport(struct netconfig *nconf)
memset(&sun, 0, sizeof sun);
sun.sun_family = AF_LOCAL;
unlink(_PATH_RPCBINDSOCK);
+ createdsocket = 1; /* We are now in the process of creating the unix socket */
strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
addrlen = SUN_LEN(&sun);
sa = (struct sockaddr *)&sun;
@@ -846,7 +848,8 @@ static void
terminate(int dummy /*__unused*/)
{
close(rpcbindlockfd);
- unlink(_PATH_RPCBINDSOCK);
+ if(createdsocket)
+ unlink(_PATH_RPCBINDSOCK);
unlink(RPCBINDDLOCK);
#ifdef WARMSTART
write_warmstart(); /* Dump yourself */
--
2.6.2

2015-11-18 20:14:30

by Steve Dickson

Subject: Re: [PATCH] Delete the unix socket only if we have created it

On 11/09/2015 06:25 PM, Laurent Bigonville wrote:
> From: Laurent Bigonville <[email protected]>
>
> If systemd has created the unix socket on our behalf, we shouldn't try
> to delete it.
>
> https://bugzilla.redhat.com/show_bug.cgi?id=1279076
>
> Signed-off-by: Laurent Bigonville <[email protected]>
Committed...

steved.
> ---
> src/rpcbind.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/src/rpcbind.c b/src/rpcbind.c
> index 045daa1..c4265cd 100644
> --- a/src/rpcbind.c
> +++ b/src/rpcbind.c
> @@ -87,6 +87,7 @@ static inline void __nss_configure_lookup(const char *db, const char *s) {}
> int debugging = 0; /* Tell me what's going on */
> int doabort = 0; /* When debugging, do an abort on errors */
> int dofork = 1; /* fork? */
> +int createdsocket = 0; /* Did I create the socket or systemd did it for me? */
>
> rpcblist_ptr list_rbl; /* A list of version 3/4 rpcbind services */
>
> @@ -445,6 +446,7 @@ init_transport(struct netconfig *nconf)
> memset(&sun, 0, sizeof sun);
> sun.sun_family = AF_LOCAL;
> unlink(_PATH_RPCBINDSOCK);
> + createdsocket = 1; /* We are now in the process of creating the unix socket */
> strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
> addrlen = SUN_LEN(&sun);
> sa = (struct sockaddr *)&sun;
> @@ -846,7 +848,8 @@ static void
> terminate(int dummy /*__unused*/)
> {
> close(rpcbindlockfd);
> - unlink(_PATH_RPCBINDSOCK);
> + if(createdsocket)
> + unlink(_PATH_RPCBINDSOCK);
> unlink(RPCBINDDLOCK);
> #ifdef WARMSTART
> write_warmstart(); /* Dump yourself */
>