void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve missing authtoken error message

Browse source
This commit is contained in:
Joseph Henry 2021-03-08 21:45:38 -08:00
parent b8e23e6fcc
commit 3870f7af27
No known key found for this signature in database
GPG key ID: C45B33FF5EBC9344
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
one.cpp
View file

@ -287,7 +287,7 @@ static int cli(int argc,char **argv)
} }
#endif #endif
if (!authToken.length()) { if (!authToken.length()) {
fprintf(stderr,"%s: missing authentication token and authtoken.secret not found (or readable) in %s" ZT_EOL_S,argv[0],homeDir.c_str()); fprintf(stderr,"%s: authtoken.secret not found or readable in %s (try again as root)" ZT_EOL_S,argv[0],homeDir.c_str());
return 2; return 2;
} }
} }
@ -1070,7 +1070,7 @@ static int cli(int argc,char **argv)
} else if (command == "dump") { } else if (command == "dump") {
std::stringstream dump; std::stringstream dump;
dump << "platform: "; dump << "platform: ";
#ifdef __APPLE__ #ifdef __APPLE__
dump << "macOS" << ZT_EOL_S; dump << "macOS" << ZT_EOL_S;
#elif defined(_WIN32) #elif defined(_WIN32)
dump << "Windows" << ZT_EOL_S; dump << "Windows" << ZT_EOL_S;
@ -1188,7 +1188,7 @@ static int cli(int argc,char **argv)
UInt8 path[PATH_MAX]; UInt8 path[PATH_MAX];
if (FSFindFolder(kUserDomain, kDesktopFolderType, kDontCreateFolder, &fsref) == noErr && if (FSFindFolder(kUserDomain, kDesktopFolderType, kDontCreateFolder, &fsref) == noErr &&
FSRefMakePath(&fsref, path, sizeof(path)) == noErr) { FSRefMakePath(&fsref, path, sizeof(path)) == noErr) {
} else if (getenv("SUDO_USER")) { } else if (getenv("SUDO_USER")) {
sprintf((char*)path, "/Users/%s/Desktop/", getenv("SUDO_USER")); sprintf((char*)path, "/Users/%s/Desktop/", getenv("SUDO_USER"));
} else { } else {
@ -1204,12 +1204,12 @@ static int cli(int argc,char **argv)
fprintf(stderr, "Error creating file.\n"); fprintf(stderr, "Error creating file.\n");
return 1; return 1;
} }
write(fd, dump.str().c_str(), dump.str().size()); write(fd, dump.str().c_str(), dump.str().size());
close(fd); close(fd);
#elif defined(_WIN32) #elif defined(_WIN32)
ULONG buffLen = 16384; ULONG buffLen = 16384;
PIP_ADAPTER_ADDRESSES addresses; PIP_ADAPTER_ADDRESSES addresses;
ULONG ret = 0; ULONG ret = 0;
do { do {
addresses = (PIP_ADAPTER_ADDRESSES)malloc(buffLen); addresses = (PIP_ADAPTER_ADDRESSES)malloc(buffLen);
@ -1223,7 +1223,7 @@ static int cli(int argc,char **argv)
break; break;
} }
} while (ret == ERROR_BUFFER_OVERFLOW); } while (ret == ERROR_BUFFER_OVERFLOW);
int i = 0; int i = 0;
if (ret == NO_ERROR) { if (ret == NO_ERROR) {
PIP_ADAPTER_ADDRESSES curAddr = addresses; PIP_ADAPTER_ADDRESSES curAddr = addresses;
@ -1311,9 +1311,9 @@ static int cli(int argc,char **argv)
char buf[1024]; char buf[1024];
char stringBuffer[128]; char stringBuffer[128];
int success = 0; int success = 0;
int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
ifc.ifc_len = sizeof(buf); ifc.ifc_len = sizeof(buf);
ifc.ifc_buf = buf; ifc.ifc_buf = buf;
ioctl(sock, SIOCGIFCONF, &ifc); ioctl(sock, SIOCGIFCONF, &ifc);
@ -1376,7 +1376,7 @@ static int cli(int argc,char **argv)
fprintf(stderr, "Error creating file.\n"); fprintf(stderr, "Error creating file.\n");
return 1; return 1;
} }
write(fd, dump.str().c_str(), dump.str().size()); write(fd, dump.str().c_str(), dump.str().size());
close(fd); close(fd);
#else #else
fprintf(stderr, "%s", dump.str().c_str()); fprintf(stderr, "%s", dump.str().c_str());