You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2018/05/10 20:15:22 UTC
vcl git commit: VCL-1094 - add .\ to windows user login to prevent
automatic use of Microsoft accounts
Repository: vcl
Updated Branches:
refs/heads/VCL-1094_prepend_dot_slash_to_login cf8c88d62 -> 10ea25970
VCL-1094 - add .\ to windows user login to prevent automatic use of Microsoft accounts
requests: modified AJconnectRequest: if OS type is windows, prepend .\
to $conuser
utils.php: modified sendRDPfile: if OS type is windows, prepend .\
to $userid
Project: http://git-wip-us.apache.org/repos/asf/vcl/repo
Commit: http://git-wip-us.apache.org/repos/asf/vcl/commit/10ea2597
Tree: http://git-wip-us.apache.org/repos/asf/vcl/tree/10ea2597
Diff: http://git-wip-us.apache.org/repos/asf/vcl/diff/10ea2597
Branch: refs/heads/VCL-1094_prepend_dot_slash_to_login
Commit: 10ea25970e4d3a9e406dc19f7d853f83c6fb9850
Parents: cf8c88d
Author: Josh Thompson <jf...@ncsu.edu>
Authored: Thu May 10 16:13:11 2018 -0400
Committer: Josh Thompson <jf...@ncsu.edu>
Committed: Thu May 10 16:13:11 2018 -0400
----------------------------------------------------------------------
web/.ht-inc/requests.php | 2 ++
web/.ht-inc/utils.php | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vcl/blob/10ea2597/web/.ht-inc/requests.php
----------------------------------------------------------------------
diff --git a/web/.ht-inc/requests.php b/web/.ht-inc/requests.php
index 42b7a43..b163c42 100644
--- a/web/.ht-inc/requests.php
+++ b/web/.ht-inc/requests.php
@@ -4374,6 +4374,8 @@ function AJconnectRequest() {
$conuser = $user['unityid'];
if($requestData['reservations'][0]['domainDNSName'] != '' && ! strlen($passwd))
$conuser .= "@" . $requestData['reservations'][0]['domainDNSName'];
+ elseif($requestData['reservations'][0]['OStype'] == 'windows')
+ $conuser = ".\\$conuser";
if(! strlen($passwd))
$passwd = i('(use your campus password)');
if($cluster)
http://git-wip-us.apache.org/repos/asf/vcl/blob/10ea2597/web/.ht-inc/utils.php
----------------------------------------------------------------------
diff --git a/web/.ht-inc/utils.php b/web/.ht-inc/utils.php
index 9c6bcab..7c98834 100644
--- a/web/.ht-inc/utils.php
+++ b/web/.ht-inc/utils.php
@@ -10569,6 +10569,8 @@ function sendRDPfile() {
$userid = $user["unityid"];
if($request['reservations'][0]['domainDNSName'] != '' && ! strlen($passwd))
$userid .= "@" . $request['reservations'][0]['domainDNSName'];
+ elseif($request['reservations'][0]['OStype'] == 'windows')
+ $userid = ".\\$userid";
print "username:s:$userid\r\n";
print "clear password:s:$passwd\r\n";
print "domain:s:\r\n";