diff options
Diffstat (limited to 'isisd/isis_dlpi.c')
| -rw-r--r-- | isisd/isis_dlpi.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c index 718f3a8982..54a19ad239 100644 --- a/isisd/isis_dlpi.c +++ b/isisd/isis_dlpi.c @@ -36,6 +36,7 @@ #include "network.h" #include "stream.h" #include "if.h" +#include "lib_errors.h" #include "isisd/dict.h" #include "isisd/isis_constants.h" @@ -467,31 +468,26 @@ int isis_sock_init(struct isis_circuit *circuit) { int retval = ISIS_OK; - if (isisd_privs.change(ZPRIVS_RAISE)) - zlog_err("%s: could not raise privs, %s", __func__, - safe_strerror(errno)); + frr_elevate_privs(&isisd_privs) { - retval = open_dlpi_dev(circuit); + retval = open_dlpi_dev(circuit); - if (retval != ISIS_OK) { - zlog_warn("%s: could not initialize the socket", __func__); - goto end; - } + if (retval != ISIS_OK) { + zlog_warn("%s: could not initialize the socket", + __func__); + break; + } - if (circuit->circ_type == CIRCUIT_T_BROADCAST) { - circuit->tx = isis_send_pdu_bcast; - circuit->rx = isis_recv_pdu_bcast; - } else { - zlog_warn("isis_sock_init(): unknown circuit type"); - retval = ISIS_WARNING; - goto end; + if (circuit->circ_type == CIRCUIT_T_BROADCAST) { + circuit->tx = isis_send_pdu_bcast; + circuit->rx = isis_recv_pdu_bcast; + } else { + zlog_warn("isis_sock_init(): unknown circuit type"); + retval = ISIS_WARNING; + break; + } } -end: - if (isisd_privs.change(ZPRIVS_LOWER)) - zlog_err("%s: could not lower privs, %s", __func__, - safe_strerror(errno)); - return retval; } |