Changeset 01e558

Timestamp:

09/19/09 10:09:12 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

0cdd53

Parents:

807469

git-author:

Erik Ekman <yarrick@…> (09/19/09 10:09:12)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:03)

Message:

#77, get password from env variable

Files:

• CHANGELOG (modified) (1 diff)
• man/iodine.8 (modified) (1 diff)
• src/iodine.c (modified) (2 diffs)
• src/iodined.c (modified) (2 diffs)

CHANGELOG

@@ -22 +22 @@
         - Added -F option to write pidfile, based on patch from
                 misc at mandriva.org. Fixes #70.
+        - Allow password to be set via environment variable, fixes #77.
+                Based on patch by logix.
 
 2009-06-01: 0.5.2 "WifiFree"

man/iodine.8

@@ -255 +255 @@
 These issues should be solved now, with automatic fragmentation of downstream 
 packets. There should be no need to set the MTU explicitly on the server.
+.SH ENVIRONMENT
+.SS IODINE_PASS
+If the environment variable
+.B IODINE_PASS
+is set, iodine will use the value it is set to as password instead of asking
+for one. The 
+.B -P
+option still has preference.
+.SS IODINED_PASS
+If the environment variable
+.B IODINED_PASS
+is set, iodined will use the value it is set to as password instead of asking
+for one. The
+.B -P
+option still has preference.
+.El
 .SH BUGS
 File bugs at http://dev.kryo.se/iodine/

src/iodine.c

@@ -48 +48 @@
 static char *__progname;
 #endif
+
+#define PASSWORD_ENV_VAR "IODINE_PASS"
 
 static void
@@ -261 +263 @@
         }
         
-        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);

src/iodined.c

@@ -65 +65 @@
 WSADATA wsa_data;
 #endif
+
+#define PASSWORD_ENV_VAR "IODINED_PASS"
 
 static int running = 1;
@@ -1345 +1347 @@
         }
         
-        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) {