r26676: libcli: Fill in lp_workgroup() again, should fix my breakage of cifsdd tests...

Also fixes a typo in sessetup.c.
(This used to be commit b97de4a655b989a481d5d001ce9a5d3969d2909c)

diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index ae63d94acd86e609ca1e80797114d3aba1d79abb..35f33353226b63ac381032eb88c1ac49b4d86e2b 100644 (file)
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -192,6 +192,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
        io.in.service_type = service_type;
        io.in.credentials = credentials;
        io.in.fallback_to_anonymous = false;
+       io.in.workgroup = lp_workgroup(global_loadparm);
        io.in.options = *options;
        
        status = smb_composite_connect(&io, parent_ctx, resolve_ctx, ev);

diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index 3ed0bb247340d24461bb5ed0d60e3013ca6f56a3..ce7bcc143ed44d745d96a18c4955757405e3b88c 100644 (file)
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -129,7 +129,7 @@ static void request_handler(struct smbcli_request *req)
        case RAW_SESSSETUP_SPNEGO:
                state->io->out.vuid = state->setup.spnego.out.vuid;
                if (NT_STATUS_EQUAL(c->status, NT_STATUS_LOGON_FAILURE)) {
-                       /* we neet to reset the vuid for a new try */
+                       /* we need to reset the vuid for a new try */
                        session->vuid = 0;
                        if (cli_credentials_wrong_password(state->io->in.credentials)) {
                                nt_status = session_setup_spnego(c, session,