Set search result count/offset/vlv parameters conditionally

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
index 5eeb15a..c63e02e 100644
--- a/lib/Net/LDAP3.php
+++ b/lib/Net/LDAP3.php
@@ -1630,9 +1630,15 @@ class Net_LDAP3
         }
 
         $result = new Net_LDAP3_Result($this->conn, $base_dn, $filter, $scope, $ldap_result);
-        $result->set('offset', $last_offset);
-        $result->set('count', $vlv_count);
-        $result->set('vlv', true);
+
+        if (isset($last_offset)) {
+            $result->set('offset', $last_offset);
+        }
+        if (isset($vlv_count)) {
+            $result->set('count', $vlv_count);
+        }
+
+        $result->set('vlv', $this->vlv_active);
 
         return $count_only ? $result->count() : $result;
     }