From c2e7a615bdac06dce878317dad3c613f85da8637 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 26 Jun 2008 16:17:40 +0000
Subject: [PATCH] made error about finding syms in the plugin into a debug4
---
src/common/plugin.c | 4 ++--
src/plugins/auth/munge/auth_munge.c | 30 +++++++++++++++++++++--------
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 772edb27508..143e82ee0c2 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -301,8 +301,8 @@ plugin_get_syms( plugin_handle_t plug,
if ( ptrs[ i ] )
++count;
else
- error("Couldn't find sym '%s' in the plugin",
- names[ i ]);
+ debug4("Couldn't find sym '%s' in the plugin",
+ names[ i ]);
}
return count;
diff --git a/src/plugins/auth/munge/auth_munge.c b/src/plugins/auth/munge/auth_munge.c
index c2eedc0af41..d30242dcdec 100644
--- a/src/plugins/auth/munge/auth_munge.c
+++ b/src/plugins/auth/munge/auth_munge.c
@@ -482,15 +482,29 @@ _decode_cred(slurm_auth_credential_t *c, char *socket)
munge_ctx_strerror(ctx));
goto again;
}
-
- /*
- * Print any valid credential data
+#ifdef MULTIPLE_SLURMD
+ /* In multple slurmd mode this will happen all the
+ * time since we are authenticating with the same
+ * munged.
*/
- error ("Munge decode failed: %s", munge_ctx_strerror(ctx));
- _print_cred(ctx);
-
- plugin_errno = e + MUNGE_ERRNO_OFFSET;
-
+ if (e != EMUNGE_CRED_REPLAYED) {
+#endif
+ /*
+ * Print any valid credential data
+ */
+ error ("Munge decode failed: %s",
+ munge_ctx_strerror(ctx));
+ _print_cred(ctx);
+
+ plugin_errno = e + MUNGE_ERRNO_OFFSET;
+#ifdef MULTIPLE_SLURMD
+ } else {
+ debug2("We had a replayed cred, "
+ "but this is expected in multiple "
+ "slurmd mode.");
+ e = 0;
+ }
+#endif
goto done;
}
--
GitLab