summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-05-28 03:11:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:20 -0500
commit7cd74a596e74091bbcabe8d85d90747f855ba7ec (patch)
treea9ef1a6ac4309d986f7f11922986964f49f074c2
parentc5cd8680abe8efb8d32243f912284d925da73fa3 (diff)
downloadsamba-7cd74a596e74091bbcabe8d85d90747f855ba7ec.tar.gz
samba-7cd74a596e74091bbcabe8d85d90747f855ba7ec.tar.bz2
samba-7cd74a596e74091bbcabe8d85d90747f855ba7ec.zip
r934: on ascii strings STR_TERMINATE_ASCII should trigger STR_TERMINATE behaviour
(This used to be commit b7935c96742a3c09ee4bf69f708b19095f497be1)
-rw-r--r--source4/lib/charcnv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/charcnv.c b/source4/lib/charcnv.c
index ed56d9d0cc..c3ef45d038 100644
--- a/source4/lib/charcnv.c
+++ b/source4/lib/charcnv.c
@@ -405,7 +405,7 @@ ssize_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t src_len,
if (dest_len == (size_t)-1)
dest_len = sizeof(pstring);
- if (flags & STR_TERMINATE) {
+ if (flags & (STR_TERMINATE | STR_TERMINATE_ASCII)) {
if (src_len == (size_t)-1) {
src_len = strlen(src) + 1;
} else {