r6078: Correctly fix the failures for NT1 (not SPNEGO) session setups in the

client.  The issue was actually a cut-and-paste bug, I was filling in
the .old not the .nt1 part of the union.

I've also removed the 'error checks' - I'll shortly document the API
for the credentials code to clarify that it will always return a
pointer here, except in cases of programmer error.

Tridge:  I hope this is OK.

Andrew Bartlett

diff --git a/source/libcli/composite/sesssetup.c b/source/libcli/composite/sesssetup.c
index a33ace2420b6d853b6f275f28f596dbbe093d0ce..ab46c198ef3254ee760a063494b2c459e23ed613 100644 (file)
--- a/source/libcli/composite/sesssetup.c
+++ b/source/libcli/composite/sesssetup.c
@@ -180,12 +180,8 @@ static struct smbcli_request *session_setup_nt1(struct composite_context *c,
        state->setup.nt1.in.os           = "Unix";
        state->setup.nt1.in.lanman       = "Samba";
        state->setup.nt1.in.user         = cli_credentials_get_username(io->in.credentials);
-       if (state->setup.nt1.in.user == NULL) return NULL;
        state->setup.nt1.in.domain       = cli_credentials_get_domain(io->in.credentials);
-       if (state->setup.nt1.in.domain == NULL) return NULL;
 
-       state->setup.old.in.domain  = cli_credentials_get_domain(io->in.credentials);
-       state->setup.old.in.user    = cli_credentials_get_username(io->in.credentials);
        if (!password) {
                state->setup.nt1.in.password1 = data_blob(NULL, 0);
                state->setup.nt1.in.password2 = data_blob(NULL, 0);