From: Howard Chu <hyc@openldap.org>
Date: Fri, 8 Jun 2007 09:59:05 +0000 (+0000)
Subject: ITS#4875 from HEAD, zero length reads
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb998896bdbf7f33e43bb3f84c644224ddc3801a;p=thirdparty%2Fopenldap.git

ITS#4875 from HEAD, zero length reads
---

diff --git a/libraries/liblutil/passfile.c b/libraries/liblutil/passfile.c
index c84cda7367..c6d9ff4163 100644
--- a/libraries/liblutil/passfile.c
+++ b/libraries/liblutil/passfile.c
@@ -44,7 +44,7 @@ lutil_get_filed_password(
 	}
 
 	passwd->bv_val = NULL;
-	passwd->bv_len = 4196;
+	passwd->bv_len = 4096;
 
 #ifdef HAVE_FSTAT
 	{
@@ -56,7 +56,8 @@ lutil_get_filed_password(
 					filename );
 			}
 
-			passwd->bv_len = sb.st_size;
+			if ( sb.st_size )
+				passwd->bv_len = sb.st_size;
 		}
 	}
 #endif /* HAVE_FSTAT */