diff --git a/doc/html/authplugins.shtml b/doc/html/authplugins.shtml index 02c221822c5eb5f34c6a76130731acd2c1de80e6..782117ad6c93ef331512fbebf3daa8e364cde268 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 95880d165d1dc8eca30c8907ce1ae203fc84c562..1f18faa3b4add267821e1a7ec857b9369fe4a132 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 af7b4142ab5408444934bab9b6a7d0734630a0b2..d4654e0cf71514ed246a6d05a3e35dbe5accafc5 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 b6027ed4b41891ccd5d2208f98bce3b62c78bbd0..4489dd8cfe4fe0fd7709f915605d95d3b6232769 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 6803a03dbe17802c3027360156a1cff9ca0897b5..c3216c1483184a0953f28b98f6d940522e43ef6c 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 a052d53970038c188d8d273db7f90d07c90c6407..6ccafcc29f54c739ec8e887669c4259429714f4f 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";