aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-08-17 08:22:42 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-08-17 08:22:42 +0000
commit70f4f82a3517cdb21f66899eac63fbd4543b07f2 (patch)
tree9180589380a99e07c6bf88efb0e24d6f8493cf57
parentconfig-win32.h and install-win32/openvpn.nsi are no longer generated (diff)
downloadopenvpn-70f4f82a3517cdb21f66899eac63fbd4543b07f2.tar.xz
AUTO_USERID feature -- if the auth-user-pass option is used
with some argument ARG, then -ARG will be appended to the username string that is sent to the server. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2259 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--misc.c4
-rw-r--r--misc.h2
-rw-r--r--ssl.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/misc.c b/misc.c
index a42ef24..4329711 100644
--- a/misc.c
+++ b/misc.c
@@ -1356,7 +1356,7 @@ get_platform_prefix (void)
}
void
-get_user_pass_auto_userid (struct user_pass *up)
+get_user_pass_auto_userid (struct user_pass *up, const char *tag)
{
struct gc_arena gc = gc_new ();
MD5_CTX ctx;
@@ -1381,6 +1381,8 @@ get_user_pass_auto_userid (struct user_pass *up)
{
buf_printf (&buf, "UNKNOWN");
}
+ if (tag && strcmp (tag, "stdin"))
+ buf_printf (&buf, "-%s", tag);
up->defined = true;
gc_free (&gc);
diff --git a/misc.h b/misc.h
index d626dfe..09124e6 100644
--- a/misc.h
+++ b/misc.h
@@ -266,7 +266,7 @@ void openvpn_sleep (const int n);
void configure_path (void);
#if AUTO_USERID
-void get_user_pass_auto_userid (struct user_pass *up);
+void get_user_pass_auto_userid (struct user_pass *up, const char *tag);
#endif
#endif
diff --git a/ssl.c b/ssl.c
index 41564ba..85e9c6f 100644
--- a/ssl.c
+++ b/ssl.c
@@ -298,7 +298,7 @@ auth_user_pass_setup (const char *auth_file)
if (!auth_user_pass.defined)
{
#if AUTO_USERID
- get_user_pass_auto_userid (&auth_user_pass);
+ get_user_pass_auto_userid (&auth_user_pass, auth_file);
#else
get_user_pass (&auth_user_pass, auth_file, UP_TYPE_AUTH, GET_USER_PASS_MANAGEMENT|GET_USER_PASS_SENSITIVE);
#endif