diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-09-22 01:50:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:39 -0500 |
| commit | 51cbc188df03f9ee38599fe5a87ec2608117a845 (patch) | |
| tree | e446c68879a08f5c30de72d6029f6d7e2a32880b /source4/utils/net | |
| parent | 3b7f8ddd9a7c0d372a0585790913ac95c9eb3324 (diff) | |
| download | samba-51cbc188df03f9ee38599fe5a87ec2608117a845.tar.gz samba-51cbc188df03f9ee38599fe5a87ec2608117a845.tar.bz2 samba-51cbc188df03f9ee38599fe5a87ec2608117a845.zip | |
r10402: Make the RPC-SAMLOGON test pass against Win2k3 SP0 again.
I still have issues with Win2k3 SP1, and Samba4 doesn't pass it's own
test for the moment, but I'm working on these issues :-)
This required a change to the credentials API, so that the special
case for NTLM logins using a principal was indeed handled as a
special, not general case.
Also don't set the realm from a ccache, as then it overrides --option=realm=.
Andrew Bartlett
(This used to be commit 194e8f07c0cb4685797c5a7a074577c62dfdebe3)
Diffstat (limited to 'source4/utils/net')
| -rw-r--r-- | source4/utils/net/net_password.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/utils/net/net_password.c b/source4/utils/net/net_password.c index 0bfb8a5be8..1912beeb41 100644 --- a/source4/utils/net/net_password.c +++ b/source4/utils/net/net_password.c @@ -49,7 +49,7 @@ static int net_password_change(struct net_context *ctx, int argc, const char **a } else { password_prompt = talloc_asprintf(ctx->mem_ctx, "Enter new password for account [%s\\%s]:", cli_credentials_get_domain(ctx->credentials), - cli_credentials_get_username(ctx->credentials, ctx->mem_ctx)); + cli_credentials_get_username(ctx->credentials)); new_password = getpass(password_prompt); } @@ -61,7 +61,7 @@ static int net_password_change(struct net_context *ctx, int argc, const char **a /* prepare password change */ r.generic.level = LIBNET_CHANGE_PASSWORD_GENERIC; - r.generic.in.account_name = cli_credentials_get_username(ctx->credentials, ctx->mem_ctx); + r.generic.in.account_name = cli_credentials_get_username(ctx->credentials); r.generic.in.domain_name = cli_credentials_get_domain(ctx->credentials); r.generic.in.oldpassword = cli_credentials_get_password(ctx->credentials); r.generic.in.newpassword = new_password; |