Update 3.10 sources from stable (v3.10.93)

6c5601b5 · Pavel Shilovsky · e91f7da3 · 6c5601b5
Commit 6c5601b5 authored Dec 06, 2015 by Pavel Shilovsky
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

smb2ops.c sources/3.10/smb2ops.c +5 -1

No files found.
--- a/sources/3.10/smb2ops.c
+++ b/sources/3.10/smb2ops.c
@@ -48,9 +48,13 @@ change_conf(struct TCP_Server_Info *server)
 		break;
 	default:
 		server->echoes = true;
+		if (enable_oplocks) {
 			server->oplocks = true;
-		server->echo_credits = 1;
 			server->oplock_credits = 1;
+		} else
+			server->oplocks = false;
+		server->echo_credits = 1;
 	}
 	server->credits -= server->echo_credits + server->oplock_credits;
 	return 0;