From 6791f79bec6c951e46f2edf22d5925025926945e Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 20 May 2009 17:17:33 +0000
Subject: [PATCH] fixed support for 2.1
---
src/common/slurm_protocol_common.h | 2 +-
src/common/slurm_protocol_util.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/common/slurm_protocol_common.h b/src/common/slurm_protocol_common.h
index 30f1e451f78..8e97e99cc4f 100644
--- a/src/common/slurm_protocol_common.h
+++ b/src/common/slurm_protocol_common.h
@@ -65,7 +65,7 @@
/* slurm protocol header defines, based upon config.h, 16 bits */
/* A new SLURM_PROTOCOL_VERSION needs to be made each time the version
* changes so the slurmdbd can talk all versions for update messages.
- * In slurm_protocol_util.h init_header(), and check_header_version()
+ * In slurm_protocol_util.h check_header_version(), and init_header()
* need to be updated also when changes are added */
#define SLURM_PROTOCOL_VERSION ((SLURM_API_MAJOR << 8) | SLURM_API_AGE)
#define SLURM_2_0_PROTOCOL_VERSION ((20 << 8) | 0)
diff --git a/src/common/slurm_protocol_util.c b/src/common/slurm_protocol_util.c
index 73bda87537b..90f34b5f105 100644
--- a/src/common/slurm_protocol_util.c
+++ b/src/common/slurm_protocol_util.c
@@ -57,6 +57,7 @@ int check_header_version(header_t * header)
{
if(slurmdbd_conf) {
if (header->version != SLURM_PROTOCOL_VERSION
+ && header->version != SLURM_2_0_PROTOCOL_VERSION
&& header->version != SLURM_1_3_PROTOCOL_VERSION)
slurm_seterrno_ret(SLURM_PROTOCOL_VERSION_ERROR);
} else if (header->version != SLURM_PROTOCOL_VERSION)
--
GitLab