summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-11-08 18:44:57 +0000
committerGerald Carter <jerry@samba.org>2002-11-08 18:44:57 +0000
commit47035533781f49bd3cc1f4918c6b87c3904a02fe (patch)
treefaa29a3d6f1d67488bccc6a292d33d4109dd604a
parent5565aa9972bc47ae903a3186ac643b4651f49928 (diff)
downloadsamba-47035533781f49bd3cc1f4918c6b87c3904a02fe.tar.gz
samba-47035533781f49bd3cc1f4918c6b87c3904a02fe.tar.bz2
samba-47035533781f49bd3cc1f4918c6b87c3904a02fe.zip
patches from Urban
(This used to be commit da269a73edb7f637b1e1f8b3dafe677f46f66f85)
-rw-r--r--source3/lib/util_unistr.c2
-rw-r--r--source3/libsmb/cliconnect.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index eb47252413..8e41581f75 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -335,6 +335,8 @@ smb_ucs2_t *strchr_w(const smb_ucs2_t *s, smb_ucs2_t c)
if (c == *s) return (smb_ucs2_t *)s;
s++;
}
+ if (c == *s) return (smb_ucs2_t *)s;
+
return NULL;
}
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index a404928a93..ee311932a7 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -124,6 +124,9 @@ static uint32 cli_session_setup_capabilities(struct cli_state *cli)
if (cli->capabilities & CAP_UNICODE)
capabilities |= CAP_UNICODE;
+ if (cli->capabilities & CAP_LARGE_FILES)
+ capabilities |= CAP_LARGE_FILES;
+
return capabilities;
}