Make cli try to read auth token from global home if possible (unix-like systems)

1 files changed, 12 insertions, 0 deletions

diff --git a/cli.cpp b/cli.cpp
index 6dba0674..3121c7d4 100644
--- a/cli.cpp
+++ b/cli.cpp
@@ -107,8 +107,20 @@ int main(int argc,char **argv)
 			dotZeroTierAuthToken.push_back(ZT_PATH_SEPARATOR);
 			dotZeroTierAuthToken.append(".zerotierOneAuthToken");
 			if (!Utils::readFile(dotZeroTierAuthToken.c_str(),authToken)) {
+#ifndef __WINDOWS__
+#ifdef __APPLE__
+				const char *systemAuthTokenPath = "/Library/Application Support/ZeroTier/One/authtoken.secret";
+#else
+				const char *systemAuthTokenPath = "/var/lib/zerotier-one/authtoken.secret";
+#endif
+				if (!Utils::readFile(systemAuthTokenPath,authToken)) {
+					fprintf(stdout,"FATAL ERROR: no token specified on command line and could not read '%s' or '%s'"ZT_EOL_S,dotZeroTierAuthToken.c_str(),systemAuthTokenPath);
+					return -2;
+				}
+#else // __WINDOWS__
 				fprintf(stdout,"FATAL ERROR: no token specified on command line and could not read '%s'"ZT_EOL_S,dotZeroTierAuthToken.c_str());
 				return -2;
+#endif // __WINDOWS__
 			}
 		}
 	}