Merge pull request wolfSSL#629 from JacobBarthelmeh/usr

add override for default sshd user
philljj · Dec 9, 2023 · 7f52e23 · 7f52e23
2 parents bb62158 + 9cc9711
commit 7f52e23
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/apps/wolfsshd/auth.c b/apps/wolfsshd/auth.c
@@ -1363,20 +1363,26 @@ static int SetDefaultPublicKeyCheck(WOLFSSHD_AUTH* auth)
     return ret;
 }
 
+#ifndef WOLFSSH_SSHD_USER
+    #define WOLFSSH_SSHD_USER sshd
+#endif
+#define WOLFSSH_USER_GET_STRING(x) #x
+#define WOLFSSH_USER_STRING(x) WOLFSSH_USER_GET_STRING(x)
+
 static int SetDefualtUserID(WOLFSSHD_AUTH* auth)
 {
 #ifdef _WIN32
     /* TODO: Implement for Windows. */
     return 0;
 #else
     struct passwd* pwInfo;
-    const char* usr = "sshd";
     int ret = WS_SUCCESS;
 
-    pwInfo = getpwnam(usr);
+    pwInfo = getpwnam(WOLFSSH_USER_STRING(WOLFSSH_SSHD_USER));
     if (pwInfo == NULL) {
         /* user name not found on system */
-        wolfSSH_Log(WS_LOG_INFO, "[SSHD] No sshd user found to use");
+        wolfSSH_Log(WS_LOG_INFO, "[SSHD] No %s user found to use",
+            WOLFSSH_USER_STRING(WOLFSSH_SSHD_USER));
         ret = WS_FATAL_ERROR;
     }