Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains

(This used to be commit a057c3ed9df2670e5cad5f1807e280d77eb58cb0)

1 files changed, 3 insertions, 12 deletions

diff --git a/source4/lib/zlib/inflate.c b/source4/lib/zlib/inflate.c
index fbecefd8f5..ccbfac804d 100644
--- a/source4/lib/zlib/inflate.c
+++ b/source4/lib/zlib/inflate.c
@@ -100,9 +100,8 @@ local int updatewindow OF((z_streamp strm, unsigned out));
 local unsigned syncsearch OF((unsigned FAR *have, unsigned const char FAR *buf,
                               unsigned len));
 
-int ZEXPORT inflateReset2(strm, flags)
+int ZEXPORT inflateReset(strm)
 z_streamp strm;
-unsigned flags;
 {
     struct inflate_state FAR *state;
 
@@ -116,10 +115,8 @@ unsigned flags;
     state->havedict = 0;
     state->dmax = 32768U;
     state->head = Z_NULL;
-    if (!(flags & Z_RESET_KEEP_WINDOW)) {
-        state->wsize = 0;
-        state->whave = 0;
-    }
+    state->wsize = 0;
+    state->whave = 0;
     state->write = 0;
     state->hold = 0;
     state->bits = 0;
@@ -128,12 +125,6 @@ unsigned flags;
     return Z_OK;
 }
 
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    return inflateReset2(strm, 0);
-}
-
 int ZEXPORT inflatePrime(strm, bits, value)
 z_streamp strm;
 int bits;