use VESPA_USER environment variable

* defaults to "yahoo" if VESPA_USER is not set

1 files changed, 8 insertions, 4 deletions

diff --git a/configd/src/apps/su/main.cpp b/configd/src/apps/su/main.cpp
index 7baa726d630..4cce0b5ead0 100644
--- a/configd/src/apps/su/main.cpp
+++ b/configd/src/apps/su/main.cpp
@@ -7,18 +7,22 @@
 
 /**
  * small utility to use instead of "su" when we want to just
- * switch to the "yahoo" user without any more fuss
+ * switch to the vespa user without any more fuss
  **/
 
 int main(int argc, char** argv)
 {
     if (argc < 2) {
-        fprintf(stderr, "missing arguments, usage: run-as-yahoo <cmd> [args ...]");
+        fprintf(stderr, "missing arguments, usage: run-as-yahoo <cmd> [args ...]\n");
         exit(1);
     }
-    struct passwd *p = getpwnam("yahoo");
+    const char *username = getenv("VESPA_USER");
+    if (username == NULL) {
+        username = "yahoo";
+    }
+    struct passwd *p = getpwnam(username);
     if (p == NULL) {
-        perror("FATAL error: user 'yahoo' missing in passwd file");
+        fprintf(stderr, "FATAL error: user '%s' missing in passwd file\n", username);
         exit(1);
     }
     gid_t g = p->pw_gid;