Generic Rikka
8beaafa1d9
Changelog: https://github.com/SchedMD/slurm/blob/slurm-26-05-1-1/CHANGELOG/slurm-26.05.md - Remove unnecessary GUI_CONFIGURE_OFF and S2N_CONFIGURE_OFF - GUI_CONFIGURE_ENABLE and S2N_CONFIGURE_WITH cover them. - Fix warnings from portclippy. - Fix detection of the s2n in configure. - Refresh patches. PR: 295969 Sponsored by: UNIS Labs Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org> MFH: 2026Q2
28 lines
986 B
C
28 lines
986 B
C
--- src/common/stepd_proxy.c.orig 2026-06-09 20:26:02 UTC
|
|
+++ src/common/stepd_proxy.c
|
|
@@ -40,6 +40,7 @@
|
|
#include "src/common/read_config.h"
|
|
#include "src/common/slurm_protocol_api.h"
|
|
#include "src/common/slurm_protocol_pack.h"
|
|
+#include "src/common/slurm_sockaddr.h"
|
|
#include "src/common/stepd_api.h"
|
|
#include "src/common/stepd_proxy.h"
|
|
#include "src/common/xmalloc.h"
|
|
@@ -297,13 +298,14 @@ static int _stepd_connect_to_slurmd(void)
|
|
static int _stepd_connect_to_slurmd(void)
|
|
{
|
|
struct sockaddr_un slurmd_addr = { .sun_family = AF_UNIX };
|
|
- size_t len;
|
|
+ socklen_t len;
|
|
int fd;
|
|
|
|
(void) snprintf(slurmd_addr.sun_path, sizeof(slurmd_addr.sun_path),
|
|
"%s/slurmd.socket", slurmd_spooldir);
|
|
|
|
- len = strlen(slurmd_addr.sun_path) + 1 + sizeof(slurmd_addr.sun_family);
|
|
+ len = slurm_sockaddr_fixlen((struct sockaddr *)&slurmd_addr,
|
|
+ (socklen_t)sizeof(slurmd_addr));
|
|
|
|
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
|
|
error("%s: socket() failed: %m", __func__);
|