diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-06-06 05:15:28 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-06-06 05:15:28 +0000 |
| commit | 6b943b5b2188314739f4f36541f1ef469ba9a3b3 (patch) | |
| tree | fe082c50c46ee1c4469674ffaf2e16e08c784c0a /source3/lib | |
| parent | d155f6ea54e2e5933666db5d566c155333e9e028 (diff) | |
| download | samba-6b943b5b2188314739f4f36541f1ef469ba9a3b3.tar.gz samba-6b943b5b2188314739f4f36541f1ef469ba9a3b3.tar.bz2 samba-6b943b5b2188314739f4f36541f1ef469ba9a3b3.zip | |
- the 8.3 name in BOTH_DIRECTORY_INFO is supposed to be always unicode
(to match win2003 behaviour)
- added the STR_TERMINATE_ASCII flag from samba4 so we can get the
string termination right for the case where it is supposed to be
non-terminated for UCS2 and terminated when ASCII
(This used to be commit 791a4cc7cf84eca77116bca00aeb5f95560f6705)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/charcnv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index eb427cc0fc..1a74318439 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -367,7 +367,7 @@ size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags) src = tmpbuf; } - if (flags & STR_TERMINATE) + if (flags & (STR_TERMINATE | STR_TERMINATE_ASCII)) src_len++; return convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len); |