Move zlib to top-level root.

203 files changed, 5 insertions, 14 deletions

diff --git a/source4/lib/zlib/ChangeLog b/lib/zlib/ChangeLog
index 7f6869d323..7f6869d323 100644
--- a/source4/lib/zlib/ChangeLog
+++ b/lib/zlib/ChangeLog
diff --git a/source4/lib/zlib/FAQ b/lib/zlib/FAQ
index 441d910daa..441d910daa 100644
--- a/source4/lib/zlib/FAQ
+++ b/lib/zlib/FAQ
diff --git a/source4/lib/zlib/INDEX b/lib/zlib/INDEX
index 0587e5902b..0587e5902b 100644
--- a/source4/lib/zlib/INDEX
+++ b/lib/zlib/INDEX
diff --git a/source4/lib/zlib/Makefile b/lib/zlib/Makefile
index 2fd6e45c48..2fd6e45c48 100644
--- a/source4/lib/zlib/Makefile
+++ b/lib/zlib/Makefile
diff --git a/source4/lib/zlib/Makefile.in b/lib/zlib/Makefile.in
index 2fd6e45c48..2fd6e45c48 100644
--- a/source4/lib/zlib/Makefile.in
+++ b/lib/zlib/Makefile.in
diff --git a/source4/lib/zlib/README b/lib/zlib/README
index 758cc50020..758cc50020 100644
--- a/source4/lib/zlib/README
+++ b/lib/zlib/README
diff --git a/source4/lib/zlib/adler32.c b/lib/zlib/adler32.c
index b5333d7b8e..b5333d7b8e 100644
--- a/source4/lib/zlib/adler32.c
+++ b/lib/zlib/adler32.c
diff --git a/source4/lib/zlib/algorithm.txt b/lib/zlib/algorithm.txt
index b022dde312..b022dde312 100644
--- a/source4/lib/zlib/algorithm.txt
+++ b/lib/zlib/algorithm.txt
diff --git a/source4/lib/zlib/amiga/Makefile.pup b/lib/zlib/amiga/Makefile.pup
index 3f7e15537f..3f7e15537f 100644
--- a/source4/lib/zlib/amiga/Makefile.pup
+++ b/lib/zlib/amiga/Makefile.pup
diff --git a/source4/lib/zlib/amiga/Makefile.sas b/lib/zlib/amiga/Makefile.sas
index 296ef48a22..296ef48a22 100644
--- a/source4/lib/zlib/amiga/Makefile.sas
+++ b/lib/zlib/amiga/Makefile.sas
diff --git a/source4/lib/zlib/as400/bndsrc b/lib/zlib/as400/bndsrc
index 9cf94bb356..9cf94bb356 100644
--- a/source4/lib/zlib/as400/bndsrc
+++ b/lib/zlib/as400/bndsrc
diff --git a/source4/lib/zlib/as400/compile.clp b/lib/zlib/as400/compile.clp
index 8554951500..8554951500 100644
--- a/source4/lib/zlib/as400/compile.clp
+++ b/lib/zlib/as400/compile.clp
diff --git a/source4/lib/zlib/as400/readme.txt b/lib/zlib/as400/readme.txt
index beae13f565..beae13f565 100644
--- a/source4/lib/zlib/as400/readme.txt
+++ b/lib/zlib/as400/readme.txt
diff --git a/source4/lib/zlib/as400/zlib.inc b/lib/zlib/as400/zlib.inc
index 7bbfb7e417..7bbfb7e417 100644
--- a/source4/lib/zlib/as400/zlib.inc
+++ b/lib/zlib/as400/zlib.inc
diff --git a/source4/lib/zlib/compress.c b/lib/zlib/compress.c
index 40a53cd476..40a53cd476 100644
--- a/source4/lib/zlib/compress.c
+++ b/lib/zlib/compress.c
diff --git a/source4/lib/zlib/contrib/README.contrib b/lib/zlib/contrib/README.contrib
index 20afc62154..20afc62154 100644
--- a/source4/lib/zlib/contrib/README.contrib
+++ b/lib/zlib/contrib/README.contrib
diff --git a/source4/lib/zlib/contrib/ada/buffer_demo.adb b/lib/zlib/contrib/ada/buffer_demo.adb
index 46b8638107..46b8638107 100644
--- a/source4/lib/zlib/contrib/ada/buffer_demo.adb
+++ b/lib/zlib/contrib/ada/buffer_demo.adb
diff --git a/source4/lib/zlib/contrib/ada/mtest.adb b/lib/zlib/contrib/ada/mtest.adb
index c4dfd080f0..c4dfd080f0 100644
--- a/source4/lib/zlib/contrib/ada/mtest.adb
+++ b/lib/zlib/contrib/ada/mtest.adb
diff --git a/source4/lib/zlib/contrib/ada/read.adb b/lib/zlib/contrib/ada/read.adb
index 1f2efbfeb8..1f2efbfeb8 100644
--- a/source4/lib/zlib/contrib/ada/read.adb
+++ b/lib/zlib/contrib/ada/read.adb
diff --git a/source4/lib/zlib/contrib/ada/readme.txt b/lib/zlib/contrib/ada/readme.txt
index ce4d2cadf0..ce4d2cadf0 100644
--- a/source4/lib/zlib/contrib/ada/readme.txt
+++ b/lib/zlib/contrib/ada/readme.txt
diff --git a/source4/lib/zlib/contrib/ada/test.adb b/lib/zlib/contrib/ada/test.adb
index 90773acfa1..90773acfa1 100644
--- a/source4/lib/zlib/contrib/ada/test.adb
+++ b/lib/zlib/contrib/ada/test.adb
diff --git a/source4/lib/zlib/contrib/ada/zlib-streams.adb b/lib/zlib/contrib/ada/zlib-streams.adb
index b6497bae28..b6497bae28 100644
--- a/source4/lib/zlib/contrib/ada/zlib-streams.adb
+++ b/lib/zlib/contrib/ada/zlib-streams.adb
diff --git a/source4/lib/zlib/contrib/ada/zlib-streams.ads b/lib/zlib/contrib/ada/zlib-streams.ads
index f0193c6bae..f0193c6bae 100644
--- a/source4/lib/zlib/contrib/ada/zlib-streams.ads
+++ b/lib/zlib/contrib/ada/zlib-streams.ads
diff --git a/source4/lib/zlib/contrib/ada/zlib-thin.adb b/lib/zlib/contrib/ada/zlib-thin.adb
index 0ca4a71204..0ca4a71204 100644
--- a/source4/lib/zlib/contrib/ada/zlib-thin.adb
+++ b/lib/zlib/contrib/ada/zlib-thin.adb
diff --git a/source4/lib/zlib/contrib/ada/zlib-thin.ads b/lib/zlib/contrib/ada/zlib-thin.ads
index d4407eb800..d4407eb800 100644
--- a/source4/lib/zlib/contrib/ada/zlib-thin.ads
+++ b/lib/zlib/contrib/ada/zlib-thin.ads
diff --git a/source4/lib/zlib/contrib/ada/zlib.adb b/lib/zlib/contrib/ada/zlib.adb
index 8b6fd686ac..8b6fd686ac 100644
--- a/source4/lib/zlib/contrib/ada/zlib.adb
+++ b/lib/zlib/contrib/ada/zlib.adb
diff --git a/source4/lib/zlib/contrib/ada/zlib.ads b/lib/zlib/contrib/ada/zlib.ads
index 79ffc4095c..79ffc4095c 100644
--- a/source4/lib/zlib/contrib/ada/zlib.ads
+++ b/lib/zlib/contrib/ada/zlib.ads
diff --git a/source4/lib/zlib/contrib/ada/zlib.gpr b/lib/zlib/contrib/ada/zlib.gpr
index 296b22aa96..296b22aa96 100644
--- a/source4/lib/zlib/contrib/ada/zlib.gpr
+++ b/lib/zlib/contrib/ada/zlib.gpr
diff --git a/source4/lib/zlib/contrib/asm586/README.586 b/lib/zlib/contrib/asm586/README.586
index 6bb78f3206..6bb78f3206 100644
--- a/source4/lib/zlib/contrib/asm586/README.586
+++ b/lib/zlib/contrib/asm586/README.586
diff --git a/source4/lib/zlib/contrib/asm586/match.S b/lib/zlib/contrib/asm586/match.S
index 0368b35fe3..0368b35fe3 100644
--- a/source4/lib/zlib/contrib/asm586/match.S
+++ b/lib/zlib/contrib/asm586/match.S
diff --git a/source4/lib/zlib/contrib/asm686/README.686 b/lib/zlib/contrib/asm686/README.686
index a593f23afd..a593f23afd 100644
--- a/source4/lib/zlib/contrib/asm686/README.686
+++ b/lib/zlib/contrib/asm686/README.686
diff --git a/source4/lib/zlib/contrib/asm686/match.S b/lib/zlib/contrib/asm686/match.S
index 5c3e9ee367..5c3e9ee367 100644
--- a/source4/lib/zlib/contrib/asm686/match.S
+++ b/lib/zlib/contrib/asm686/match.S
diff --git a/source4/lib/zlib/contrib/blast/Makefile b/lib/zlib/contrib/blast/Makefile
index 9be80bafe0..9be80bafe0 100644
--- a/source4/lib/zlib/contrib/blast/Makefile
+++ b/lib/zlib/contrib/blast/Makefile
diff --git a/source4/lib/zlib/contrib/blast/README b/lib/zlib/contrib/blast/README
index e3a60b3f5c..e3a60b3f5c 100644
--- a/source4/lib/zlib/contrib/blast/README
+++ b/lib/zlib/contrib/blast/README
diff --git a/source4/lib/zlib/contrib/blast/blast.c b/lib/zlib/contrib/blast/blast.c
index 4ce697a41f..4ce697a41f 100644
--- a/source4/lib/zlib/contrib/blast/blast.c
+++ b/lib/zlib/contrib/blast/blast.c
diff --git a/source4/lib/zlib/contrib/blast/blast.h b/lib/zlib/contrib/blast/blast.h
index ce9e5410f4..ce9e5410f4 100644
--- a/source4/lib/zlib/contrib/blast/blast.h
+++ b/lib/zlib/contrib/blast/blast.h
diff --git a/source4/lib/zlib/contrib/blast/test.pk b/lib/zlib/contrib/blast/test.pk
index be10b2bbb2..be10b2bbb2 100644
--- a/source4/lib/zlib/contrib/blast/test.pk
+++ b/lib/zlib/contrib/blast/test.pk
diff --git a/source4/lib/zlib/contrib/blast/test.txt b/lib/zlib/contrib/blast/test.txt
index bfdf1c5dca..bfdf1c5dca 100644
--- a/source4/lib/zlib/contrib/blast/test.txt
+++ b/lib/zlib/contrib/blast/test.txt
diff --git a/source4/lib/zlib/contrib/delphi/ZLib.pas b/lib/zlib/contrib/delphi/ZLib.pas
index 3f2b8b4a5c..3f2b8b4a5c 100644
--- a/source4/lib/zlib/contrib/delphi/ZLib.pas
+++ b/lib/zlib/contrib/delphi/ZLib.pas
diff --git a/source4/lib/zlib/contrib/delphi/ZLibConst.pas b/lib/zlib/contrib/delphi/ZLibConst.pas
index cdfe13671d..cdfe13671d 100644
--- a/source4/lib/zlib/contrib/delphi/ZLibConst.pas
+++ b/lib/zlib/contrib/delphi/ZLibConst.pas
diff --git a/source4/lib/zlib/contrib/delphi/readme.txt b/lib/zlib/contrib/delphi/readme.txt
index 2dc9a8bba2..2dc9a8bba2 100644
--- a/source4/lib/zlib/contrib/delphi/readme.txt
+++ b/lib/zlib/contrib/delphi/readme.txt
diff --git a/source4/lib/zlib/contrib/delphi/zlibd32.mak b/lib/zlib/contrib/delphi/zlibd32.mak
index 88fafa0b14..88fafa0b14 100644
--- a/source4/lib/zlib/contrib/delphi/zlibd32.mak
+++ b/lib/zlib/contrib/delphi/zlibd32.mak
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib.build b/lib/zlib/contrib/dotzlib/DotZLib.build
index ed19cc9dcd..ed19cc9dcd 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib.build
+++ b/lib/zlib/contrib/dotzlib/DotZLib.build
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib.chm b/lib/zlib/contrib/dotzlib/DotZLib.chm
index 0bc7df76e4..0bc7df76e4 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib.chm
+++ b/lib/zlib/contrib/dotzlib/DotZLib.chm
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib.sln b/lib/zlib/contrib/dotzlib/DotZLib.sln
index ac45ca048b..ac45ca048b 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib.sln
+++ b/lib/zlib/contrib/dotzlib/DotZLib.sln
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
index 6fc0fdcc24..6fc0fdcc24 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
index dfe7e90a8a..dfe7e90a8a 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
index 16997e906b..16997e906b 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
index 954db7db05..954db7db05 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs
index d7b8dcccac..d7b8dcccac 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
index 410deb0885..410deb0885 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj b/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
index 71eeb8590a..71eeb8590a 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
+++ b/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
index f861675b51..f861675b51 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs
index 4e60cda078..4e60cda078 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
index 8dc00db92d..8dc00db92d 100644
--- a/source4/lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
diff --git a/source4/lib/zlib/contrib/dotzlib/LICENSE_1_0.txt b/lib/zlib/contrib/dotzlib/LICENSE_1_0.txt
index 30aac2cf47..30aac2cf47 100644
--- a/source4/lib/zlib/contrib/dotzlib/LICENSE_1_0.txt
+++ b/lib/zlib/contrib/dotzlib/LICENSE_1_0.txt
diff --git a/source4/lib/zlib/contrib/dotzlib/readme.txt b/lib/zlib/contrib/dotzlib/readme.txt
index 210f4b0019..210f4b0019 100644
--- a/source4/lib/zlib/contrib/dotzlib/readme.txt
+++ b/lib/zlib/contrib/dotzlib/readme.txt
diff --git a/source4/lib/zlib/contrib/infback9/README b/lib/zlib/contrib/infback9/README
index e75ed13294..e75ed13294 100644
--- a/source4/lib/zlib/contrib/infback9/README
+++ b/lib/zlib/contrib/infback9/README
diff --git a/source4/lib/zlib/contrib/infback9/infback9.c b/lib/zlib/contrib/infback9/infback9.c
index f5ddde67da..f5ddde67da 100644
--- a/source4/lib/zlib/contrib/infback9/infback9.c
+++ b/lib/zlib/contrib/infback9/infback9.c
diff --git a/source4/lib/zlib/contrib/infback9/infback9.h b/lib/zlib/contrib/infback9/infback9.h
index 1073c0a38e..1073c0a38e 100644
--- a/source4/lib/zlib/contrib/infback9/infback9.h
+++ b/lib/zlib/contrib/infback9/infback9.h
diff --git a/source4/lib/zlib/contrib/infback9/inffix9.h b/lib/zlib/contrib/infback9/inffix9.h
index ee5671d2df..ee5671d2df 100644
--- a/source4/lib/zlib/contrib/infback9/inffix9.h
+++ b/lib/zlib/contrib/infback9/inffix9.h
diff --git a/source4/lib/zlib/contrib/infback9/inflate9.h b/lib/zlib/contrib/infback9/inflate9.h
index ee9a79394b..ee9a79394b 100644
--- a/source4/lib/zlib/contrib/infback9/inflate9.h
+++ b/lib/zlib/contrib/infback9/inflate9.h
diff --git a/source4/lib/zlib/contrib/infback9/inftree9.c b/lib/zlib/contrib/infback9/inftree9.c
index 0993f75646..0993f75646 100644
--- a/source4/lib/zlib/contrib/infback9/inftree9.c
+++ b/lib/zlib/contrib/infback9/inftree9.c
diff --git a/source4/lib/zlib/contrib/infback9/inftree9.h b/lib/zlib/contrib/infback9/inftree9.h
index a268084eea..a268084eea 100644
--- a/source4/lib/zlib/contrib/infback9/inftree9.h
+++ b/lib/zlib/contrib/infback9/inftree9.h
diff --git a/source4/lib/zlib/contrib/inflate86/inffas86.c b/lib/zlib/contrib/inflate86/inffas86.c
index 6da76358cc..6da76358cc 100644
--- a/source4/lib/zlib/contrib/inflate86/inffas86.c
+++ b/lib/zlib/contrib/inflate86/inffas86.c
diff --git a/source4/lib/zlib/contrib/inflate86/inffast.S b/lib/zlib/contrib/inflate86/inffast.S
index 2245a2905b..2245a2905b 100644
--- a/source4/lib/zlib/contrib/inflate86/inffast.S
+++ b/lib/zlib/contrib/inflate86/inffast.S
diff --git a/source4/lib/zlib/contrib/iostream/test.cpp b/lib/zlib/contrib/iostream/test.cpp
index 7d265b3b5c..7d265b3b5c 100644
--- a/source4/lib/zlib/contrib/iostream/test.cpp
+++ b/lib/zlib/contrib/iostream/test.cpp
diff --git a/source4/lib/zlib/contrib/iostream/zfstream.cpp b/lib/zlib/contrib/iostream/zfstream.cpp
index d0cd85faaf..d0cd85faaf 100644
--- a/source4/lib/zlib/contrib/iostream/zfstream.cpp
+++ b/lib/zlib/contrib/iostream/zfstream.cpp
diff --git a/source4/lib/zlib/contrib/iostream/zfstream.h b/lib/zlib/contrib/iostream/zfstream.h
index ed79098a3a..ed79098a3a 100644
--- a/source4/lib/zlib/contrib/iostream/zfstream.h
+++ b/lib/zlib/contrib/iostream/zfstream.h
diff --git a/source4/lib/zlib/contrib/iostream2/zstream.h b/lib/zlib/contrib/iostream2/zstream.h
index 43d2332b79..43d2332b79 100644
--- a/source4/lib/zlib/contrib/iostream2/zstream.h
+++ b/lib/zlib/contrib/iostream2/zstream.h
diff --git a/source4/lib/zlib/contrib/iostream2/zstream_test.cpp b/lib/zlib/contrib/iostream2/zstream_test.cpp
index 6273f62d62..6273f62d62 100644
--- a/source4/lib/zlib/contrib/iostream2/zstream_test.cpp
+++ b/lib/zlib/contrib/iostream2/zstream_test.cpp
diff --git a/source4/lib/zlib/contrib/iostream3/README b/lib/zlib/contrib/iostream3/README
index f7b319ab91..f7b319ab91 100644
--- a/source4/lib/zlib/contrib/iostream3/README
+++ b/lib/zlib/contrib/iostream3/README
diff --git a/source4/lib/zlib/contrib/iostream3/TODO b/lib/zlib/contrib/iostream3/TODO
index 7032f97be0..7032f97be0 100644
--- a/source4/lib/zlib/contrib/iostream3/TODO
+++ b/lib/zlib/contrib/iostream3/TODO
diff --git a/source4/lib/zlib/contrib/iostream3/test.cc b/lib/zlib/contrib/iostream3/test.cc
index 94235334f2..94235334f2 100644
--- a/source4/lib/zlib/contrib/iostream3/test.cc
+++ b/lib/zlib/contrib/iostream3/test.cc
diff --git a/source4/lib/zlib/contrib/iostream3/zfstream.cc b/lib/zlib/contrib/iostream3/zfstream.cc
index 94eb933444..94eb933444 100644
--- a/source4/lib/zlib/contrib/iostream3/zfstream.cc
+++ b/lib/zlib/contrib/iostream3/zfstream.cc
diff --git a/source4/lib/zlib/contrib/iostream3/zfstream.h b/lib/zlib/contrib/iostream3/zfstream.h
index 8574479ae1..8574479ae1 100644
--- a/source4/lib/zlib/contrib/iostream3/zfstream.h
+++ b/lib/zlib/contrib/iostream3/zfstream.h
diff --git a/source4/lib/zlib/contrib/masm686/match.asm b/lib/zlib/contrib/masm686/match.asm
index 4b03a71abd..4b03a71abd 100644
--- a/source4/lib/zlib/contrib/masm686/match.asm
+++ b/lib/zlib/contrib/masm686/match.asm
diff --git a/source4/lib/zlib/contrib/masmx64/bld_ml64.bat b/lib/zlib/contrib/masmx64/bld_ml64.bat
index 8f9343d0af..8f9343d0af 100644
--- a/source4/lib/zlib/contrib/masmx64/bld_ml64.bat
+++ b/lib/zlib/contrib/masmx64/bld_ml64.bat
diff --git a/source4/lib/zlib/contrib/masmx64/gvmat64.asm b/lib/zlib/contrib/masmx64/gvmat64.asm
index 790d65554a..790d65554a 100644
--- a/source4/lib/zlib/contrib/masmx64/gvmat64.asm
+++ b/lib/zlib/contrib/masmx64/gvmat64.asm
diff --git a/source4/lib/zlib/contrib/masmx64/gvmat64.obj b/lib/zlib/contrib/masmx64/gvmat64.obj
index a49ca029c6..a49ca029c6 100644
--- a/source4/lib/zlib/contrib/masmx64/gvmat64.obj
+++ b/lib/zlib/contrib/masmx64/gvmat64.obj
diff --git a/source4/lib/zlib/contrib/masmx64/inffas8664.c b/lib/zlib/contrib/masmx64/inffas8664.c
index 3af764de9c..3af764de9c 100644
--- a/source4/lib/zlib/contrib/masmx64/inffas8664.c
+++ b/lib/zlib/contrib/masmx64/inffas8664.c
diff --git a/source4/lib/zlib/contrib/masmx64/inffasx64.asm b/lib/zlib/contrib/masmx64/inffasx64.asm
index b5d93a272a..b5d93a272a 100644
--- a/source4/lib/zlib/contrib/masmx64/inffasx64.asm
+++ b/lib/zlib/contrib/masmx64/inffasx64.asm
diff --git a/source4/lib/zlib/contrib/masmx64/inffasx64.obj b/lib/zlib/contrib/masmx64/inffasx64.obj
index 8df5d82616..8df5d82616 100644
--- a/source4/lib/zlib/contrib/masmx64/inffasx64.obj
+++ b/lib/zlib/contrib/masmx64/inffasx64.obj
diff --git a/source4/lib/zlib/contrib/masmx64/readme.txt b/lib/zlib/contrib/masmx64/readme.txt
index ee03115c5a..ee03115c5a 100644
--- a/source4/lib/zlib/contrib/masmx64/readme.txt
+++ b/lib/zlib/contrib/masmx64/readme.txt
diff --git a/source4/lib/zlib/contrib/masmx86/bld_ml32.bat b/lib/zlib/contrib/masmx86/bld_ml32.bat
index 99144d07af..99144d07af 100644
--- a/source4/lib/zlib/contrib/masmx86/bld_ml32.bat
+++ b/lib/zlib/contrib/masmx86/bld_ml32.bat
diff --git a/source4/lib/zlib/contrib/masmx86/gvmat32.asm b/lib/zlib/contrib/masmx86/gvmat32.asm
index 874bb2d482..874bb2d482 100644
--- a/source4/lib/zlib/contrib/masmx86/gvmat32.asm
+++ b/lib/zlib/contrib/masmx86/gvmat32.asm
diff --git a/source4/lib/zlib/contrib/masmx86/gvmat32.obj b/lib/zlib/contrib/masmx86/gvmat32.obj
index ebb326238a..ebb326238a 100644
--- a/source4/lib/zlib/contrib/masmx86/gvmat32.obj
+++ b/lib/zlib/contrib/masmx86/gvmat32.obj
diff --git a/source4/lib/zlib/contrib/masmx86/gvmat32c.c b/lib/zlib/contrib/masmx86/gvmat32c.c
index 7ad2b27943..7ad2b27943 100644
--- a/source4/lib/zlib/contrib/masmx86/gvmat32c.c
+++ b/lib/zlib/contrib/masmx86/gvmat32c.c
diff --git a/source4/lib/zlib/contrib/masmx86/inffas32.asm b/lib/zlib/contrib/masmx86/inffas32.asm
index 4a205125ec..4a205125ec 100644
--- a/source4/lib/zlib/contrib/masmx86/inffas32.asm
+++ b/lib/zlib/contrib/masmx86/inffas32.asm
diff --git a/source4/lib/zlib/contrib/masmx86/inffas32.obj b/lib/zlib/contrib/masmx86/inffas32.obj
index bd6664d111..bd6664d111 100644
--- a/source4/lib/zlib/contrib/masmx86/inffas32.obj
+++ b/lib/zlib/contrib/masmx86/inffas32.obj
diff --git a/source4/lib/zlib/contrib/masmx86/mkasm.bat b/lib/zlib/contrib/masmx86/mkasm.bat
index 70a51f8377..70a51f8377 100755
--- a/source4/lib/zlib/contrib/masmx86/mkasm.bat
+++ b/lib/zlib/contrib/masmx86/mkasm.bat
diff --git a/source4/lib/zlib/contrib/masmx86/readme.txt b/lib/zlib/contrib/masmx86/readme.txt
index 7b57167b71..7b57167b71 100644
--- a/source4/lib/zlib/contrib/masmx86/readme.txt
+++ b/lib/zlib/contrib/masmx86/readme.txt
diff --git a/source4/lib/zlib/contrib/minizip/ChangeLogUnzip b/lib/zlib/contrib/minizip/ChangeLogUnzip
index 50ca6a9e0f..50ca6a9e0f 100644
--- a/source4/lib/zlib/contrib/minizip/ChangeLogUnzip
+++ b/lib/zlib/contrib/minizip/ChangeLogUnzip
diff --git a/source4/lib/zlib/contrib/minizip/Makefile b/lib/zlib/contrib/minizip/Makefile
index 84eaad20d4..84eaad20d4 100644
--- a/source4/lib/zlib/contrib/minizip/Makefile
+++ b/lib/zlib/contrib/minizip/Makefile
diff --git a/source4/lib/zlib/contrib/minizip/crypt.h b/lib/zlib/contrib/minizip/crypt.h
index 622f4bc2ec..622f4bc2ec 100644
--- a/source4/lib/zlib/contrib/minizip/crypt.h
+++ b/lib/zlib/contrib/minizip/crypt.h
diff --git a/source4/lib/zlib/contrib/minizip/ioapi.c b/lib/zlib/contrib/minizip/ioapi.c
index f1bee23e64..f1bee23e64 100644
--- a/source4/lib/zlib/contrib/minizip/ioapi.c
+++ b/lib/zlib/contrib/minizip/ioapi.c
diff --git a/source4/lib/zlib/contrib/minizip/ioapi.h b/lib/zlib/contrib/minizip/ioapi.h
index 7d457baab3..7d457baab3 100644
--- a/source4/lib/zlib/contrib/minizip/ioapi.h
+++ b/lib/zlib/contrib/minizip/ioapi.h
diff --git a/source4/lib/zlib/contrib/minizip/iowin32.c b/lib/zlib/contrib/minizip/iowin32.c
index a9b5f78399..a9b5f78399 100644
--- a/source4/lib/zlib/contrib/minizip/iowin32.c
+++ b/lib/zlib/contrib/minizip/iowin32.c
diff --git a/source4/lib/zlib/contrib/minizip/iowin32.h b/lib/zlib/contrib/minizip/iowin32.h
index a3a437adf8..a3a437adf8 100644
--- a/source4/lib/zlib/contrib/minizip/iowin32.h
+++ b/lib/zlib/contrib/minizip/iowin32.h
diff --git a/source4/lib/zlib/contrib/minizip/miniunz.c b/lib/zlib/contrib/minizip/miniunz.c
index f599938884..f599938884 100644
--- a/source4/lib/zlib/contrib/minizip/miniunz.c
+++ b/lib/zlib/contrib/minizip/miniunz.c
diff --git a/source4/lib/zlib/contrib/minizip/minizip.c b/lib/zlib/contrib/minizip/minizip.c
index f2dfecd8b1..f2dfecd8b1 100644
--- a/source4/lib/zlib/contrib/minizip/minizip.c
+++ b/lib/zlib/contrib/minizip/minizip.c
diff --git a/source4/lib/zlib/contrib/minizip/mztools.c b/lib/zlib/contrib/minizip/mztools.c
index 8a50ee4392..8a50ee4392 100644
--- a/source4/lib/zlib/contrib/minizip/mztools.c
+++ b/lib/zlib/contrib/minizip/mztools.c
diff --git a/source4/lib/zlib/contrib/minizip/mztools.h b/lib/zlib/contrib/minizip/mztools.h
index eee78dc56b..eee78dc56b 100644
--- a/source4/lib/zlib/contrib/minizip/mztools.h
+++ b/lib/zlib/contrib/minizip/mztools.h
diff --git a/source4/lib/zlib/contrib/minizip/unzip.c b/lib/zlib/contrib/minizip/unzip.c
index 9ad4766d8d..9ad4766d8d 100644
--- a/source4/lib/zlib/contrib/minizip/unzip.c
+++ b/lib/zlib/contrib/minizip/unzip.c
diff --git a/source4/lib/zlib/contrib/minizip/unzip.h b/lib/zlib/contrib/minizip/unzip.h
index b247937c80..b247937c80 100644
--- a/source4/lib/zlib/contrib/minizip/unzip.h
+++ b/lib/zlib/contrib/minizip/unzip.h
diff --git a/source4/lib/zlib/contrib/minizip/zip.c b/lib/zlib/contrib/minizip/zip.c
index 7fbe002743..7fbe002743 100644
--- a/source4/lib/zlib/contrib/minizip/zip.c
+++ b/lib/zlib/contrib/minizip/zip.c
diff --git a/source4/lib/zlib/contrib/minizip/zip.h b/lib/zlib/contrib/minizip/zip.h
index acacce83b9..acacce83b9 100644
--- a/source4/lib/zlib/contrib/minizip/zip.h
+++ b/lib/zlib/contrib/minizip/zip.h
diff --git a/source4/lib/zlib/contrib/pascal/example.pas b/lib/zlib/contrib/pascal/example.pas
index 5518b36a73..5518b36a73 100644
--- a/source4/lib/zlib/contrib/pascal/example.pas
+++ b/lib/zlib/contrib/pascal/example.pas
diff --git a/source4/lib/zlib/contrib/pascal/readme.txt b/lib/zlib/contrib/pascal/readme.txt
index 60e87c8a33..60e87c8a33 100644
--- a/source4/lib/zlib/contrib/pascal/readme.txt
+++ b/lib/zlib/contrib/pascal/readme.txt
diff --git a/source4/lib/zlib/contrib/pascal/zlibd32.mak b/lib/zlib/contrib/pascal/zlibd32.mak
index 88fafa0b14..88fafa0b14 100644
--- a/source4/lib/zlib/contrib/pascal/zlibd32.mak
+++ b/lib/zlib/contrib/pascal/zlibd32.mak
diff --git a/source4/lib/zlib/contrib/pascal/zlibpas.pas b/lib/zlib/contrib/pascal/zlibpas.pas
index 836848c2b7..836848c2b7 100644
--- a/source4/lib/zlib/contrib/pascal/zlibpas.pas
+++ b/lib/zlib/contrib/pascal/zlibpas.pas
diff --git a/source4/lib/zlib/contrib/puff/Makefile b/lib/zlib/contrib/puff/Makefile
index b6b69404c7..b6b69404c7 100644
--- a/source4/lib/zlib/contrib/puff/Makefile
+++ b/lib/zlib/contrib/puff/Makefile
diff --git a/source4/lib/zlib/contrib/puff/README b/lib/zlib/contrib/puff/README
index bbc4cb595e..bbc4cb595e 100644
--- a/source4/lib/zlib/contrib/puff/README
+++ b/lib/zlib/contrib/puff/README
diff --git a/source4/lib/zlib/contrib/puff/puff.c b/lib/zlib/contrib/puff/puff.c
index ce0cc405e3..ce0cc405e3 100644
--- a/source4/lib/zlib/contrib/puff/puff.c
+++ b/lib/zlib/contrib/puff/puff.c
diff --git a/source4/lib/zlib/contrib/puff/puff.h b/lib/zlib/contrib/puff/puff.h
index ef612520b3..ef612520b3 100644
--- a/source4/lib/zlib/contrib/puff/puff.h
+++ b/lib/zlib/contrib/puff/puff.h
diff --git a/source4/lib/zlib/contrib/puff/zeros.raw b/lib/zlib/contrib/puff/zeros.raw
index 637b7be6f5..637b7be6f5 100644
--- a/source4/lib/zlib/contrib/puff/zeros.raw
+++ b/lib/zlib/contrib/puff/zeros.raw
diff --git a/source4/lib/zlib/contrib/testzlib/testzlib.c b/lib/zlib/contrib/testzlib/testzlib.c
index e5574f45e7..e5574f45e7 100644
--- a/source4/lib/zlib/contrib/testzlib/testzlib.c
+++ b/lib/zlib/contrib/testzlib/testzlib.c
diff --git a/source4/lib/zlib/contrib/testzlib/testzlib.txt b/lib/zlib/contrib/testzlib/testzlib.txt
index 62258f1495..62258f1495 100644
--- a/source4/lib/zlib/contrib/testzlib/testzlib.txt
+++ b/lib/zlib/contrib/testzlib/testzlib.txt
diff --git a/source4/lib/zlib/contrib/untgz/Makefile b/lib/zlib/contrib/untgz/Makefile
index b54266fba2..b54266fba2 100644
--- a/source4/lib/zlib/contrib/untgz/Makefile
+++ b/lib/zlib/contrib/untgz/Makefile
diff --git a/source4/lib/zlib/contrib/untgz/Makefile.msc b/lib/zlib/contrib/untgz/Makefile.msc
index 77b8602213..77b8602213 100644
--- a/source4/lib/zlib/contrib/untgz/Makefile.msc
+++ b/lib/zlib/contrib/untgz/Makefile.msc
diff --git a/source4/lib/zlib/contrib/untgz/untgz.c b/lib/zlib/contrib/untgz/untgz.c
index 2c391e5986..2c391e5986 100644
--- a/source4/lib/zlib/contrib/untgz/untgz.c
+++ b/lib/zlib/contrib/untgz/untgz.c
diff --git a/source4/lib/zlib/contrib/vstudio/readme.txt b/lib/zlib/contrib/vstudio/readme.txt
index 16159f9cd0..16159f9cd0 100644
--- a/source4/lib/zlib/contrib/vstudio/readme.txt
+++ b/lib/zlib/contrib/vstudio/readme.txt
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/miniunz.vcproj b/lib/zlib/contrib/vstudio/vc7/miniunz.vcproj
index ad5117c845..ad5117c845 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/miniunz.vcproj
+++ b/lib/zlib/contrib/vstudio/vc7/miniunz.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/minizip.vcproj b/lib/zlib/contrib/vstudio/vc7/minizip.vcproj
index fb5b6320d5..fb5b6320d5 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/minizip.vcproj
+++ b/lib/zlib/contrib/vstudio/vc7/minizip.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/testzlib.vcproj b/lib/zlib/contrib/vstudio/vc7/testzlib.vcproj
index 97bc3e8c86..97bc3e8c86 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/testzlib.vcproj
+++ b/lib/zlib/contrib/vstudio/vc7/testzlib.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlib.rc b/lib/zlib/contrib/vstudio/vc7/zlib.rc
index 72cb8b4c31..72cb8b4c31 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/zlib.rc
+++ b/lib/zlib/contrib/vstudio/vc7/zlib.rc
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj b/lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj
index 766d7a4d6e..766d7a4d6e 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj
+++ b/lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.def b/lib/zlib/contrib/vstudio/vc7/zlibvc.def
index a40e71541f..a40e71541f 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.def
+++ b/lib/zlib/contrib/vstudio/vc7/zlibvc.def
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.sln b/lib/zlib/contrib/vstudio/vc7/zlibvc.sln
index 927b42b7bd..927b42b7bd 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.sln
+++ b/lib/zlib/contrib/vstudio/vc7/zlibvc.sln
diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj b/lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj
index 8533b49475..8533b49475 100644
--- a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj
+++ b/lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/miniunz.vcproj b/lib/zlib/contrib/vstudio/vc8/miniunz.vcproj
index 4af53e8a31..4af53e8a31 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/miniunz.vcproj
+++ b/lib/zlib/contrib/vstudio/vc8/miniunz.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/minizip.vcproj b/lib/zlib/contrib/vstudio/vc8/minizip.vcproj
index 85f64c4d2a..85f64c4d2a 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/minizip.vcproj
+++ b/lib/zlib/contrib/vstudio/vc8/minizip.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/testzlib.vcproj b/lib/zlib/contrib/vstudio/vc8/testzlib.vcproj
index 68c3539911..68c3539911 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/testzlib.vcproj
+++ b/lib/zlib/contrib/vstudio/vc8/testzlib.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj b/lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj
index f38ab5e08a..f38ab5e08a 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj
+++ b/lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlib.rc b/lib/zlib/contrib/vstudio/vc8/zlib.rc
index 72cb8b4c31..72cb8b4c31 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/zlib.rc
+++ b/lib/zlib/contrib/vstudio/vc8/zlib.rc
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj b/lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj
index fb97037acf..fb97037acf 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj
+++ b/lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.def b/lib/zlib/contrib/vstudio/vc8/zlibvc.def
index a40e71541f..a40e71541f 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.def
+++ b/lib/zlib/contrib/vstudio/vc8/zlibvc.def
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.sln b/lib/zlib/contrib/vstudio/vc8/zlibvc.sln
index a815a5549f..a815a5549f 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.sln
+++ b/lib/zlib/contrib/vstudio/vc8/zlibvc.sln
diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj b/lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj
index e717011df7..e717011df7 100644
--- a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj
+++ b/lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj
diff --git a/source4/lib/zlib/crc32.c b/lib/zlib/crc32.c
index 4d6e699e60..4d6e699e60 100644
--- a/source4/lib/zlib/crc32.c
+++ b/lib/zlib/crc32.c
diff --git a/source4/lib/zlib/crc32.h b/lib/zlib/crc32.h
index 8053b6117c..8053b6117c 100644
--- a/source4/lib/zlib/crc32.h
+++ b/lib/zlib/crc32.h
diff --git a/source4/lib/zlib/deflate.c b/lib/zlib/deflate.c
index 2720aab911..2720aab911 100644
--- a/source4/lib/zlib/deflate.c
+++ b/lib/zlib/deflate.c
diff --git a/source4/lib/zlib/deflate.h b/lib/zlib/deflate.h
index 05a5ab3a2c..05a5ab3a2c 100644
--- a/source4/lib/zlib/deflate.h
+++ b/lib/zlib/deflate.h
diff --git a/source4/lib/zlib/example.c b/lib/zlib/example.c
index 6c8a0ee763..6c8a0ee763 100644
--- a/source4/lib/zlib/example.c
+++ b/lib/zlib/example.c
diff --git a/source4/lib/zlib/examples/README.examples b/lib/zlib/examples/README.examples
index 5632d7a4cc..5632d7a4cc 100644
--- a/source4/lib/zlib/examples/README.examples
+++ b/lib/zlib/examples/README.examples
diff --git a/source4/lib/zlib/examples/fitblk.c b/lib/zlib/examples/fitblk.c
index c61de5c996..c61de5c996 100644
--- a/source4/lib/zlib/examples/fitblk.c
+++ b/lib/zlib/examples/fitblk.c
diff --git a/source4/lib/zlib/examples/gun.c b/lib/zlib/examples/gun.c
index bfec590a00..bfec590a00 100644
--- a/source4/lib/zlib/examples/gun.c
+++ b/lib/zlib/examples/gun.c
diff --git a/source4/lib/zlib/examples/gzappend.c b/lib/zlib/examples/gzappend.c
index e9e878e116..e9e878e116 100644
--- a/source4/lib/zlib/examples/gzappend.c
+++ b/lib/zlib/examples/gzappend.c
diff --git a/source4/lib/zlib/examples/gzjoin.c b/lib/zlib/examples/gzjoin.c
index 129347ce3c..129347ce3c 100644
--- a/source4/lib/zlib/examples/gzjoin.c
+++ b/lib/zlib/examples/gzjoin.c
diff --git a/source4/lib/zlib/examples/gzlog.c b/lib/zlib/examples/gzlog.c
index f71f817c8b..f71f817c8b 100644
--- a/source4/lib/zlib/examples/gzlog.c
+++ b/lib/zlib/examples/gzlog.c
diff --git a/source4/lib/zlib/examples/gzlog.h b/lib/zlib/examples/gzlog.h
index a800bd5391..a800bd5391 100644
--- a/source4/lib/zlib/examples/gzlog.h
+++ b/lib/zlib/examples/gzlog.h
diff --git a/source4/lib/zlib/examples/zlib_how.html b/lib/zlib/examples/zlib_how.html
index 40998dbf08..40998dbf08 100644
--- a/source4/lib/zlib/examples/zlib_how.html
+++ b/lib/zlib/examples/zlib_how.html
diff --git a/source4/lib/zlib/examples/zpipe.c b/lib/zlib/examples/zpipe.c
index 26abb56a9c..26abb56a9c 100644
--- a/source4/lib/zlib/examples/zpipe.c
+++ b/lib/zlib/examples/zpipe.c
diff --git a/source4/lib/zlib/examples/zran.c b/lib/zlib/examples/zran.c
index 8c7717eb2c..8c7717eb2c 100644
--- a/source4/lib/zlib/examples/zran.c
+++ b/lib/zlib/examples/zran.c
diff --git a/source4/lib/zlib/gzio.c b/lib/zlib/gzio.c
index 0b51297936..0b51297936 100644
--- a/source4/lib/zlib/gzio.c
+++ b/lib/zlib/gzio.c
diff --git a/source4/lib/zlib/infback.c b/lib/zlib/infback.c
index 5680937f34..5680937f34 100644
--- a/source4/lib/zlib/infback.c
+++ b/lib/zlib/infback.c
diff --git a/source4/lib/zlib/inffast.c b/lib/zlib/inffast.c
index bfc727694a..bfc727694a 100644
--- a/source4/lib/zlib/inffast.c
+++ b/lib/zlib/inffast.c
diff --git a/source4/lib/zlib/inffast.h b/lib/zlib/inffast.h
index 1e88d2d97b..1e88d2d97b 100644
--- a/source4/lib/zlib/inffast.h
+++ b/lib/zlib/inffast.h
diff --git a/source4/lib/zlib/inffixed.h b/lib/zlib/inffixed.h
index 75ed4b5978..75ed4b5978 100644
--- a/source4/lib/zlib/inffixed.h
+++ b/lib/zlib/inffixed.h
diff --git a/source4/lib/zlib/inflate.c b/lib/zlib/inflate.c
index ccbfac804d..ccbfac804d 100644
--- a/source4/lib/zlib/inflate.c
+++ b/lib/zlib/inflate.c
diff --git a/source4/lib/zlib/inflate.h b/lib/zlib/inflate.h
index 07bd3e78a7..07bd3e78a7 100644
--- a/source4/lib/zlib/inflate.h
+++ b/lib/zlib/inflate.h
diff --git a/source4/lib/zlib/inftrees.c b/lib/zlib/inftrees.c
index 8a9c13ff03..8a9c13ff03 100644
--- a/source4/lib/zlib/inftrees.c
+++ b/lib/zlib/inftrees.c
diff --git a/source4/lib/zlib/inftrees.h b/lib/zlib/inftrees.h
index b1104c87e7..b1104c87e7 100644
--- a/source4/lib/zlib/inftrees.h
+++ b/lib/zlib/inftrees.h
diff --git a/source4/lib/zlib/make_vms.com b/lib/zlib/make_vms.com
index c2a1fb54b2..c2a1fb54b2 100644
--- a/source4/lib/zlib/make_vms.com
+++ b/lib/zlib/make_vms.com
diff --git a/source4/lib/zlib/minigzip.c b/lib/zlib/minigzip.c
index 4524b96a1d..4524b96a1d 100644
--- a/source4/lib/zlib/minigzip.c
+++ b/lib/zlib/minigzip.c
diff --git a/source4/lib/zlib/msdos/Makefile.bor b/lib/zlib/msdos/Makefile.bor
index 8f8132d122..8f8132d122 100644
--- a/source4/lib/zlib/msdos/Makefile.bor
+++ b/lib/zlib/msdos/Makefile.bor
diff --git a/source4/lib/zlib/msdos/Makefile.dj2 b/lib/zlib/msdos/Makefile.dj2
index 283d1d9616..283d1d9616 100644
--- a/source4/lib/zlib/msdos/Makefile.dj2
+++ b/lib/zlib/msdos/Makefile.dj2
diff --git a/source4/lib/zlib/msdos/Makefile.emx b/lib/zlib/msdos/Makefile.emx
index ed4c31fbbd..ed4c31fbbd 100644
--- a/source4/lib/zlib/msdos/Makefile.emx
+++ b/lib/zlib/msdos/Makefile.emx
diff --git a/source4/lib/zlib/msdos/Makefile.msc b/lib/zlib/msdos/Makefile.msc
index b8fc665efb..b8fc665efb 100644
--- a/source4/lib/zlib/msdos/Makefile.msc
+++ b/lib/zlib/msdos/Makefile.msc
diff --git a/source4/lib/zlib/msdos/Makefile.tc b/lib/zlib/msdos/Makefile.tc
index 480750ade2..480750ade2 100644
--- a/source4/lib/zlib/msdos/Makefile.tc
+++ b/lib/zlib/msdos/Makefile.tc
diff --git a/source4/lib/zlib/old/Makefile.riscos b/lib/zlib/old/Makefile.riscos
index 57e29d3fba..57e29d3fba 100644
--- a/source4/lib/zlib/old/Makefile.riscos
+++ b/lib/zlib/old/Makefile.riscos
diff --git a/source4/lib/zlib/old/README b/lib/zlib/old/README
index 800bf07982..800bf07982 100644
--- a/source4/lib/zlib/old/README
+++ b/lib/zlib/old/README
diff --git a/source4/lib/zlib/old/descrip.mms b/lib/zlib/old/descrip.mms
index 7066da5b55..7066da5b55 100644
--- a/source4/lib/zlib/old/descrip.mms
+++ b/lib/zlib/old/descrip.mms
diff --git a/source4/lib/zlib/old/os2/Makefile.os2 b/lib/zlib/old/os2/Makefile.os2
index a105aaa5bb..a105aaa5bb 100644
--- a/source4/lib/zlib/old/os2/Makefile.os2
+++ b/lib/zlib/old/os2/Makefile.os2
diff --git a/source4/lib/zlib/old/os2/zlib.def b/lib/zlib/old/os2/zlib.def
index 4c753f1a3b..4c753f1a3b 100644
--- a/source4/lib/zlib/old/os2/zlib.def
+++ b/lib/zlib/old/os2/zlib.def
diff --git a/source4/lib/zlib/old/visual-basic.txt b/lib/zlib/old/visual-basic.txt
index 57efe58124..57efe58124 100644
--- a/source4/lib/zlib/old/visual-basic.txt
+++ b/lib/zlib/old/visual-basic.txt
diff --git a/source4/lib/zlib/old/zlib.html b/lib/zlib/old/zlib.html
index 8c1b190c38..8c1b190c38 100644
--- a/source4/lib/zlib/old/zlib.html
+++ b/lib/zlib/old/zlib.html
diff --git a/source4/lib/zlib/projects/README.projects b/lib/zlib/projects/README.projects
index 1c029e4a34..1c029e4a34 100644
--- a/source4/lib/zlib/projects/README.projects
+++ b/lib/zlib/projects/README.projects
diff --git a/source4/lib/zlib/projects/visualc6/README.txt b/lib/zlib/projects/visualc6/README.txt
index d0296c272c..d0296c272c 100644
--- a/source4/lib/zlib/projects/visualc6/README.txt
+++ b/lib/zlib/projects/visualc6/README.txt
diff --git a/source4/lib/zlib/projects/visualc6/example.dsp b/lib/zlib/projects/visualc6/example.dsp
index e072a37ff0..e072a37ff0 100644
--- a/source4/lib/zlib/projects/visualc6/example.dsp
+++ b/lib/zlib/projects/visualc6/example.dsp
diff --git a/source4/lib/zlib/projects/visualc6/minigzip.dsp b/lib/zlib/projects/visualc6/minigzip.dsp
index f32024eaf5..f32024eaf5 100644
--- a/source4/lib/zlib/projects/visualc6/minigzip.dsp
+++ b/lib/zlib/projects/visualc6/minigzip.dsp
diff --git a/source4/lib/zlib/projects/visualc6/zlib.dsp b/lib/zlib/projects/visualc6/zlib.dsp
index 0fe0604ccd..0fe0604ccd 100644
--- a/source4/lib/zlib/projects/visualc6/zlib.dsp
+++ b/lib/zlib/projects/visualc6/zlib.dsp
diff --git a/source4/lib/zlib/projects/visualc6/zlib.dsw b/lib/zlib/projects/visualc6/zlib.dsw
index 3a771fce07..3a771fce07 100644
--- a/source4/lib/zlib/projects/visualc6/zlib.dsw
+++ b/lib/zlib/projects/visualc6/zlib.dsw
diff --git a/source4/lib/zlib/qnx/package.qpg b/lib/zlib/qnx/package.qpg
index 8a4a47c723..8a4a47c723 100644
--- a/source4/lib/zlib/qnx/package.qpg
+++ b/lib/zlib/qnx/package.qpg
diff --git a/source4/lib/zlib/trees.c b/lib/zlib/trees.c
index eb55679adc..eb55679adc 100644
--- a/source4/lib/zlib/trees.c
+++ b/lib/zlib/trees.c
diff --git a/source4/lib/zlib/trees.h b/lib/zlib/trees.h
index 72facf900f..72facf900f 100644
--- a/source4/lib/zlib/trees.h
+++ b/lib/zlib/trees.h
diff --git a/source4/lib/zlib/uncompr.c b/lib/zlib/uncompr.c
index a052f22e74..a052f22e74 100644
--- a/source4/lib/zlib/uncompr.c
+++ b/lib/zlib/uncompr.c
diff --git a/source4/lib/zlib/win32/DLL_FAQ.txt b/lib/zlib/win32/DLL_FAQ.txt
index fb18e07118..fb18e07118 100644
--- a/source4/lib/zlib/win32/DLL_FAQ.txt
+++ b/lib/zlib/win32/DLL_FAQ.txt
diff --git a/source4/lib/zlib/win32/Makefile.bor b/lib/zlib/win32/Makefile.bor
index b802519ca3..b802519ca3 100644
--- a/source4/lib/zlib/win32/Makefile.bor
+++ b/lib/zlib/win32/Makefile.bor
diff --git a/source4/lib/zlib/win32/Makefile.emx b/lib/zlib/win32/Makefile.emx
index 7b08424ced..7b08424ced 100644
--- a/source4/lib/zlib/win32/Makefile.emx
+++ b/lib/zlib/win32/Makefile.emx
diff --git a/source4/lib/zlib/win32/Makefile.gcc b/lib/zlib/win32/Makefile.gcc
index 62a8430156..62a8430156 100644
--- a/source4/lib/zlib/win32/Makefile.gcc
+++ b/lib/zlib/win32/Makefile.gcc
diff --git a/source4/lib/zlib/win32/Makefile.msc b/lib/zlib/win32/Makefile.msc
index 528ecaaf24..528ecaaf24 100644
--- a/source4/lib/zlib/win32/Makefile.msc
+++ b/lib/zlib/win32/Makefile.msc
diff --git a/source4/lib/zlib/win32/VisualC.txt b/lib/zlib/win32/VisualC.txt
index 579a5fc9e0..579a5fc9e0 100644
--- a/source4/lib/zlib/win32/VisualC.txt
+++ b/lib/zlib/win32/VisualC.txt
diff --git a/source4/lib/zlib/win32/zlib.def b/lib/zlib/win32/zlib.def
index a47cbc10ca..a47cbc10ca 100644
--- a/source4/lib/zlib/win32/zlib.def
+++ b/lib/zlib/win32/zlib.def
diff --git a/source4/lib/zlib/win32/zlib1.rc b/lib/zlib/win32/zlib1.rc
index 99025c9742..99025c9742 100644
--- a/source4/lib/zlib/win32/zlib1.rc
+++ b/lib/zlib/win32/zlib1.rc
diff --git a/source4/lib/zlib/zconf.h b/lib/zlib/zconf.h
index 3742ad4106..3742ad4106 100644
--- a/source4/lib/zlib/zconf.h
+++ b/lib/zlib/zconf.h
diff --git a/source4/lib/zlib/zconf.in.h b/lib/zlib/zconf.in.h
index 03a9431c8b..03a9431c8b 100644
--- a/source4/lib/zlib/zconf.in.h
+++ b/lib/zlib/zconf.in.h
diff --git a/source4/lib/zlib/zlib.h b/lib/zlib/zlib.h
index a660031e94..a660031e94 100644
--- a/source4/lib/zlib/zlib.h
+++ b/lib/zlib/zlib.h
diff --git a/source4/lib/zlib/zutil.c b/lib/zlib/zutil.c
index d55f5948a3..d55f5948a3 100644
--- a/source4/lib/zlib/zutil.c
+++ b/lib/zlib/zutil.c
diff --git a/source4/lib/zlib/zutil.h b/lib/zlib/zutil.h
index edd8e0acbb..edd8e0acbb 100644
--- a/source4/lib/zlib/zutil.h
+++ b/lib/zlib/zutil.h
diff --git a/source3/samba4.mk b/source3/samba4.mk
index d3804a5d94..15774d9a94 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -62,7 +62,7 @@ include $(pidldir)/config.mk
 include samba4-config.mk
 include samba4-templates.mk
 
-zlibsrcdir := $(samba4srcdir)/lib/zlib
+zlibsrcdir := $(samba4srcdir)/../lib/zlib
 dynconfigsrcdir := $(samba4srcdir)/dynconfig
 heimdalsrcdir := $(samba4srcdir)/heimdal
 dsdbsrcdir := $(samba4srcdir)/dsdb
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index d8942e42b9..25b042177d 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -294,15 +294,6 @@ static bool torture_open_connection_share(struct cli_state **c,
 	return True;
 }
 
-void torture_open_connection_free_unclist(char **unc_list)
-{
-	if (unc_list!=NULL)
-	{
-		SAFE_FREE(unc_list[0]);
-		SAFE_FREE(unc_list);
-	}
-}
-
 bool torture_open_connection(struct cli_state **c, int conn_index)
 {
 	char **unc_list = NULL;
@@ -311,7 +302,7 @@ bool torture_open_connection(struct cli_state **c, int conn_index)
 
 	if (use_multishare_conn==True) {
 		char *h, *s;
-		unc_list = file_lines_load(multishare_conn_fname, &num_unc_names, 0);
+		unc_list = file_lines_load(multishare_conn_fname, &num_unc_names, 0, NULL);
 		if (!unc_list || num_unc_names <= 0) {
 			printf("Failed to load unc names list from '%s'\n", multishare_conn_fname);
 			exit(1);
@@ -321,14 +312,14 @@ bool torture_open_connection(struct cli_state **c, int conn_index)
 				      NULL, &h, &s)) {
 			printf("Failed to parse UNC name %s\n",
 			       unc_list[conn_index % num_unc_names]);
-			torture_open_connection_free_unclist(unc_list);
+			TALLOC_FREE(unc_list);
 			exit(1);
 		}
 
 		result = torture_open_connection_share(c, h, s);
 
 		/* h, s were copied earlier */
-		torture_open_connection_free_unclist(unc_list);
+		TALLOC_FREE(unc_list);
 		return result;
 	}
 
diff --git a/source4/Makefile b/source4/Makefile
index abb010e760..7dae4729b7 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -48,7 +48,7 @@ endif
 
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
-zlibsrcdir := lib/zlib
+zlibsrcdir := ../lib/zlib
 dynconfigsrcdir := dynconfig
 heimdalsrcdir := heimdal
 dsdbsrcdir := dsdb