From 958e320077c67065505bdb42f02fedef2d8574bd Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 28 Oct 2010 17:34:13 +0000
Subject: [PATCH] fixes to the last merge that are 2.2 specific

---
 src/sbatch/opt.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 051f44b1099..b636cc50020 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -625,14 +625,14 @@ _process_env_var(env_vars_t *e, const char *val)
 		}
 		break;
 	case OPT_GET_USER_ENV:
-		if (optarg)
-			_proc_get_user_env(optarg);
+		if (val)
+			_proc_get_user_env((char *)val);
 		else
 			opt.get_user_env_time = 0;
 		break;
 	case OPT_CLUSTERS:
-		if (!(opt.clusters = slurmdb_get_info_cluster(optarg))) {
-			error("'%s' invalid entry for --clusters", optarg);
+		if (!(opt.clusters = slurmdb_get_info_cluster((char *)val))) {
+			error("'%s' invalid entry for --clusters", val);
 			exit(1);
 		}
 		break;
-- 
GitLab