From dd134f16a2c4ee4039ddedf59e238aa2c03b8ee7 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sun, 2 Mar 2008 23:15:43 +0000
Subject: [PATCH] If a second SENDER header field is added or read and the
 first SENDER value is an empty string, use the second SENDER for the "from"
 convenience pointer.

---
 src/smblib/smblib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/smblib/smblib.c b/src/smblib/smblib.c
index fc79510942..3a11dd96c1 100644
--- a/src/smblib/smblib.c
+++ b/src/smblib/smblib.c
@@ -707,7 +707,7 @@ static void set_convenience_ptr(smbmsg_t* msg, ushort hfield_type, void* hfield_
 			msg->from=(char*)hfield_dat;
 			break; 
 		case SENDER:
-			if(!msg->from) {
+			if(msg->from==NULL || *(msg->from)==0) {
 				msg->from=(char*)hfield_dat;
 				break; 
 			}
-- 
GitLab