diff options
-rw-r--r-- | auth/credentials/credentials.c | 5 | ||||
-rw-r--r-- | auth/credentials/tests/test_creds.c | 2 | ||||
-rw-r--r-- | python/samba/tests/credentials.py | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c index 1bdd6f15a09..a8d25278e9d 100644 --- a/auth/credentials/credentials.c +++ b/auth/credentials/credentials.c @@ -842,11 +842,10 @@ _PUBLIC_ void cli_credentials_parse_string(struct cli_credentials *credentials, * in order to undo the effect of * cli_credentials_guess(). */ - 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_username(credentials, uname, obtained); + cli_credentials_set_domain(credentials, "", obtained); cli_credentials_set_realm(credentials, p+1, obtained); return; } else if ((p = strchr_m(uname,'\\')) diff --git a/auth/credentials/tests/test_creds.c b/auth/credentials/tests/test_creds.c index d2d3d30d73d..541ecc7b264 100644 --- a/auth/credentials/tests/test_creds.c +++ b/auth/credentials/tests/test_creds.c @@ -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@brot.realm"); + assert_string_equal(creds->username, "wurst"); assert_int_equal(creds->username_obtained, CRED_SPECIFIED); assert_string_equal(creds->principal, "wurst@brot.realm"); diff --git a/python/samba/tests/credentials.py b/python/samba/tests/credentials.py index bcd15b1130f..5d1378fb790 100644 --- a/python/samba/tests/credentials.py +++ b/python/samba/tests/credentials.py @@ -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@samba.org") + self.assertEqual(creds.get_username(), "user") 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@samba.org") + self.assertEqual(creds.get_username(), "user") self.assertEqual(creds.get_domain(), "") self.assertEqual(creds.get_password(), "pass") self.assertEqual(creds.get_realm(), "SAMBA.ORG") |