From 7cd74a596e74091bbcabe8d85d90747f855ba7ec Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 28 May 2004 03:11:14 +0000
Subject: r934: on ascii strings STR_TERMINATE_ASCII should trigger
 STR_TERMINATE behaviour (This used to be commit
 b7935c96742a3c09ee4bf69f708b19095f497be1)

---
 source4/lib/charcnv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 {
-- 
cgit