diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h index f8f6e863ee7de1608a2cd545fb5ea4bd813c90b8..a2f313f28bdc372bac8b61f601617573e24d33c3 100644 --- a/src/common/slurm_protocol_defs.h +++ b/src/common/slurm_protocol_defs.h @@ -210,7 +210,7 @@ typedef struct uint32_t job_id; uid_t user_id; char* node_list; - time_t experation_time; + time_t expiration_time; char signature[SLURM_SSL_SIGNATURE_LENGTH]; /* What are we going to do here? */ } slurm_job_credential_t; diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c index e7d8d74056a3cdaff57779809cc52673487f2985..5451b07f6c2aa59073e1d1a97db402fa48b0edd2 100644 --- a/src/common/slurm_protocol_pack.c +++ b/src/common/slurm_protocol_pack.c @@ -682,7 +682,7 @@ void pack_job_credential ( slurm_job_credential_t* cred , void ** buffer , uint3 pack32( cred->job_id, buffer, length ) ; pack16( (uint16_t) cred->user_id, buffer, length ) ; packstr( cred->node_list, buffer, length ) ; - pack32( cred->experation_time, buffer, length ) ; + pack32( cred->expiration_time, buffer, length ) ; for ( i = 0; i < sizeof( cred->signature ); i++ ) /* this is a fixed size array */ pack8( cred->signature[i], buffer, length ); } @@ -700,7 +700,7 @@ int unpack_job_credential( slurm_job_credential_t** msg , void ** buffer , uint3 unpack32( &(tmp_ptr->job_id), buffer, length ) ; unpack16( (uint16_t*) &(tmp_ptr->user_id), buffer, length ) ; unpackstr_xmalloc ( &(tmp_ptr->node_list), &uint16_tmp, ( void ** ) buffer , length ) ; - unpack32( (uint32_t*) &(tmp_ptr->experation_time), buffer, length ) ; /* What are we going to do about time_t ? */ + unpack32( (uint32_t*) &(tmp_ptr->expiration_time), buffer, length ) ; /* What are we going to do about time_t ? */ for ( i = 0; i < sizeof( tmp_ptr->signature ); i++ ) /* this is a fixed size array */ unpack8( (uint8_t*)(tmp_ptr->signature + i), buffer, length ); diff --git a/testsuite/slurm_unit/slurmctld/job_step-test.c b/testsuite/slurm_unit/slurmctld/job_step-test.c index 1819ce265d60f228de2ad5e7c79fc3a802eea205..53b62e101888bea14083aca6bbf070e4e0812b2f 100644 --- a/testsuite/slurm_unit/slurmctld/job_step-test.c +++ b/testsuite/slurm_unit/slurmctld/job_step-test.c @@ -75,11 +75,11 @@ main( int argc, char* argv[]) job_step_create_response_msg_t* msg = (job_step_create_response_msg_t *) response_msg.data ; printf("job_step_id = %u\n ", msg-> job_step_id ); printf("node_list = %s\n", msg->node_list ); - printf("credentials:\n\tjob_id = %u\n\tuser_id = %u\n\tnode_list = %s\n\texperation_time = %lu\n\tsignature = %u\n\n", + printf("credentials:\n\tjob_id = %u\n\tuser_id = %u\n\tnode_list = %s\n\texpiration_time = %lu\n\tsignature = %u\n\n", msg->credentials->job_id, msg->credentials->user_id, msg->credentials->node_list, - msg->credentials->experation_time, + msg->credentials->expiration_time, msg->credentials->signature); #ifdef HAVE_LIBELAN3 /* print the elan stuff */ diff --git a/testsuite/slurm_unit/slurmctld/step_create.c b/testsuite/slurm_unit/slurmctld/step_create.c index 7c877f122370c95f9ae11815ee96b9198f2faef4..c0d868ce26be398fe5275b20d0da4171992ee203 100644 --- a/testsuite/slurm_unit/slurmctld/step_create.c +++ b/testsuite/slurm_unit/slurmctld/step_create.c @@ -54,11 +54,11 @@ main( int argc, char* argv[]) job_step_create_response_msg_t* msg = (job_step_create_response_msg_t *) response_msg.data ; printf("job_step_id = %u\n ", msg-> job_step_id ); printf("node_list = %s\n", msg->node_list ); - printf("credentials:\n\tjob_id = %u\n\tuser_id = %u\n\tnode_list = %s\n\texperation_time = %lu\n\tsignature = %u\n\n", + printf("credentials:\n\tjob_id = %u\n\tuser_id = %u\n\tnode_list = %s\n\texpiration_time = %lu\n\tsignature = %u\n\n", msg->credentials->job_id, msg->credentials->user_id, msg->credentials->node_list, - msg->credentials->experation_time, + msg->credentials->expiration_time, msg->credentials->signature); #ifdef HAVE_LIBELAN3 /* print the elan stuff */