From 205d32f3c4737625f5d5f3cdcd9df6d7f9d7b8ff Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 5 Jun 2009 20:37:14 +0000
Subject: [PATCH] Revert authentication plugin version, otherwise we break
authentication of communications to older versions of slurmdbd
---
doc/html/authplugins.shtml | 2 +-
src/common/slurm_auth.c | 3 ++-
src/plugins/auth/authd/auth_authd.c | 2 +-
src/plugins/auth/munge/auth_munge.c | 2 +-
src/plugins/auth/none/auth_none.c | 2 +-
src/slurmdbd/proc_req.c | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/doc/html/authplugins.shtml b/doc/html/authplugins.shtml
index 02c221822c5..782117ad6c9 100644
--- a/doc/html/authplugins.shtml
+++ b/doc/html/authplugins.shtml
@@ -5,7 +5,7 @@
<h2> Overview</h2>
<p> This document describes SLURM authentication plugins and the API that defines
them. It is intended as a resource to programmers wishing to write their own SLURM
-authentication plugins. This is version 100 of the API.</p>
+authentication plugins. This is version 90 of the API.</p>
<p>SLURM authentication plugins are SLURM plugins that implement the SLURM authentication
API described herein. They must conform to the SLURM Plugin API with the following
specifications:</p>
diff --git a/src/common/slurm_auth.c b/src/common/slurm_auth.c
index 95880d165d1..1f18faa3b4a 100644
--- a/src/common/slurm_auth.c
+++ b/src/common/slurm_auth.c
@@ -264,7 +264,8 @@ slurm_auth_generic_errstr( int slurm_errno )
{ SLURM_AUTH_MEMORY, "memory management error" },
{ SLURM_AUTH_NOUSER, "no such user" },
{ SLURM_AUTH_INVALID, "authentication credential invalid" },
- { SLURM_AUTH_MISMATCH, "authentication type mismatch" },
+ { SLURM_AUTH_MISMATCH,
+ "authentication type or verstion mismatch" },
{ 0, NULL }
};
diff --git a/src/plugins/auth/authd/auth_authd.c b/src/plugins/auth/authd/auth_authd.c
index af7b4142ab5..d4654e0cf71 100644
--- a/src/plugins/auth/authd/auth_authd.c
+++ b/src/plugins/auth/authd/auth_authd.c
@@ -65,7 +65,7 @@
const char plugin_name[] = "Brent Chun's authd authentication plugin";
const char plugin_type[] = "auth/authd";
-const uint32_t plugin_version = 100;
+const uint32_t plugin_version = 90;
/*
* Where to find the timeout in the argument vector. This is set
diff --git a/src/plugins/auth/munge/auth_munge.c b/src/plugins/auth/munge/auth_munge.c
index b6027ed4b41..4489dd8cfe4 100644
--- a/src/plugins/auth/munge/auth_munge.c
+++ b/src/plugins/auth/munge/auth_munge.c
@@ -76,7 +76,7 @@
const char plugin_name[] = "auth plugin for Munge (http://home.gna.org/munge/)";
const char plugin_type[] = "auth/munge";
-const uint32_t plugin_version = 100;
+const uint32_t plugin_version = 10;
static int plugin_errno = SLURM_SUCCESS;
diff --git a/src/plugins/auth/none/auth_none.c b/src/plugins/auth/none/auth_none.c
index 6803a03dbe1..c3216c14831 100644
--- a/src/plugins/auth/none/auth_none.c
+++ b/src/plugins/auth/none/auth_none.c
@@ -96,7 +96,7 @@
*/
const char plugin_name[] = "Null authentication plugin";
const char plugin_type[] = "auth/none";
-const uint32_t plugin_version = 100;
+const uint32_t plugin_version = 90;
/*
diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c
index a052d539700..6ccafcc29f5 100644
--- a/src/slurmdbd/proc_req.c
+++ b/src/slurmdbd/proc_req.c
@@ -1533,7 +1533,7 @@ static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
if ((rc = slurmdbd_unpack_init_msg(slurmdbd_conn->rpc_version,
- &init_msg, in_buffer,
+ &init_msg, in_buffer,
slurmdbd_conf->auth_info))
!= SLURM_SUCCESS) {
comment = "Failed to unpack DBD_INIT message";
--
GitLab