From cd85c6f3120f55e15c44a4f8de22e6ed28baea3a Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 31 Mar 2011 18:29:49 +0000
Subject: [PATCH] largely revert previous change with respect to cray.conf.
---
doc/man/man5/cray.conf.5 | 4 ++--
src/plugins/select/cray/cray_config.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/man/man5/cray.conf.5 b/doc/man/man5/cray.conf.5
index 94f06879edb..2bd8cb2ca55 100644
--- a/doc/man/man5/cray.conf.5
+++ b/doc/man/man5/cray.conf.5
@@ -48,7 +48,7 @@ The default value is \fIsdb\fR.
.TP
\fBSDBpass\fR=<password>
Password used to access the ALPS database.
-The default value is \fIbasic\fR.
+The default value is NULL, which will load the password from the \fImy.cnf\fR file.
.TP
\fBSDBport\fR=<port_number>
@@ -58,7 +58,7 @@ The default value is 0.
.TP
\fBSDBuser\fR=<user_name>
Name of user used to access the ALPS database.
-The default value is \fIbasic\fR.
+The default value is NULL, which will load the user name from the \fImy.cnf\fR file.
.SH "EXAMPLE"
.LP
diff --git a/src/plugins/select/cray/cray_config.h b/src/plugins/select/cray/cray_config.h
index a68c2dba1fc..e34bea345c2 100644
--- a/src/plugins/select/cray/cray_config.h
+++ b/src/plugins/select/cray/cray_config.h
@@ -68,11 +68,11 @@ typedef struct {
/* DNS name of SDB host */
#define DEFAULT_CRAY_SDB_HOST "sdb"
/* If NULL, use value from my.cnf */
-#define DEFAULT_CRAY_SDB_PASS "basic"
+#define DEFAULT_CRAY_SDB_PASS NULL
/* If NULL, use value from my.cnf */
#define DEFAULT_CRAY_SDB_PORT 0
/* If NULL, use value from my.cnf */
-#define DEFAULT_CRAY_SDB_USER "basic"
+#define DEFAULT_CRAY_SDB_USER NULL
extern cray_config_t *cray_conf;
--
GitLab