sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

Revert "cli_credentials_parse_string: fix parsing of principals"

Browse Source 
This reverts commit eb0474d27bae4592b25ac6bf600da29c6a1cb9f8.
This commit is contained in:
Alexander Bokovoy 2020-11-04 19:20:58 +02:00
parent 8aebd48698
commit 49efe0ca0b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auth/credentials/credentials.c
View File

@ -860,10 +860,11 @@ _PUBLIC_ void cli_credentials_parse_name(struct cli_credentials *credentials, co
* in order to undo the effect of
* cli_credentials_guess().
*/
cli_credentials_set_principal(credentials, uname, obtained);
*p = 0;
cli_credentials_set_username(credentials, uname, obtained);
cli_credentials_set_domain(credentials, "", obtained);
cli_credentials_set_principal(credentials, uname, obtained);
*p = 0;
cli_credentials_set_realm(credentials, p+1, obtained);
return;
} else if ((p = strchr_m(uname,'\\'))

2
auth/credentials/tests/test_creds.c
View File

@ -187,7 +187,7 @@ static void torture_creds_parse_string(void **state)
assert_string_equal(creds->domain, "");
assert_int_equal(creds->domain_obtained, CRED_SPECIFIED);
assert_string_equal(creds->username, "wurst");
assert_string_equal(creds->username, "wurst@brot.realm");
assert_int_equal(creds->username_obtained, CRED_SPECIFIED);
assert_string_equal(creds->principal, "wurst@brot.realm");

4
python/samba/tests/credentials.py
View File

@ -400,7 +400,7 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
os.environ["USER"] = "env_user"
creds.guess(lp)
creds.parse_string("user@samba.org")
self.assertEqual(creds.get_username(), "user")
self.assertEqual(creds.get_username(), "user@samba.org")
self.assertEqual(creds.get_domain(), "")
self.assertEqual(creds.get_realm(), "SAMBA.ORG")
self.assertEqual(creds.get_principal(), "user@samba.org")
@ -441,7 +441,7 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
os.environ["USER"] = "env_user"
creds.guess(lp)
creds.parse_string("user@samba.org%pass")
self.assertEqual(creds.get_username(), "user")
self.assertEqual(creds.get_username(), "user@samba.org")
self.assertEqual(creds.get_domain(), "")
self.assertEqual(creds.get_password(), "pass")
self.assertEqual(creds.get_realm(), "SAMBA.ORG")