Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xbmc] Allow enter an user domain in GUI for SMB protocol. #13725

Merged
merged 6 commits into from Apr 3, 2018

Conversation

@afedchin
Copy link
Member

commented Apr 2, 2018

see title.

currently it's not possible in GUI somehow define domain for an user. this introduces an ability to enter user name in format 'DOMAIN\user' or DOMAIN/user and this will be properly handled.

@afedchin afedchin requested a review from notspiff Apr 2, 2018
Copy link
Contributor

left a comment

just some (inherited) cosmetics, looks good.

@@ -214,31 +215,37 @@ bool CDirectory::GetDirectory(const CURL& url, CFileItemList &items, const CHint
// hide credentials if necessary
if (CPasswordManager::GetInstance().IsURLSupported(realURL))
{
for (int i = 0; i < items.Size(); ++i)
bool hide = false;
// for explicitly credetials

This comment has been minimized.

Copy link
@notspiff

notspiff Apr 3, 2018

Contributor

credentials

if (!realURL.GetUserName().empty())
// credentials was changed i.e. were stored in the password
// manager, in this case we can hide them from an item URL,
// otherwise we have to keep cretendials in an item URL

This comment has been minimized.

Copy link
@notspiff

notspiff Apr 3, 2018

Contributor

credentials

/* samba messes up of password is set but no username is set. don't know why yet */
/* probably the url parser that goes crazy */
if(url.GetUserName().length() > 0 /* || url.GetPassWord().length() > 0 */)
{
if(url.GetDomain().length() > 0)

This comment has been minimized.

Copy link
@notspiff

notspiff Apr 3, 2018

Contributor

! .empty()

@afedchin afedchin merged commit 5f3b262 into xbmc:master Apr 3, 2018
1 check passed
1 check passed
default You're awesome. Have a cookie
Details
@afedchin afedchin deleted the afedchin:smb-domain-fix branch Apr 3, 2018
@afedchin

This comment has been minimized.

Copy link
Member Author

commented Apr 3, 2018

oh, sorry, didn't see comments. will fix them in next PR.
thanks

afedchin added a commit to afedchin/xbmc that referenced this pull request Apr 3, 2018
@Rechi Rechi added this to the Leia 18.0-alpha2 milestone Apr 3, 2018
afedchin added a commit that referenced this pull request Apr 3, 2018
[filesystem] fix cosmetics after #13725
pkerling added a commit to pkerling/xbmc that referenced this pull request Apr 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.