#77, get password from env variable

This commit is contained in:
Erik Ekman
2009-09-19 08:09:12 +00:00
committed by Erik Ekman
parent 8074696a14
commit 01e558022e
4 changed files with 34 additions and 4 deletions

View File

@@ -48,6 +48,8 @@ WSADATA wsa_data;
static char *__progname;
#endif
#define PASSWORD_ENV_VAR "IODINE_PASS"
static void
sighandler(int sig)
{
@@ -260,8 +262,12 @@ main(int argc, char **argv)
#endif
}
if (strlen(password) == 0)
read_password(password, sizeof(password));
if (strlen(password) == 0) {
if (NULL != getenv(PASSWORD_ENV_VAR))
snprintf(password, sizeof(password), "%s", getenv(PASSWORD_ENV_VAR));
else
read_password(password, sizeof(password));
}
client_set_password(password);

View File

@@ -65,6 +65,8 @@ WORD req_version = MAKEWORD(2, 2);
WSADATA wsa_data;
#endif
#define PASSWORD_ENV_VAR "IODINED_PASS"
static int running = 1;
static char *topdomain;
static char password[33];
@@ -1344,8 +1346,12 @@ main(int argc, char **argv)
usage();
}
if (strlen(password) == 0)
read_password(password, sizeof(password));
if (strlen(password) == 0) {
if (NULL != getenv(PASSWORD_ENV_VAR))
snprintf(password, sizeof(password), "%s", getenv(PASSWORD_ENV_VAR));
else
read_password(password, sizeof(password));
}
if ((tun_fd = open_tun(device)) == -1) {
retval = 1;