Merge branch 'slurm-17.11'

NEWS

@@ -86,6 +86,10 @@ documents those changes that are of interest to users and administrators.
  -- Link slurmd against all libraries that slurmstepd links to.
  -- Fix limits enforce order when they're set at partition and other levels.
  -- Add slurm_load_single_node() function to the Perl API.
+ -- slurm.spec - change dependency for --with lua to use pkgconfig.
+ -- Fix small memory leaks in node_features plugins on reconfigure.
+ -- slurmdbd - only permit requests to update resources from operators or
+    administrators.
 
 * Changes in Slurm 17.11.3-2
 ==========================

doc/man/man1/sinfo.1

@@ -466,7 +466,7 @@ If set only report state information for responding nodes.
 List reasons nodes are in the down, drained, fail or failing state.
 When nodes are in these states Slurm supports optional inclusion
 of a "reason" string by an administrator.
-This option will display the first 35 characters of the reason
+This option will display the first 20 characters of the reason
 field and list of nodes with that reason for all nodes that are,
 by default, down, drained, draining or failing.
 This option may be used with other node filtering options

slurm.spec

@@ -108,11 +108,7 @@ BuildRequires: pkgconfig
 BuildRequires: perl(ExtUtils::MakeMaker)
 
 %if %{with lua}
-%if %{defined suse_version}
-BuildRequires: lua51-devel
-%else
-BuildRequires: lua-devel
-%endif
+BuildRequires: pkgconfig(lua) >= 5.1.0
 %endif
 
 %if %{with hwloc}

src/plugins/accounting_storage/mysql/as_mysql_resource.c

@@ -1038,6 +1038,11 @@ extern List as_mysql_modify_res(mysql_conn_t *mysql_conn, uint32_t uid,
 		return NULL;
 	}
 
+	if (!is_user_min_admin_level(mysql_conn, uid, SLURMDB_ADMIN_OPERATOR)) {
+		errno = ESLURM_ACCESS_DENIED;
+		return NULL;
+	}
+
 	if (check_connection(mysql_conn) != SLURM_SUCCESS) {
 		return NULL;
 	}

src/plugins/job_submit/throttle/job_submit_throttle.c

@@ -3,7 +3,7 @@
  *			    single user can submit based upon configuration.
  *
  *  NOTE: Enforce by configuring
- *  SchedulingParamters=jobs_per_user_per_hour=#
+ *  SchedulingParameters=jobs_per_user_per_hour=#
  *****************************************************************************
  *  Copyright (C) 2014 SchedMD LLC.
  *  Written by Morris Jette <jette@schedmd.com>

src/plugins/launch/slurm/launch_slurm.c

@@ -798,7 +798,7 @@ extern int launch_p_step_launch(srun_job_t *job, slurm_step_io_fds_t *cio_fds,
 		slurm_mutex_lock(&launch_lock);
 		if (!opt_save) {
 			/*
-			 * Save opt_local paramters since _task_finish()
+			 * Save opt_local parameters since _task_finish()
 			 * will lack the values
 			 */
 			opt_save = xmalloc(sizeof(slurm_opt_t));

src/plugins/node_features/knl_cray/node_features_knl_cray.c

@@ -168,7 +168,7 @@ List active_feature_list __attribute__((weak_import));
 List active_feature_list;
 #endif
 
-/* Configuration Paramters */
+/* Configuration Parameters */
 static uint16_t allow_mcdram = KNL_MCDRAM_FLAG;
 static uint16_t allow_numa = KNL_NUMA_FLAG;
 static uid_t *allowed_uid = NULL;
@@ -1788,6 +1788,7 @@ extern int init(void)
 	debug_flag = false;
 	default_mcdram = KNL_CACHE;
 	default_numa = KNL_ALL2ALL;
+	xfree(mc_path);
 	for (i = 0; i < KNL_MCDRAM_CNT; i++)
 		mcdram_pct[i] = -1;
 	mcdram_set = 0;

src/plugins/node_features/knl_generic/node_features_knl_generic.c

@@ -159,7 +159,7 @@ const char plugin_name[]        = "node_features knl_generic plugin";
 const char plugin_type[]        = "node_features/knl_generic";
 const uint32_t plugin_version   = SLURM_VERSION_NUMBER;
 
-/* Configuration Paramters */
+/* Configuration Parameters */
 static uint16_t allow_mcdram = KNL_MCDRAM_FLAG;
 static uint16_t allow_numa = KNL_NUMA_FLAG;
 static uid_t *allowed_uid = NULL;
@@ -816,6 +816,8 @@ extern int init(void)
 	allow_mcdram = KNL_MCDRAM_FLAG;
 	allow_numa = KNL_NUMA_FLAG;
 	xfree(allowed_uid);
+	xfree(mc_path);
+	xfree(syscfg_path);
 	allowed_uid_cnt = 0;
 	for (i = 0; i < KNL_NUMA_CNT; i++)
 		cpu_bind[i] = 0;