mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Merge commit '5daec239' into thread-merge-2.16

Browse Source
This commit is contained in:
Maria Matejka 2024-11-28 12:19:27 +01:00
commit 44efc912d5
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mailmap Normal file
View File

@ -0,0 +1,2 @@
Maria Matejka <mq@ucw.cz>
Maria Matejka <mq@jmq.cz>

5
CONTRIBUTING.md
View File

@ -90,7 +90,10 @@ The credits are scattered over all the source code files; in the commentary
section, you may find typically the original authors of these files or some section, you may find typically the original authors of these files or some
major contributors who felt like adding their names there. Overall, if you feel major contributors who felt like adding their names there. Overall, if you feel
like your name should be there, include this change in your commits please. like your name should be there, include this change in your commits please.
If your name should be changed, please do that change there.
If your name should be changed, please do that change in the source code files.
If your name should be changed in the displayed git commit author / commiter
logs, please submit a patch on the `.mailmap` file.
We are planning to centralize the credits one day; we'll then update this file We are planning to centralize the credits one day; we'll then update this file
accordingly. accordingly.

2
configure.ac
View File

@ -114,7 +114,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt posix4],
AC_CANONICAL_HOST AC_CANONICAL_HOST
# Store this value because ac_test_CFLAGS is overwritten by AC_PROG_CC # Store this value because ac_test_CFLAGS is overwritten by AC_PROG_CC
if test "$ac_test_CFLAGS" != set ; then if ! test "$ac_test_CFLAGS" ; then
bird_cflags_default=yes bird_cflags_default=yes
fi fi

6
sysdep/unix/main.c
View File

@ -611,7 +611,6 @@ static void
cli_init_unix(uid_t use_uid, gid_t use_gid) cli_init_unix(uid_t use_uid, gid_t use_gid)
{ {
ASSERT_DIE(main_control_socket_config == NULL); ASSERT_DIE(main_control_socket_config == NULL);
cli_init();
main_control_socket_config = &initial_control_socket_config; main_control_socket_config = &initial_control_socket_config;
main_control_socket_config->uid = use_uid; main_control_socket_config->uid = use_uid;
@ -626,6 +625,9 @@ cli_init_unix(uid_t use_uid, gid_t use_gid)
static void static void
cli_preconfig(struct config *c) cli_preconfig(struct config *c)
{ {
if (!main_control_socket_config)
return;
struct cli_config *ccf = mb_alloc(cli_pool, sizeof *ccf); struct cli_config *ccf = mb_alloc(cli_pool, sizeof *ccf);
memcpy(ccf, main_control_socket_config, sizeof *ccf); memcpy(ccf, main_control_socket_config, sizeof *ccf);
ccf->n = (struct cli_config_node) {}; ccf->n = (struct cli_config_node) {};
@ -1028,6 +1030,8 @@ main(int argc, char **argv)
uid_t use_uid = get_uid(use_user); uid_t use_uid = get_uid(use_user);
gid_t use_gid = get_gid(use_group); gid_t use_gid = get_gid(use_group);
cli_init();
if (!parse_and_exit) if (!parse_and_exit)
{ {
test_old_bird(path_control_socket); test_old_bird(path_control_socket);