diff options
Diffstat (limited to 'ldpd/ldpd.c')
| -rw-r--r-- | ldpd/ldpd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 4d38fdcd02..e4e1dc6fec 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -74,7 +74,7 @@ DEFINE_QOBJ_TYPE(ldpd_conf); const char *log_procname; struct ldpd_global global; -struct ldpd_init init; +struct ldpd_init ldp_init; struct ldpd_conf *ldpd_conf, *vty_conf; static struct imsgev *iev_ldpe, *iev_ldpe_sync; @@ -272,8 +272,8 @@ main(int argc, char *argv[]) "%s/" LDPD_SOCK_NAME, optarg); break; case 'n': - init.instance = atoi(optarg); - if (init.instance < 1) + ldp_init.instance = atoi(optarg); + if (ldp_init.instance < 1) exit(0); break; case 'L': @@ -291,11 +291,11 @@ main(int argc, char *argv[]) snprintf(ctl_sock_path, sizeof(ctl_sock_path), "%s/" LDPD_SOCK_NAME, frr_runstatedir); - strlcpy(init.user, ldpd_privs.user, sizeof(init.user)); - strlcpy(init.group, ldpd_privs.group, sizeof(init.group)); - strlcpy(init.ctl_sock_path, ctl_sock_path, sizeof(init.ctl_sock_path)); - strlcpy(init.zclient_serv_path, frr_zclientpath, - sizeof(init.zclient_serv_path)); + strlcpy(ldp_init.user, ldpd_privs.user, sizeof(ldp_init.user)); + strlcpy(ldp_init.group, ldpd_privs.group, sizeof(ldp_init.group)); + strlcpy(ldp_init.ctl_sock_path, ctl_sock_path, sizeof(ldp_init.ctl_sock_path)); + strlcpy(ldp_init.zclient_serv_path, frr_zclientpath, + sizeof(ldp_init.zclient_serv_path)); argc -= optind; if (argc > 0 || (lflag && eflag)) @@ -428,7 +428,7 @@ main(int argc, char *argv[]) fatal("could not establish imsg links"); main_imsg_compose_both(IMSG_DEBUG_UPDATE, &ldp_debug, sizeof(ldp_debug)); - main_imsg_compose_both(IMSG_INIT, &init, sizeof(init)); + main_imsg_compose_both(IMSG_INIT, &ldp_init, sizeof(ldp_init)); main_imsg_send_config(ldpd_conf); if (CHECK_FLAG(ldpd_conf->ipv4.flags, F_LDPD_AF_ENABLED)) |