--sort should not imply --join if --trace is also specified.

diff --git a/contrib/slapd-tools/statslog b/contrib/slapd-tools/statslog
index 0cc07da3ff87cd6be6d256c6129b4ba39074b4c7..2a49d7fbfd0a692013d5ab77fe70dbbf7fb3ffd8 100755 (executable)
--- a/contrib/slapd-tools/statslog
+++ b/contrib/slapd-tools/statslog
@@ -81,7 +81,7 @@ BEGIN {
 usage() unless $getopt_ok;
 usage("--trace is incompatible with --join.\n") if $trace && $join_files;
 
-$join_files = 1 if $sort_files && !defined($join_files);
+$join_files = 1 if !defined($join_files) && $sort_files && !$trace;
 use constant BRIEF => !!$brief;
 use constant LOOSE => defined($no_loose) && ($no_loose eq ".^" ? 2 : 1);