r934: on ascii strings STR_TERMINATE_ASCII should trigger STR_TERMINATE behaviour

(This used to be commit b7935c96742a3c09ee4bf69f708b19095f497be1)

diff --git a/source4/lib/charcnv.c b/source4/lib/charcnv.c
index ed56d9d0ccde6581f9799ed63dd5677122335619..c3ef45d038ac10b01d5fb9f29ada82f38dab4370 100644 (file)
--- 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 {