mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00
Code Issues Releases Activity

- Vendor patch from git: do not touch socket before pidfile locking

Browse Source 
Approved by:	maintainer (implicitly)
This commit is contained in:
Sergey Matveychuk 2009-08-21 11:27:49 +00:00
parent d2066ea2f2
commit 2cf9fba891
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=240025
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/quagga/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= quagga
PORTVERSION= 0.99.14
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net ipv6
MASTER_SITES= http://quagga.net/download/ \
http://www.ru.quagga.net/download/ \

59
net/quagga/files/patch-git-2-pidfile-lock-fix Normal file
View File

@ -0,0 +1,59 @@
diff --git a/zebra/main.c b/zebra/main.c
index 14b0273..2d6a4ac 100644
--- zebra/main.c
+++ zebra/main.c
@@ -382,6 +382,9 @@ main (int argc, char **argv)
/* Needed for BSD routing socket. */
pid = getpid ();
+ /* This must be done only after locking pidfile (bug #403). */
+ zebra_zserv_socket_init ();
+
/* Make vty server socket. */
vty_serv_sock (vty_addr, vty_port, ZEBRA_VTYSH_PATH);
diff --git a/zebra/zserv.c b/zebra/zserv.c
index a566e6d..cb5e411 100644
--- zebra/zserv.c
+++ zebra/zserv.c
@@ -1704,13 +1704,6 @@ zebra_init (void)
/* Client list init. */
zebrad.client_list = list_new ();
- /* Make zebra server socket. */
-#ifdef HAVE_TCP_ZEBRA
- zebra_serv ();
-#else
- zebra_serv_un (ZEBRA_SERV_PATH);
-#endif /* HAVE_TCP_ZEBRA */
-
/* Install configuration write function. */
install_node (&table_node, config_write_table);
install_node (&forwarding_node, config_write_forwarding);
@@ -1737,3 +1730,14 @@ zebra_init (void)
/* Route-map */
zebra_route_map_init ();
}
+
+/* Make zebra server socket, wiping any existing one (see bug #403). */
+void
+zebra_zserv_socket_init (void)
+{
+#ifdef HAVE_TCP_ZEBRA
+ zebra_serv ();
+#else
+ zebra_serv_un (ZEBRA_SERV_PATH);
+#endif /* HAVE_TCP_ZEBRA */
+}
diff --git a/zebra/zserv.h b/zebra/zserv.h
index 87a33a4..a737183 100644
--- zebra/zserv.h
+++ zebra/zserv.h
@@ -89,6 +89,7 @@ struct zebra_t
/* Prototypes. */
extern void zebra_init (void);
extern void zebra_if_init (void);
+extern void zebra_zserv_socket_init (void);
extern void hostinfo_get (void);
extern void rib_init (void);
extern void interface_list (void);