Update security tests for changes in RPM data structures.

testsuite/slurm_unit/slurmctld/security_2_1.csh

@@ -2,7 +2,7 @@
 setenv CONFIG /etc/slurm/slurm.conf
 setenv DEPLOY /usr
 
-echo "Insure that files are not user writable"
+echo "Insure that executable files are not user writable"
 ls -ld $DEPLOY/bin/srun
 ls -ld $DEPLOY/bin/sinfo
 ls -ld $DEPLOY/bin/squeue
@@ -21,18 +21,18 @@ grep JobCredential $CONFIG
 ls -ld /etc/slurm/slurm.key
 ls -ld /etc/slurm/slurm.cert
 
+echo "Plugin directory and its contents must be non-writable"
 grep PluginDir $CONFIG
 ls -ld /usr/lib/slurm
 ls -l  /usr/lib/slurm
 
-grep Prioritize $CONFIG
-#echo "Prioritize will move to a plugin"
-
 grep Prolog $CONFIG
 #ls -ld /admin/sbin/slurm.prolog
 
+echo "Spool and log files must be non-writeable"
 grep SlurmdSpoolDir $CONFIG
-ls -ld /tmp/slurmd
-
+ls -ld /var/spool/slurm
 grep StateSaveLocation $CONFIG
 ls -ld /usr/local/tmp/slurm/adev
+grep SlurmctldLogFile $CONFIG
+ls -ld /var/log/slurm/slurmctld.log

testsuite/slurm_unit/slurmd/security_3_1.c

@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
 {
 	batch_job_launch_msg_t launch_msg;
 	int uid;
-	uint32_t jid;
+	uint32_t jid, cpu_arr[1];
 
 	if (argc != 2) {
 		_usage(argv[0]);
@@ -40,6 +40,10 @@ int main(int argc, char *argv[])
 	launch_msg.job_id	= jid;
 	launch_msg.uid		= uid;
 	launch_msg.nodes	= argv[1];
+	launch_msg.num_cpu_groups	= 1;
+	cpu_arr[0]			= 1;
+	launch_msg.cpus_per_node	= cpu_arr;
+	launch_msg.cpu_count_reps	= cpu_arr;
 	launch_msg.err		= "/dev/null";
 	launch_msg.in		= "/dev/null";
 	launch_msg.out		= "/dev/null";