===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ldap/Attic/ber.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/ldap/Attic/ber.c	2018/07/03 18:49:10	1.8
+++ src/usr.bin/ldap/Attic/ber.c	2018/07/04 13:04:30	1.9
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ber.c,v 1.8 2018/07/03 18:49:10 rob Exp $ */
+/*	$OpenBSD: ber.c,v 1.9 2018/07/04 13:04:30 rob Exp $ */
 
 /*
  * Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -1212,8 +1212,7 @@
 static ssize_t
 ber_readbuf(struct ber *b, void *buf, size_t nbytes)
 {
-	size_t	 sz;
-	size_t	 len;
+	size_t	 sz, len;
 
 	if (b->br_rbuf == NULL)
 		return -1;
@@ -1227,6 +1226,7 @@
 
 	bcopy(b->br_rptr, buf, len);
 	b->br_rptr += len;
+	b->br_offs += len;
 
 	return (len);
 }
@@ -1284,14 +1284,10 @@
 		r = ber_readbuf(ber, b, remain);
 		if (r == -1)
 			return -1;
-		if (r == 0)
-			return (b - (u_char *)buf);
 		b += r;
 		remain -= r;
 	}
-	r = b - (u_char *)buf;
-	ber->br_offs += r;
-	return r;
+	return (b - (u_char *)buf);
 }
 
 int