Skip to content
Snippets Groups Projects
Commit 2e6bf34b authored by Moe Jette's avatar Moe Jette
Browse files

Remove logic to block signals before call to munge_decode().

This logic was added temporarily for testing gnats slurm/223.
parent a7eb09f8
No related branches found
No related tags found
No related merge requests found
...@@ -441,7 +441,6 @@ static int ...@@ -441,7 +441,6 @@ static int
_decode_cred(char *m, slurm_auth_credential_t *c) _decode_cred(char *m, slurm_auth_credential_t *c)
{ {
int retry = 2; int retry = 2;
sigset_t set, oset;
munge_err_t e; munge_err_t e;
munge_ctx_t ctx; munge_ctx_t ctx;
...@@ -458,18 +457,6 @@ _decode_cred(char *m, slurm_auth_credential_t *c) ...@@ -458,18 +457,6 @@ _decode_cred(char *m, slurm_auth_credential_t *c)
return SLURM_ERROR; return SLURM_ERROR;
} }
/*
* Block all signals to allow munge_decode() to proceed
* uninterrupted. (Testing for gnats slurm/223)
*/
sigemptyset(&oset); /* for clean valgrind */
sigfillset(&set);
sigdelset(&set, SIGABRT);
sigdelset(&set, SIGSEGV);
sigdelset(&set, SIGILL);
if (pthread_sigmask(SIG_SETMASK, &set, &oset) < 0)
error("pthread_sigmask: %m");
again: again:
if ((e = munge_decode(m, ctx, &c->buf, &c->len, &c->uid, &c->gid))) { if ((e = munge_decode(m, ctx, &c->buf, &c->len, &c->uid, &c->gid))) {
error ("Munge decode failed: %s %s", error ("Munge decode failed: %s %s",
...@@ -491,9 +478,6 @@ _decode_cred(char *m, slurm_auth_credential_t *c) ...@@ -491,9 +478,6 @@ _decode_cred(char *m, slurm_auth_credential_t *c)
c->verified = true; c->verified = true;
done: done:
if (pthread_sigmask(SIG_SETMASK, &oset, NULL) < 0)
error("pthread_sigmask: %m");
munge_ctx_destroy(ctx); munge_ctx_destroy(ctx);
return e ? SLURM_ERROR : SLURM_SUCCESS; return e ? SLURM_ERROR : SLURM_SUCCESS;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment