summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-06 22:01:31 -0600
committerStefan Metzmacher <metze@samba.org>2008-01-06 16:06:04 -0600
commit9d09a06920c2de8c6312f3c0a0280faee65fd432 (patch)
treef1a9da1a3290af3c581e7691f1a1dd7c6421824d
parente644673c09aa8a0c42a5b3beb7c438ae2b1c68c5 (diff)
downloadsamba-9d09a06920c2de8c6312f3c0a0280faee65fd432.tar.gz
samba-9d09a06920c2de8c6312f3c0a0280faee65fd432.tar.bz2
samba-9d09a06920c2de8c6312f3c0a0280faee65fd432.zip
r26676: libcli: Fill in lp_workgroup() again, should fix my breakage of cifsdd tests. Thanks to Andrew for catching this.
Also fixes a typo in sessetup.c. (This used to be commit b97de4a655b989a481d5d001ce9a5d3969d2909c)
-rw-r--r--source4/libcli/raw/clitree.c1
-rw-r--r--source4/libcli/smb_composite/sesssetup.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index ae63d94acd..35f3335322 100644
--- 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 3ed0bb2473..ce7bcc143e 100644
--- 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,