[SCM] Samba Shared Repository - branch master updated -
06999ae473b5a1fdf21b44fa5866ad1dbc47d749
Jelmer Vernooij
jelmer at samba.org
Wed Sep 17 12:35:19 GMT 2008
The branch, master has been updated
via 06999ae473b5a1fdf21b44fa5866ad1dbc47d749 (commit)
via 7106cd9fd5f80bc7d73b061bba51904219400829 (commit)
via d6983b2e4598137bbd050ca879b34272e3b952c6 (commit)
via 94855cd69248f0f90b6c828588afa012adc8bd45 (commit)
via 323346f7b01314bdec418d585fae236f736068fa (commit)
via 9c466a61588cf7eb442450d57cf2a46355e8907a (commit)
via cda87628bc607d6aba1ee9c8a904c86080c974d8 (commit)
via 9ef623beda5d6a7507ff6c871117c8f88e547441 (commit)
via c8bff39df639c70afc94b1795c94629ee8b7b482 (commit)
via a347ab83f447d7921d5d427e56f6965342b25834 (commit)
via ca2da6154068c8fb9ef89407d34deb9bb8f5fbfa (commit)
via a8725f18fa5cac16583ba16cd8d54ee1ae492524 (commit)
via 7fdca970407041af2f655690ddf1dc6a68d85fb7 (commit)
via bf21371c098684ccad427a54ac76766c0021bc88 (commit)
via f957aeaee64745148b815393b1fc1338104ed2e1 (commit)
via 41669237cd714c59af9e634cb2ac162d6ee57e82 (commit)
via 0888ffa2b7382a1c4781ae54bad53eac3b229365 (commit)
via 8ec93160d5cf2a0f917c1e1304127625e38ec2e0 (commit)
via 7111645d3c46e55b2c180e3db0ba8a3c670a3c31 (commit)
via 80a5da73e9a9ed148314be3fa071181c82fc7c64 (commit)
from a69a2ae5dffde95651f38b96571adc914846042c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 06999ae473b5a1fdf21b44fa5866ad1dbc47d749
Merge: 7106cd9fd5f80bc7d73b061bba51904219400829 a69a2ae5dffde95651f38b96571adc914846042c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 17 14:34:54 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlelib
commit 7106cd9fd5f80bc7d73b061bba51904219400829
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 17 14:25:25 2008 +0200
Fix merged build.
commit d6983b2e4598137bbd050ca879b34272e3b952c6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 17 14:20:56 2008 +0200
Add simple README file.
commit 94855cd69248f0f90b6c828588afa012adc8bd45
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 17 14:11:12 2008 +0200
Move common libraries from root to lib/.
commit 323346f7b01314bdec418d585fae236f736068fa
Merge: cda87628bc607d6aba1ee9c8a904c86080c974d8 9c466a61588cf7eb442450d57cf2a46355e8907a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 19:07:59 2008 +0200
Merge branch 'singlecompression' into single
commit 9c466a61588cf7eb442450d57cf2a46355e8907a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 19:07:02 2008 +0200
Use single copy of compression library in Samba3,4.
commit cda87628bc607d6aba1ee9c8a904c86080c974d8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 17:22:03 2008 +0200
Fix merged build.
commit 9ef623beda5d6a7507ff6c871117c8f88e547441
Merge: a347ab83f447d7921d5d427e56f6965342b25834 c8bff39df639c70afc94b1795c94629ee8b7b482
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 17:20:54 2008 +0200
Merge branch 'singlepopt' into single
Conflicts:
source4/Makefile
commit c8bff39df639c70afc94b1795c94629ee8b7b482
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 17:20:16 2008 +0200
Use a single copy of popt in samba3 and samba4.
commit a347ab83f447d7921d5d427e56f6965342b25834
Merge: a8725f18fa5cac16583ba16cd8d54ee1ae492524 ca2da6154068c8fb9ef89407d34deb9bb8f5fbfa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 17:07:11 2008 +0200
Merge branch 'singlensswrap' into single
Conflicts:
source3/configure.in
source4/Makefile
source4/configure.ac
source4/lib/nss_wrapper/nss_wrapper.c
source4/lib/replace/system/passwd.h
source4/main.mk
commit ca2da6154068c8fb9ef89407d34deb9bb8f5fbfa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 17:05:00 2008 +0200
Use single cope of nss_wrapper in Samba 3 and Samba 4.
commit a8725f18fa5cac16583ba16cd8d54ee1ae492524
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 16:51:00 2008 +0200
Fix include.
commit 7fdca970407041af2f655690ddf1dc6a68d85fb7
Merge: bf21371c098684ccad427a54ac76766c0021bc88 41669237cd714c59af9e634cb2ac162d6ee57e82
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 16:46:22 2008 +0200
Merge branch 'singlesw' into single
Conflicts:
source3/lib/socket_wrapper/socket_wrapper.c
source4/lib/replace/system/network.h
commit bf21371c098684ccad427a54ac76766c0021bc88
Merge: f957aeaee64745148b815393b1fc1338104ed2e1 0888ffa2b7382a1c4781ae54bad53eac3b229365
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 16:45:10 2008 +0200
Merge branch 'singlereplace' into single
Conflicts:
source4/configure.ac
source4/torture/local/config.mk
commit f957aeaee64745148b815393b1fc1338104ed2e1
Merge: 80a5da73e9a9ed148314be3fa071181c82fc7c64 8ec93160d5cf2a0f917c1e1304127625e38ec2e0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 16:44:16 2008 +0200
Merge branch 'singletdb' into single
commit 41669237cd714c59af9e634cb2ac162d6ee57e82
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 16:39:45 2008 +0200
Use single copy of socket_wrapper in Samba 3 and Samba 4.
commit 0888ffa2b7382a1c4781ae54bad53eac3b229365
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 16:30:14 2008 +0200
Make Samba 3 and Samba 4 both use the same single copy of libreplace.
commit 8ec93160d5cf2a0f917c1e1304127625e38ec2e0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 16:09:50 2008 +0200
Fix last few includes to use new tdb location.
commit 7111645d3c46e55b2c180e3db0ba8a3c670a3c31
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 15:16:31 2008 +0200
Use single copy of tdb in both samba3 and samba4.
commit 80a5da73e9a9ed148314be3fa071181c82fc7c64
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 14:36:41 2008 +0200
Share talloc source code between Samba 3 and Samba 4.
-----------------------------------------------------------------------
Summary of changes:
lib/README | 10 +
lib/compression/lzxpress.c | 312 ++
lib/compression/lzxpress.h | 50 +
lib/compression/mszip.c | 676 ++++
lib/compression/mszip.h | 33 +
lib/compression/testsuite.c | 30 +
lib/nss_wrapper/config.m4 | 19 +
lib/nss_wrapper/config.mk | 7 +
lib/nss_wrapper/nss_wrapper.c | 1130 +++++++
lib/nss_wrapper/nss_wrapper.h | 165 +
lib/nss_wrapper/nss_wrapper.pl | 265 ++
lib/popt/CHANGES | 46 +
lib/popt/COPYING | 22 +
lib/popt/README | 18 +
lib/popt/config.mk | 5 +
lib/popt/findme.c | 50 +
lib/popt/findme.h | 20 +
lib/popt/libpopt.m4 | 43 +
lib/popt/popt.c | 1249 +++++++
lib/popt/popt.h | 545 +++
lib/popt/poptconfig.c | 190 ++
lib/popt/popthelp.c | 740 ++++
lib/popt/poptint.h | 116 +
lib/popt/poptparse.c | 227 ++
lib/popt/samba.m4 | 8 +
lib/popt/system.h | 76 +
lib/replace/.checker_innocent | 4 +
lib/replace/Makefile.in | 63 +
lib/replace/README | 113 +
lib/replace/aclocal.m4 | 1 +
lib/replace/autoconf-2.60.m4 | 210 ++
lib/replace/autogen.sh | 13 +
lib/replace/config.guess | 1464 ++++++++
lib/replace/config.sub | 1577 +++++++++
lib/replace/configure.ac | 30 +
lib/replace/dlfcn.c | 75 +
lib/replace/dlfcn.m4 | 31 +
lib/replace/getaddrinfo.c | 497 +++
lib/replace/getaddrinfo.h | 91 +
lib/replace/getifaddrs.c | 361 ++
lib/replace/getpass.c | 222 ++
lib/replace/getpass.m4 | 24 +
lib/replace/inet_aton.c | 33 +
lib/replace/inet_ntoa.c | 39 +
lib/replace/inet_ntop.c | 191 ++
lib/replace/inet_pton.c | 213 ++
lib/replace/install-sh | 238 ++
lib/replace/libreplace.m4 | 308 ++
lib/replace/libreplace_cc.m4 | 182 +
lib/replace/libreplace_ld.m4 | 319 ++
lib/replace/libreplace_macros.m4 | 332 ++
lib/replace/libreplace_network.m4 | 377 +++
lib/replace/repdir.m4 | 78 +
lib/replace/repdir_getdents.c | 166 +
lib/replace/repdir_getdirentries.c | 183 +
lib/replace/replace.c | 616 ++++
lib/replace/replace.h | 582 ++++
lib/replace/samba.m4 | 35 +
lib/replace/snprintf.c | 1530 +++++++++
lib/replace/socket.c | 35 +
lib/replace/socketpair.c | 46 +
lib/replace/strptime.c | 990 ++++++
lib/replace/strptime.m4 | 13 +
lib/replace/system/README | 4 +
lib/replace/system/aio.h | 32 +
lib/replace/system/capability.h | 55 +
lib/replace/system/config.m4 | 130 +
lib/replace/system/dir.h | 67 +
lib/replace/system/filesys.h | 182 +
lib/replace/system/glob.h | 37 +
lib/replace/system/iconv.h | 57 +
lib/replace/system/kerberos.h | 137 +
lib/replace/system/locale.h | 38 +
lib/replace/system/network.h | 332 ++
lib/replace/system/passwd.h | 110 +
lib/replace/system/readline.h | 52 +
lib/replace/system/select.h | 41 +
lib/replace/system/shmem.h | 59 +
lib/replace/system/syslog.h | 70 +
lib/replace/system/terminal.h | 46 +
lib/replace/system/time.h | 69 +
lib/replace/system/wait.h | 55 +
lib/replace/test/getifaddrs.c | 100 +
lib/replace/test/os2_delete.c | 124 +
lib/replace/test/shared_mmap.c | 68 +
lib/replace/test/strptime.c | 172 +
lib/replace/test/testsuite.c | 1080 ++++++
lib/replace/timegm.c | 78 +
lib/replace/timegm.m4 | 1 +
lib/replace/win32.m4 | 20 +
lib/replace/win32_replace.h | 159 +
lib/socket_wrapper/config.m4 | 22 +
lib/socket_wrapper/config.mk | 8 +
lib/socket_wrapper/socket_wrapper.c | 1841 ++++++++++
lib/socket_wrapper/socket_wrapper.h | 136 +
lib/socket_wrapper/testsuite.c | 105 +
lib/talloc/Makefile.in | 43 +
lib/talloc/NEWS | 13 +
lib/talloc/aclocal.m4 | 1 +
lib/talloc/autogen.sh | 14 +
lib/talloc/config.guess | 1464 ++++++++
lib/talloc/config.mk | 7 +
lib/talloc/config.sub | 1577 +++++++++
lib/talloc/configure.ac | 24 +
lib/talloc/install-sh | 238 ++
lib/talloc/libtalloc.m4 | 33 +
lib/talloc/rules.mk | 18 +
lib/talloc/talloc.3.xml | 738 ++++
lib/talloc/talloc.c | 1732 ++++++++++
lib/talloc/talloc.h | 183 +
lib/talloc/talloc.i | 31 +
lib/talloc/talloc.mk | 37 +
lib/talloc/talloc.pc.in | 11 +
lib/talloc/talloc_guide.txt | 685 ++++
lib/talloc/testsuite.c | 1152 +++++++
lib/talloc/web/index.html | 46 +
lib/tdb/Makefile.in | 59 +
lib/tdb/aclocal.m4 | 1 +
lib/tdb/autogen.sh | 16 +
lib/tdb/common/dump.c | 137 +
lib/tdb/common/error.c | 57 +
lib/tdb/common/freelist.c | 382 +++
lib/tdb/common/freelistcheck.c | 107 +
lib/tdb/common/io.c | 473 +++
lib/tdb/common/lock.c | 553 +++
lib/tdb/common/open.c | 488 +++
lib/tdb/common/tdb.c | 802 +++++
lib/tdb/common/tdb_private.h | 213 ++
lib/tdb/common/transaction.c | 1119 ++++++
lib/tdb/common/traverse.c | 348 ++
lib/tdb/config.guess | 1464 ++++++++
lib/tdb/config.mk | 57 +
lib/tdb/config.sub | 1577 +++++++++
lib/tdb/configure.ac | 30 +
lib/tdb/docs/README | 238 ++
lib/tdb/docs/tdb.magic | 10 +
lib/tdb/include/tdb.h | 167 +
lib/tdb/install-sh | 238 ++
lib/tdb/libtdb.m4 | 30 +
lib/tdb/python.mk | 10 +
lib/tdb/python/tdbdump.py | 12 +
lib/tdb/python/tests/simple.py | 152 +
lib/tdb/rules.mk | 21 +
lib/tdb/tdb.i | 323 ++
lib/tdb/tdb.mk | 86 +
lib/tdb/tdb.pc.in | 11 +
lib/tdb/tdb.py | 341 ++
lib/tdb/tdb_wrap.c | 4307 ++++++++++++++++++++++++
lib/tdb/tools/tdbbackup.c | 300 ++
lib/tdb/tools/tdbdump.c | 116 +
lib/tdb/tools/tdbtest.c | 265 ++
lib/tdb/tools/tdbtool.c | 659 ++++
lib/tdb/tools/tdbtorture.c | 318 ++
lib/tdb/web/index.html | 42 +
source3/Makefile.in | 6 +-
source3/autogen.sh | 2 +-
source3/configure.in | 16 +-
source3/include/includes.h | 4 +-
source3/include/interfaces.h | 4 +-
source3/include/talloc_stack.h | 2 +-
source3/iniparser_build/dictionary.c | 2 +-
source3/iniparser_build/iniparser.c | 2 +-
source3/iniparser_build/strlib.c | 2 +-
source3/lib/compression/mszip.c | 676 ----
source3/lib/compression/mszip.h | 33 -
source3/lib/interfaces.c | 2 +-
source3/lib/ldb/ldb_tdb/ldb_tdb.h | 2 +-
source3/lib/nss_wrapper/config.m4 | 19 -
source3/lib/nss_wrapper/config.mk | 10 -
source3/lib/nss_wrapper/nss_wrapper.c | 1130 -------
source3/lib/nss_wrapper/nss_wrapper.h | 165 -
source3/lib/nss_wrapper/nss_wrapper.pl | 265 --
source3/lib/replace/.checker_innocent | 4 -
source3/lib/replace/Makefile.in | 63 -
source3/lib/replace/README | 113 -
source3/lib/replace/aclocal.m4 | 1 -
source3/lib/replace/autoconf-2.60.m4 | 210 --
source3/lib/replace/autogen.sh | 13 -
source3/lib/replace/config.guess | 1464 --------
source3/lib/replace/config.sub | 1577 ---------
source3/lib/replace/configure.ac | 30 -
source3/lib/replace/dlfcn.c | 75 -
source3/lib/replace/dlfcn.m4 | 31 -
source3/lib/replace/getaddrinfo.c | 497 ---
source3/lib/replace/getaddrinfo.h | 89 -
source3/lib/replace/getifaddrs.c | 361 --
source3/lib/replace/getpass.c | 222 --
source3/lib/replace/getpass.m4 | 24 -
source3/lib/replace/inet_aton.c | 33 -
source3/lib/replace/inet_ntoa.c | 39 -
source3/lib/replace/inet_ntop.c | 191 --
source3/lib/replace/inet_pton.c | 213 --
source3/lib/replace/install-sh | 238 --
source3/lib/replace/libreplace.m4 | 303 --
source3/lib/replace/libreplace_cc.m4 | 182 -
source3/lib/replace/libreplace_ld.m4 | 319 --
source3/lib/replace/libreplace_macros.m4 | 332 --
source3/lib/replace/libreplace_network.m4 | 377 ---
source3/lib/replace/repdir.m4 | 78 -
source3/lib/replace/repdir_getdents.c | 166 -
source3/lib/replace/repdir_getdirentries.c | 183 -
source3/lib/replace/replace.c | 616 ----
source3/lib/replace/replace.h | 582 ----
source3/lib/replace/samba.m4 | 35 -
source3/lib/replace/snprintf.c | 1530 ---------
source3/lib/replace/socket.c | 35 -
source3/lib/replace/socketpair.c | 46 -
source3/lib/replace/strptime.c | 990 ------
source3/lib/replace/strptime.m4 | 13 -
source3/lib/replace/system/README | 4 -
source3/lib/replace/system/aio.h | 32 -
source3/lib/replace/system/capability.h | 55 -
source3/lib/replace/system/config.m4 | 130 -
source3/lib/replace/system/dir.h | 67 -
source3/lib/replace/system/filesys.h | 182 -
source3/lib/replace/system/glob.h | 37 -
source3/lib/replace/system/iconv.h | 57 -
source3/lib/replace/system/kerberos.h | 137 -
source3/lib/replace/system/locale.h | 38 -
source3/lib/replace/system/network.h | 332 --
source3/lib/replace/system/passwd.h | 110 -
source3/lib/replace/system/readline.h | 52 -
source3/lib/replace/system/select.h | 41 -
source3/lib/replace/system/shmem.h | 59 -
source3/lib/replace/system/syslog.h | 70 -
source3/lib/replace/system/terminal.h | 46 -
source3/lib/replace/system/time.h | 69 -
source3/lib/replace/system/wait.h | 55 -
source3/lib/replace/test/getifaddrs.c | 100 -
source3/lib/replace/test/os2_delete.c | 124 -
source3/lib/replace/test/shared_mmap.c | 68 -
source3/lib/replace/test/strptime.c | 172 -
source3/lib/replace/test/testsuite.c | 1080 ------
source3/lib/replace/timegm.c | 78 -
source3/lib/replace/timegm.m4 | 1 -
source3/lib/replace/win32.m4 | 20 -
source3/lib/replace/win32_replace.h | 159 -
source3/lib/socket_wrapper/config.m4 | 22 -
source3/lib/socket_wrapper/config.mk | 8 -
source3/lib/socket_wrapper/socket_wrapper.c | 1841 ----------
source3/lib/socket_wrapper/socket_wrapper.h | 136 -
source3/lib/socket_wrapper/testsuite.c | 105 -
source3/lib/talloc/Makefile.in | 43 -
source3/lib/talloc/NEWS | 13 -
source3/lib/talloc/aclocal.m4 | 1 -
source3/lib/talloc/autogen.sh | 14 -
source3/lib/talloc/config.guess | 1464 --------
source3/lib/talloc/config.mk | 7 -
source3/lib/talloc/config.sub | 1577 ---------
source3/lib/talloc/configure.ac | 24 -
source3/lib/talloc/install-sh | 238 --
source3/lib/talloc/libtalloc.m4 | 33 -
source3/lib/talloc/rules.mk | 18 -
source3/lib/talloc/talloc.3.xml | 738 ----
source3/lib/talloc/talloc.c | 1732 ----------
source3/lib/talloc/talloc.h | 183 -
source3/lib/talloc/talloc.i | 31 -
source3/lib/talloc/talloc.mk | 37 -
source3/lib/talloc/talloc.pc.in | 11 -
source3/lib/talloc/talloc_guide.txt | 685 ----
source3/lib/talloc/testsuite.c | 1152 -------
source3/lib/talloc/web/index.html | 46 -
source3/lib/tdb/Makefile.in | 59 -
source3/lib/tdb/aclocal.m4 | 1 -
source3/lib/tdb/autogen.sh | 16 -
source3/lib/tdb/common/dump.c | 137 -
source3/lib/tdb/common/error.c | 57 -
source3/lib/tdb/common/freelist.c | 382 ---
source3/lib/tdb/common/freelistcheck.c | 107 -
source3/lib/tdb/common/io.c | 473 ---
source3/lib/tdb/common/lock.c | 553 ---
source3/lib/tdb/common/open.c | 488 ---
source3/lib/tdb/common/tdb.c | 802 -----
source3/lib/tdb/common/tdb_private.h | 213 --
source3/lib/tdb/common/transaction.c | 1119 ------
source3/lib/tdb/common/traverse.c | 348 --
source3/lib/tdb/config.guess | 1464 --------
source3/lib/tdb/config.mk | 57 -
source3/lib/tdb/config.sub | 1577 ---------
source3/lib/tdb/configure.ac | 30 -
source3/lib/tdb/docs/README | 238 --
source3/lib/tdb/docs/tdb.magic | 10 -
source3/lib/tdb/include/tdb.h | 167 -
source3/lib/tdb/install-sh | 238 --
source3/lib/tdb/libtdb.m4 | 30 -
source3/lib/tdb/python.mk | 10 -
source3/lib/tdb/python/tdbdump.py | 12 -
source3/lib/tdb/python/tests/simple.py | 152 -
source3/lib/tdb/rules.mk | 21 -
source3/lib/tdb/tdb.i | 323 --
source3/lib/tdb/tdb.mk | 86 -
source3/lib/tdb/tdb.pc.in | 11 -
source3/lib/tdb/tdb.py | 341 --
source3/lib/tdb/tdb_wrap.c | 4307 ------------------------
source3/lib/tdb/tools/tdbbackup.c | 300 --
source3/lib/tdb/tools/tdbdump.c | 116 -
source3/lib/tdb/tools/tdbtest.c | 265 --
source3/lib/tdb/tools/tdbtool.c | 659 ----
source3/lib/tdb/tools/tdbtorture.c | 318 --
source3/lib/tdb/web/index.html | 42 -
source3/libaddns/dns.h | 2 +-
source3/librpc/ndr/ndr_compression.c | 2 +-
source3/m4/aclocal.m4 | 2 +-
source3/nsswitch/winbind_nss_config.h | 2 +-
source3/popt/CHANGES | 46 -
source3/popt/COPYING | 22 -
source3/popt/README | 18 -
source3/popt/findme.c | 50 -
source3/popt/findme.h | 20 -
source3/popt/popt.c | 1249 -------
source3/popt/popt.h | 545 ---
source3/popt/poptconfig.c | 190 --
source3/popt/popthelp.c | 740 ----
source3/popt/poptint.h | 116 -
source3/popt/poptparse.c | 227 --
source3/popt/system.h | 76 -
source3/samba4.m4 | 10 +-
source3/samba4.mk | 13 +-
source4/Makefile | 11 +-
source4/aclocal.m4 | 2 +-
source4/autogen.sh | 2 +-
source4/cluster/ctdb/brlock_ctdb.c | 2 +-
source4/cluster/ctdb/client/ctdb_client.c | 2 +-
source4/cluster/ctdb/common/ctdb_io.c | 2 +-
source4/cluster/ctdb/common/ctdb_ltdb.c | 2 +-
source4/cluster/ctdb/common/ctdb_message.c | 2 +-
source4/cluster/ctdb/common/ctdb_util.c | 2 +-
source4/cluster/ctdb/ctdb_cluster.c | 2 +-
source4/cluster/ctdb/opendb_ctdb.c | 2 +-
source4/cluster/ctdb/server/ctdb_call.c | 2 +-
source4/cluster/ctdb/server/ctdb_control.c | 2 +-
source4/cluster/ctdb/server/ctdb_daemon.c | 2 +-
source4/cluster/ctdb/server/ctdb_freeze.c | 2 +-
source4/cluster/ctdb/server/ctdb_lockwait.c | 2 +-
source4/cluster/ctdb/server/ctdb_ltdb_server.c | 2 +-
source4/cluster/ctdb/server/ctdb_recover.c | 2 +-
source4/cluster/ctdb/server/ctdb_server.c | 2 +-
source4/cluster/ctdb/server/ctdb_takeover.c | 2 +-
source4/cluster/ctdb/server/ctdb_traverse.c | 2 +-
source4/cluster/ctdb/takeover/ctdb_takeover.c | 2 +-
source4/cluster/ctdb/tcp/tcp_connect.c | 2 +-
source4/cluster/ctdb/tcp/tcp_init.c | 2 +-
source4/cluster/ctdb/tcp/tcp_io.c | 2 +-
source4/cluster/local.c | 2 +-
source4/configure.ac | 20 +-
source4/heimdal_build/config.h | 2 +-
source4/heimdal_build/gssapi-glue.c | 2 +-
source4/include/includes.h | 2 +-
source4/lib/compression/lzxpress.c | 312 --
source4/lib/compression/lzxpress.h | 50 -
source4/lib/compression/mszip.c | 676 ----
source4/lib/compression/mszip.h | 33 -
source4/lib/compression/testsuite.c | 30 -
source4/lib/dbwrap/dbwrap.c | 2 +-
source4/lib/dbwrap/dbwrap_ctdb.c | 2 +-
source4/lib/dbwrap/dbwrap_tdb.c | 2 +-
source4/lib/messaging/messaging.c | 3 +-
source4/lib/nss_wrapper/config.m4 | 19 -
source4/lib/nss_wrapper/config.mk | 7 -
source4/lib/nss_wrapper/nss_wrapper.c | 1130 -------
source4/lib/nss_wrapper/nss_wrapper.h | 165 -
source4/lib/nss_wrapper/nss_wrapper.pl | 265 --
source4/lib/popt/CHANGES | 46 -
source4/lib/popt/COPYING | 22 -
source4/lib/popt/README | 18 -
source4/lib/popt/config.mk | 5 -
source4/lib/popt/findme.c | 50 -
source4/lib/popt/findme.h | 20 -
source4/lib/popt/libpopt.m4 | 43 -
source4/lib/popt/popt.c | 1238 -------
source4/lib/popt/popt.h | 541 ---
source4/lib/popt/poptconfig.c | 190 --
source4/lib/popt/popthelp.c | 742 ----
source4/lib/popt/poptint.h | 116 -
source4/lib/popt/poptparse.c | 227 --
source4/lib/popt/samba.m4 | 8 -
source4/lib/popt/system.h | 74 -
source4/lib/replace/.checker_innocent | 4 -
source4/lib/replace/Makefile.in | 63 -
source4/lib/replace/README | 113 -
source4/lib/replace/aclocal.m4 | 1 -
source4/lib/replace/autoconf-2.60.m4 | 210 --
source4/lib/replace/autogen.sh | 13 -
source4/lib/replace/config.guess | 1464 --------
source4/lib/replace/config.sub | 1577 ---------
source4/lib/replace/configure.ac | 30 -
source4/lib/replace/dlfcn.c | 75 -
source4/lib/replace/dlfcn.m4 | 31 -
source4/lib/replace/getaddrinfo.c | 497 ---
source4/lib/replace/getaddrinfo.h | 89 -
source4/lib/replace/getifaddrs.c | 361 --
source4/lib/replace/getpass.c | 222 --
source4/lib/replace/getpass.m4 | 24 -
source4/lib/replace/inet_aton.c | 33 -
source4/lib/replace/inet_ntoa.c | 39 -
source4/lib/replace/inet_ntop.c | 191 --
source4/lib/replace/inet_pton.c | 213 --
source4/lib/replace/install-sh | 238 --
source4/lib/replace/libreplace.m4 | 303 --
source4/lib/replace/libreplace_cc.m4 | 182 -
source4/lib/replace/libreplace_ld.m4 | 319 --
source4/lib/replace/libreplace_macros.m4 | 332 --
source4/lib/replace/libreplace_network.m4 | 377 ---
source4/lib/replace/repdir.m4 | 78 -
source4/lib/replace/repdir_getdents.c | 166 -
source4/lib/replace/repdir_getdirentries.c | 183 -
source4/lib/replace/replace.c | 616 ----
source4/lib/replace/replace.h | 582 ----
source4/lib/replace/samba.m4 | 35 -
source4/lib/replace/snprintf.c | 1530 ---------
source4/lib/replace/socket.c | 35 -
source4/lib/replace/socketpair.c | 46 -
source4/lib/replace/strptime.c | 990 ------
source4/lib/replace/strptime.m4 | 13 -
source4/lib/replace/system/README | 4 -
source4/lib/replace/system/aio.h | 32 -
source4/lib/replace/system/capability.h | 55 -
source4/lib/replace/system/config.m4 | 130 -
source4/lib/replace/system/dir.h | 67 -
source4/lib/replace/system/filesys.h | 182 -
source4/lib/replace/system/glob.h | 37 -
source4/lib/replace/system/iconv.h | 57 -
source4/lib/replace/system/kerberos.h | 137 -
source4/lib/replace/system/locale.h | 38 -
source4/lib/replace/system/network.h | 332 --
source4/lib/replace/system/passwd.h | 110 -
source4/lib/replace/system/readline.h | 52 -
source4/lib/replace/system/select.h | 41 -
source4/lib/replace/system/shmem.h | 59 -
source4/lib/replace/system/syslog.h | 70 -
source4/lib/replace/system/terminal.h | 46 -
source4/lib/replace/system/time.h | 69 -
source4/lib/replace/system/wait.h | 55 -
source4/lib/replace/test/getifaddrs.c | 100 -
source4/lib/replace/test/os2_delete.c | 124 -
source4/lib/replace/test/shared_mmap.c | 68 -
source4/lib/replace/test/strptime.c | 172 -
source4/lib/replace/test/testsuite.c | 1080 ------
source4/lib/replace/timegm.c | 78 -
source4/lib/replace/timegm.m4 | 1 -
source4/lib/replace/win32.m4 | 20 -
source4/lib/replace/win32_replace.h | 159 -
source4/lib/socket_wrapper/config.m4 | 22 -
source4/lib/socket_wrapper/config.mk | 8 -
source4/lib/socket_wrapper/socket_wrapper.c | 1841 ----------
source4/lib/socket_wrapper/socket_wrapper.h | 136 -
source4/lib/socket_wrapper/testsuite.c | 105 -
source4/lib/talloc/Makefile.in | 43 -
source4/lib/talloc/NEWS | 13 -
source4/lib/talloc/aclocal.m4 | 1 -
source4/lib/talloc/autogen.sh | 14 -
source4/lib/talloc/config.guess | 1464 --------
source4/lib/talloc/config.mk | 7 -
source4/lib/talloc/config.sub | 1577 ---------
source4/lib/talloc/configure.ac | 24 -
source4/lib/talloc/install-sh | 238 --
source4/lib/talloc/libtalloc.m4 | 33 -
source4/lib/talloc/rules.mk | 18 -
source4/lib/talloc/talloc.3.xml | 738 ----
source4/lib/talloc/talloc.c | 1732 ----------
source4/lib/talloc/talloc.h | 183 -
source4/lib/talloc/talloc.i | 31 -
source4/lib/talloc/talloc.mk | 37 -
source4/lib/talloc/talloc.pc.in | 11 -
source4/lib/talloc/talloc_guide.txt | 685 ----
source4/lib/talloc/testsuite.c | 1152 -------
source4/lib/talloc/web/index.html | 46 -
source4/lib/tdb/Makefile.in | 59 -
source4/lib/tdb/aclocal.m4 | 1 -
source4/lib/tdb/autogen.sh | 16 -
source4/lib/tdb/common/dump.c | 137 -
source4/lib/tdb/common/error.c | 57 -
source4/lib/tdb/common/freelist.c | 382 ---
source4/lib/tdb/common/freelistcheck.c | 107 -
source4/lib/tdb/common/io.c | 473 ---
source4/lib/tdb/common/lock.c | 553 ---
source4/lib/tdb/common/open.c | 488 ---
source4/lib/tdb/common/tdb.c | 802 -----
source4/lib/tdb/common/tdb_private.h | 213 --
source4/lib/tdb/common/transaction.c | 1119 ------
source4/lib/tdb/common/traverse.c | 348 --
source4/lib/tdb/config.guess | 1464 --------
source4/lib/tdb/config.mk | 57 -
source4/lib/tdb/config.sub | 1577 ---------
source4/lib/tdb/configure.ac | 30 -
source4/lib/tdb/docs/README | 238 --
source4/lib/tdb/docs/tdb.magic | 10 -
source4/lib/tdb/include/tdb.h | 167 -
source4/lib/tdb/install-sh | 238 --
source4/lib/tdb/libtdb.m4 | 30 -
source4/lib/tdb/python.mk | 10 -
source4/lib/tdb/python/tdbdump.py | 12 -
source4/lib/tdb/python/tests/simple.py | 152 -
source4/lib/tdb/rules.mk | 21 -
source4/lib/tdb/tdb.i | 323 --
source4/lib/tdb/tdb.mk | 86 -
source4/lib/tdb/tdb.pc.in | 11 -
source4/lib/tdb/tdb.py | 341 --
source4/lib/tdb/tdb_wrap.c | 4307 ------------------------
source4/lib/tdb/tools/tdbbackup.c | 300 --
source4/lib/tdb/tools/tdbdump.c | 116 -
source4/lib/tdb/tools/tdbtest.c | 265 --
source4/lib/tdb/tools/tdbtool.c | 659 ----
source4/lib/tdb/tools/tdbtorture.c | 318 --
source4/lib/tdb/web/index.html | 42 -
source4/lib/tdb_wrap.c | 2 +-
source4/lib/util/util_tdb.c | 2 +-
source4/librpc/ndr/ndr_compression.c | 2 +-
source4/main.mk | 4 +-
source4/nsswitch/winbind_nss_config.h | 2 +-
source4/ntvfs/common/brlock.c | 2 +-
source4/ntvfs/common/brlock_tdb.c | 2 +-
source4/ntvfs/common/notify.c | 2 +-
source4/ntvfs/common/opendb_tdb.c | 2 +-
source4/ntvfs/posix/vfs_posix.c | 2 +-
source4/ntvfs/posix/xattr_tdb.c | 2 +-
source4/param/secrets.c | 2 +-
source4/smbd/process_prefork.c | 2 +-
source4/smbd/process_standard.c | 2 +-
source4/torture/basic/mangle_test.c | 2 +-
source4/torture/local/config.mk | 14 +-
source4/torture/local/dbspeed.c | 2 +-
522 files changed, 46507 insertions(+), 92409 deletions(-)
create mode 100644 lib/README
create mode 100644 lib/compression/lzxpress.c
create mode 100644 lib/compression/lzxpress.h
create mode 100644 lib/compression/mszip.c
create mode 100644 lib/compression/mszip.h
create mode 100644 lib/compression/testsuite.c
create mode 100644 lib/nss_wrapper/config.m4
create mode 100644 lib/nss_wrapper/config.mk
create mode 100644 lib/nss_wrapper/nss_wrapper.c
create mode 100644 lib/nss_wrapper/nss_wrapper.h
create mode 100644 lib/nss_wrapper/nss_wrapper.pl
create mode 100644 lib/popt/CHANGES
create mode 100644 lib/popt/COPYING
create mode 100644 lib/popt/README
create mode 100644 lib/popt/config.mk
create mode 100644 lib/popt/dummy.in
create mode 100644 lib/popt/findme.c
create mode 100644 lib/popt/findme.h
create mode 100644 lib/popt/libpopt.m4
create mode 100644 lib/popt/popt.c
create mode 100644 lib/popt/popt.h
create mode 100644 lib/popt/poptconfig.c
create mode 100644 lib/popt/popthelp.c
create mode 100644 lib/popt/poptint.h
create mode 100644 lib/popt/poptparse.c
create mode 100644 lib/popt/samba.m4
create mode 100644 lib/popt/system.h
create mode 100644 lib/replace/.checker_innocent
create mode 100644 lib/replace/Makefile.in
create mode 100644 lib/replace/README
create mode 100644 lib/replace/aclocal.m4
create mode 100644 lib/replace/autoconf-2.60.m4
create mode 100755 lib/replace/autogen.sh
create mode 100755 lib/replace/config.guess
create mode 100755 lib/replace/config.sub
create mode 100644 lib/replace/configure.ac
create mode 100644 lib/replace/dlfcn.c
create mode 100644 lib/replace/dlfcn.m4
create mode 100644 lib/replace/getaddrinfo.c
create mode 100644 lib/replace/getaddrinfo.h
create mode 100644 lib/replace/getifaddrs.c
create mode 100644 lib/replace/getpass.c
create mode 100644 lib/replace/getpass.m4
create mode 100644 lib/replace/inet_aton.c
create mode 100644 lib/replace/inet_ntoa.c
create mode 100644 lib/replace/inet_ntop.c
create mode 100644 lib/replace/inet_pton.c
create mode 100755 lib/replace/install-sh
create mode 100644 lib/replace/libreplace.m4
create mode 100644 lib/replace/libreplace_cc.m4
create mode 100644 lib/replace/libreplace_ld.m4
create mode 100644 lib/replace/libreplace_macros.m4
create mode 100644 lib/replace/libreplace_network.m4
create mode 100644 lib/replace/repdir.m4
create mode 100644 lib/replace/repdir_getdents.c
create mode 100644 lib/replace/repdir_getdirentries.c
create mode 100644 lib/replace/replace.c
create mode 100644 lib/replace/replace.h
create mode 100644 lib/replace/samba.m4
create mode 100644 lib/replace/snprintf.c
create mode 100644 lib/replace/socket.c
create mode 100644 lib/replace/socketpair.c
create mode 100644 lib/replace/strptime.c
create mode 100644 lib/replace/strptime.m4
create mode 100644 lib/replace/system/README
create mode 100644 lib/replace/system/aio.h
create mode 100644 lib/replace/system/capability.h
create mode 100644 lib/replace/system/config.m4
create mode 100644 lib/replace/system/dir.h
create mode 100644 lib/replace/system/filesys.h
create mode 100644 lib/replace/system/glob.h
create mode 100644 lib/replace/system/iconv.h
create mode 100644 lib/replace/system/kerberos.h
create mode 100644 lib/replace/system/locale.h
create mode 100644 lib/replace/system/network.h
create mode 100644 lib/replace/system/passwd.h
create mode 100644 lib/replace/system/readline.h
create mode 100644 lib/replace/system/select.h
create mode 100644 lib/replace/system/shmem.h
create mode 100644 lib/replace/system/syslog.h
create mode 100644 lib/replace/system/terminal.h
create mode 100644 lib/replace/system/time.h
create mode 100644 lib/replace/system/wait.h
create mode 100644 lib/replace/test/getifaddrs.c
create mode 100644 lib/replace/test/os2_delete.c
create mode 100644 lib/replace/test/shared_mmap.c
create mode 100644 lib/replace/test/strptime.c
create mode 100644 lib/replace/test/testsuite.c
create mode 100644 lib/replace/timegm.c
create mode 100644 lib/replace/timegm.m4
create mode 100644 lib/replace/win32.m4
create mode 100644 lib/replace/win32_replace.h
create mode 100644 lib/socket_wrapper/config.m4
create mode 100644 lib/socket_wrapper/config.mk
create mode 100644 lib/socket_wrapper/socket_wrapper.c
create mode 100644 lib/socket_wrapper/socket_wrapper.h
create mode 100644 lib/socket_wrapper/testsuite.c
create mode 100644 lib/talloc/Makefile.in
create mode 100644 lib/talloc/NEWS
create mode 100644 lib/talloc/aclocal.m4
create mode 100755 lib/talloc/autogen.sh
create mode 100755 lib/talloc/config.guess
create mode 100644 lib/talloc/config.mk
create mode 100755 lib/talloc/config.sub
create mode 100644 lib/talloc/configure.ac
create mode 100755 lib/talloc/install-sh
create mode 100644 lib/talloc/libtalloc.m4
create mode 100644 lib/talloc/rules.mk
create mode 100644 lib/talloc/talloc.3.xml
create mode 100644 lib/talloc/talloc.c
create mode 100644 lib/talloc/talloc.h
create mode 100644 lib/talloc/talloc.i
create mode 100644 lib/talloc/talloc.mk
create mode 100644 lib/talloc/talloc.pc.in
create mode 100644 lib/talloc/talloc_guide.txt
create mode 100644 lib/talloc/testsuite.c
create mode 100644 lib/talloc/web/index.html
create mode 100644 lib/tdb/Makefile.in
create mode 100644 lib/tdb/aclocal.m4
create mode 100755 lib/tdb/autogen.sh
create mode 100644 lib/tdb/common/dump.c
create mode 100644 lib/tdb/common/error.c
create mode 100644 lib/tdb/common/freelist.c
create mode 100644 lib/tdb/common/freelistcheck.c
create mode 100644 lib/tdb/common/io.c
create mode 100644 lib/tdb/common/lock.c
create mode 100644 lib/tdb/common/open.c
create mode 100644 lib/tdb/common/tdb.c
create mode 100644 lib/tdb/common/tdb_private.h
create mode 100644 lib/tdb/common/transaction.c
create mode 100644 lib/tdb/common/traverse.c
create mode 100755 lib/tdb/config.guess
create mode 100644 lib/tdb/config.mk
create mode 100755 lib/tdb/config.sub
create mode 100644 lib/tdb/configure.ac
create mode 100644 lib/tdb/docs/README
create mode 100644 lib/tdb/docs/tdb.magic
create mode 100644 lib/tdb/include/tdb.h
create mode 100755 lib/tdb/install-sh
create mode 100644 lib/tdb/libtdb.m4
create mode 100644 lib/tdb/python.mk
create mode 100644 lib/tdb/python/tdbdump.py
create mode 100644 lib/tdb/python/tests/simple.py
create mode 100644 lib/tdb/rules.mk
create mode 100644 lib/tdb/tdb.i
create mode 100644 lib/tdb/tdb.mk
create mode 100644 lib/tdb/tdb.pc.in
create mode 100644 lib/tdb/tdb.py
create mode 100644 lib/tdb/tdb_wrap.c
create mode 100644 lib/tdb/tools/tdbbackup.c
create mode 100644 lib/tdb/tools/tdbdump.c
create mode 100644 lib/tdb/tools/tdbtest.c
create mode 100644 lib/tdb/tools/tdbtool.c
create mode 100644 lib/tdb/tools/tdbtorture.c
create mode 100644 lib/tdb/web/index.html
delete mode 100644 source3/lib/compression/mszip.c
delete mode 100644 source3/lib/compression/mszip.h
delete mode 100644 source3/lib/nss_wrapper/config.m4
delete mode 100644 source3/lib/nss_wrapper/config.mk
delete mode 100644 source3/lib/nss_wrapper/nss_wrapper.c
delete mode 100644 source3/lib/nss_wrapper/nss_wrapper.h
delete mode 100644 source3/lib/nss_wrapper/nss_wrapper.pl
delete mode 100644 source3/lib/replace/.checker_innocent
delete mode 100644 source3/lib/replace/Makefile.in
delete mode 100644 source3/lib/replace/README
delete mode 100644 source3/lib/replace/aclocal.m4
delete mode 100644 source3/lib/replace/autoconf-2.60.m4
delete mode 100755 source3/lib/replace/autogen.sh
delete mode 100755 source3/lib/replace/config.guess
delete mode 100755 source3/lib/replace/config.sub
delete mode 100644 source3/lib/replace/configure.ac
delete mode 100644 source3/lib/replace/dlfcn.c
delete mode 100644 source3/lib/replace/dlfcn.m4
delete mode 100644 source3/lib/replace/getaddrinfo.c
delete mode 100644 source3/lib/replace/getaddrinfo.h
delete mode 100644 source3/lib/replace/getifaddrs.c
delete mode 100644 source3/lib/replace/getpass.c
delete mode 100644 source3/lib/replace/getpass.m4
delete mode 100644 source3/lib/replace/inet_aton.c
delete mode 100644 source3/lib/replace/inet_ntoa.c
delete mode 100644 source3/lib/replace/inet_ntop.c
delete mode 100644 source3/lib/replace/inet_pton.c
delete mode 100755 source3/lib/replace/install-sh
delete mode 100644 source3/lib/replace/libreplace.m4
delete mode 100644 source3/lib/replace/libreplace_cc.m4
delete mode 100644 source3/lib/replace/libreplace_ld.m4
delete mode 100644 source3/lib/replace/libreplace_macros.m4
delete mode 100644 source3/lib/replace/libreplace_network.m4
delete mode 100644 source3/lib/replace/repdir.m4
delete mode 100644 source3/lib/replace/repdir_getdents.c
delete mode 100644 source3/lib/replace/repdir_getdirentries.c
delete mode 100644 source3/lib/replace/replace.c
delete mode 100644 source3/lib/replace/replace.h
delete mode 100644 source3/lib/replace/samba.m4
delete mode 100644 source3/lib/replace/snprintf.c
delete mode 100644 source3/lib/replace/socket.c
delete mode 100644 source3/lib/replace/socketpair.c
delete mode 100644 source3/lib/replace/strptime.c
delete mode 100644 source3/lib/replace/strptime.m4
delete mode 100644 source3/lib/replace/system/README
delete mode 100644 source3/lib/replace/system/aio.h
delete mode 100644 source3/lib/replace/system/capability.h
delete mode 100644 source3/lib/replace/system/config.m4
delete mode 100644 source3/lib/replace/system/dir.h
delete mode 100644 source3/lib/replace/system/filesys.h
delete mode 100644 source3/lib/replace/system/glob.h
delete mode 100644 source3/lib/replace/system/iconv.h
delete mode 100644 source3/lib/replace/system/kerberos.h
delete mode 100644 source3/lib/replace/system/locale.h
delete mode 100644 source3/lib/replace/system/network.h
delete mode 100644 source3/lib/replace/system/passwd.h
delete mode 100644 source3/lib/replace/system/readline.h
delete mode 100644 source3/lib/replace/system/select.h
delete mode 100644 source3/lib/replace/system/shmem.h
delete mode 100644 source3/lib/replace/system/syslog.h
delete mode 100644 source3/lib/replace/system/terminal.h
delete mode 100644 source3/lib/replace/system/time.h
delete mode 100644 source3/lib/replace/system/wait.h
delete mode 100644 source3/lib/replace/test/getifaddrs.c
delete mode 100644 source3/lib/replace/test/os2_delete.c
delete mode 100644 source3/lib/replace/test/shared_mmap.c
delete mode 100644 source3/lib/replace/test/strptime.c
delete mode 100644 source3/lib/replace/test/testsuite.c
delete mode 100644 source3/lib/replace/timegm.c
delete mode 100644 source3/lib/replace/timegm.m4
delete mode 100644 source3/lib/replace/win32.m4
delete mode 100644 source3/lib/replace/win32_replace.h
delete mode 100644 source3/lib/socket_wrapper/config.m4
delete mode 100644 source3/lib/socket_wrapper/config.mk
delete mode 100644 source3/lib/socket_wrapper/socket_wrapper.c
delete mode 100644 source3/lib/socket_wrapper/socket_wrapper.h
delete mode 100644 source3/lib/socket_wrapper/testsuite.c
delete mode 100644 source3/lib/talloc/Makefile.in
delete mode 100644 source3/lib/talloc/NEWS
delete mode 100644 source3/lib/talloc/aclocal.m4
delete mode 100755 source3/lib/talloc/autogen.sh
delete mode 100755 source3/lib/talloc/config.guess
delete mode 100644 source3/lib/talloc/config.mk
delete mode 100755 source3/lib/talloc/config.sub
delete mode 100644 source3/lib/talloc/configure.ac
delete mode 100755 source3/lib/talloc/install-sh
delete mode 100644 source3/lib/talloc/libtalloc.m4
delete mode 100644 source3/lib/talloc/rules.mk
delete mode 100644 source3/lib/talloc/talloc.3.xml
delete mode 100644 source3/lib/talloc/talloc.c
delete mode 100644 source3/lib/talloc/talloc.h
delete mode 100644 source3/lib/talloc/talloc.i
delete mode 100644 source3/lib/talloc/talloc.mk
delete mode 100644 source3/lib/talloc/talloc.pc.in
delete mode 100644 source3/lib/talloc/talloc_guide.txt
delete mode 100644 source3/lib/talloc/testsuite.c
delete mode 100644 source3/lib/talloc/web/index.html
delete mode 100644 source3/lib/tdb/Makefile.in
delete mode 100644 source3/lib/tdb/aclocal.m4
delete mode 100755 source3/lib/tdb/autogen.sh
delete mode 100644 source3/lib/tdb/common/dump.c
delete mode 100644 source3/lib/tdb/common/error.c
delete mode 100644 source3/lib/tdb/common/freelist.c
delete mode 100644 source3/lib/tdb/common/freelistcheck.c
delete mode 100644 source3/lib/tdb/common/io.c
delete mode 100644 source3/lib/tdb/common/lock.c
delete mode 100644 source3/lib/tdb/common/open.c
delete mode 100644 source3/lib/tdb/common/tdb.c
delete mode 100644 source3/lib/tdb/common/tdb_private.h
delete mode 100644 source3/lib/tdb/common/transaction.c
delete mode 100644 source3/lib/tdb/common/traverse.c
delete mode 100755 source3/lib/tdb/config.guess
delete mode 100644 source3/lib/tdb/config.mk
delete mode 100755 source3/lib/tdb/config.sub
delete mode 100644 source3/lib/tdb/configure.ac
delete mode 100644 source3/lib/tdb/docs/README
delete mode 100644 source3/lib/tdb/docs/tdb.magic
delete mode 100644 source3/lib/tdb/include/tdb.h
delete mode 100755 source3/lib/tdb/install-sh
delete mode 100644 source3/lib/tdb/libtdb.m4
delete mode 100644 source3/lib/tdb/python.mk
delete mode 100644 source3/lib/tdb/python/tdbdump.py
delete mode 100644 source3/lib/tdb/python/tests/simple.py
delete mode 100644 source3/lib/tdb/rules.mk
delete mode 100644 source3/lib/tdb/tdb.i
delete mode 100644 source3/lib/tdb/tdb.mk
delete mode 100644 source3/lib/tdb/tdb.pc.in
delete mode 100644 source3/lib/tdb/tdb.py
delete mode 100644 source3/lib/tdb/tdb_wrap.c
delete mode 100644 source3/lib/tdb/tools/tdbbackup.c
delete mode 100644 source3/lib/tdb/tools/tdbdump.c
delete mode 100644 source3/lib/tdb/tools/tdbtest.c
delete mode 100644 source3/lib/tdb/tools/tdbtool.c
delete mode 100644 source3/lib/tdb/tools/tdbtorture.c
delete mode 100644 source3/lib/tdb/web/index.html
delete mode 100644 source3/popt/CHANGES
delete mode 100644 source3/popt/COPYING
delete mode 100644 source3/popt/README
delete mode 100644 source3/popt/dummy.in
delete mode 100644 source3/popt/findme.c
delete mode 100644 source3/popt/findme.h
delete mode 100644 source3/popt/popt.c
delete mode 100644 source3/popt/popt.h
delete mode 100644 source3/popt/poptconfig.c
delete mode 100644 source3/popt/popthelp.c
delete mode 100644 source3/popt/poptint.h
delete mode 100644 source3/popt/poptparse.c
delete mode 100644 source3/popt/system.h
delete mode 100644 source4/lib/compression/lzxpress.c
delete mode 100644 source4/lib/compression/lzxpress.h
delete mode 100644 source4/lib/compression/mszip.c
delete mode 100644 source4/lib/compression/mszip.h
delete mode 100644 source4/lib/compression/testsuite.c
delete mode 100644 source4/lib/nss_wrapper/config.m4
delete mode 100644 source4/lib/nss_wrapper/config.mk
delete mode 100644 source4/lib/nss_wrapper/nss_wrapper.c
delete mode 100644 source4/lib/nss_wrapper/nss_wrapper.h
delete mode 100644 source4/lib/nss_wrapper/nss_wrapper.pl
delete mode 100644 source4/lib/popt/CHANGES
delete mode 100644 source4/lib/popt/COPYING
delete mode 100644 source4/lib/popt/README
delete mode 100644 source4/lib/popt/config.mk
delete mode 100644 source4/lib/popt/findme.c
delete mode 100644 source4/lib/popt/findme.h
delete mode 100644 source4/lib/popt/libpopt.m4
delete mode 100644 source4/lib/popt/popt.c
delete mode 100644 source4/lib/popt/popt.h
delete mode 100644 source4/lib/popt/poptconfig.c
delete mode 100644 source4/lib/popt/popthelp.c
delete mode 100644 source4/lib/popt/poptint.h
delete mode 100644 source4/lib/popt/poptparse.c
delete mode 100644 source4/lib/popt/samba.m4
delete mode 100644 source4/lib/popt/system.h
delete mode 100644 source4/lib/replace/.checker_innocent
delete mode 100644 source4/lib/replace/Makefile.in
delete mode 100644 source4/lib/replace/README
delete mode 100644 source4/lib/replace/aclocal.m4
delete mode 100644 source4/lib/replace/autoconf-2.60.m4
delete mode 100755 source4/lib/replace/autogen.sh
delete mode 100755 source4/lib/replace/config.guess
delete mode 100755 source4/lib/replace/config.sub
delete mode 100644 source4/lib/replace/configure.ac
delete mode 100644 source4/lib/replace/dlfcn.c
delete mode 100644 source4/lib/replace/dlfcn.m4
delete mode 100644 source4/lib/replace/getaddrinfo.c
delete mode 100644 source4/lib/replace/getaddrinfo.h
delete mode 100644 source4/lib/replace/getifaddrs.c
delete mode 100644 source4/lib/replace/getpass.c
delete mode 100644 source4/lib/replace/getpass.m4
delete mode 100644 source4/lib/replace/inet_aton.c
delete mode 100644 source4/lib/replace/inet_ntoa.c
delete mode 100644 source4/lib/replace/inet_ntop.c
delete mode 100644 source4/lib/replace/inet_pton.c
delete mode 100755 source4/lib/replace/install-sh
delete mode 100644 source4/lib/replace/libreplace.m4
delete mode 100644 source4/lib/replace/libreplace_cc.m4
delete mode 100644 source4/lib/replace/libreplace_ld.m4
delete mode 100644 source4/lib/replace/libreplace_macros.m4
delete mode 100644 source4/lib/replace/libreplace_network.m4
delete mode 100644 source4/lib/replace/repdir.m4
delete mode 100644 source4/lib/replace/repdir_getdents.c
delete mode 100644 source4/lib/replace/repdir_getdirentries.c
delete mode 100644 source4/lib/replace/replace.c
delete mode 100644 source4/lib/replace/replace.h
delete mode 100644 source4/lib/replace/samba.m4
delete mode 100644 source4/lib/replace/snprintf.c
delete mode 100644 source4/lib/replace/socket.c
delete mode 100644 source4/lib/replace/socketpair.c
delete mode 100644 source4/lib/replace/strptime.c
delete mode 100644 source4/lib/replace/strptime.m4
delete mode 100644 source4/lib/replace/system/README
delete mode 100644 source4/lib/replace/system/aio.h
delete mode 100644 source4/lib/replace/system/capability.h
delete mode 100644 source4/lib/replace/system/config.m4
delete mode 100644 source4/lib/replace/system/dir.h
delete mode 100644 source4/lib/replace/system/filesys.h
delete mode 100644 source4/lib/replace/system/glob.h
delete mode 100644 source4/lib/replace/system/iconv.h
delete mode 100644 source4/lib/replace/system/kerberos.h
delete mode 100644 source4/lib/replace/system/locale.h
delete mode 100644 source4/lib/replace/system/network.h
delete mode 100644 source4/lib/replace/system/passwd.h
delete mode 100644 source4/lib/replace/system/readline.h
delete mode 100644 source4/lib/replace/system/select.h
delete mode 100644 source4/lib/replace/system/shmem.h
delete mode 100644 source4/lib/replace/system/syslog.h
delete mode 100644 source4/lib/replace/system/terminal.h
delete mode 100644 source4/lib/replace/system/time.h
delete mode 100644 source4/lib/replace/system/wait.h
delete mode 100644 source4/lib/replace/test/getifaddrs.c
delete mode 100644 source4/lib/replace/test/os2_delete.c
delete mode 100644 source4/lib/replace/test/shared_mmap.c
delete mode 100644 source4/lib/replace/test/strptime.c
delete mode 100644 source4/lib/replace/test/testsuite.c
delete mode 100644 source4/lib/replace/timegm.c
delete mode 100644 source4/lib/replace/timegm.m4
delete mode 100644 source4/lib/replace/win32.m4
delete mode 100644 source4/lib/replace/win32_replace.h
delete mode 100644 source4/lib/socket_wrapper/config.m4
delete mode 100644 source4/lib/socket_wrapper/config.mk
delete mode 100644 source4/lib/socket_wrapper/socket_wrapper.c
delete mode 100644 source4/lib/socket_wrapper/socket_wrapper.h
delete mode 100644 source4/lib/socket_wrapper/testsuite.c
delete mode 100644 source4/lib/talloc/Makefile.in
delete mode 100644 source4/lib/talloc/NEWS
delete mode 100644 source4/lib/talloc/aclocal.m4
delete mode 100755 source4/lib/talloc/autogen.sh
delete mode 100755 source4/lib/talloc/config.guess
delete mode 100644 source4/lib/talloc/config.mk
delete mode 100755 source4/lib/talloc/config.sub
delete mode 100644 source4/lib/talloc/configure.ac
delete mode 100755 source4/lib/talloc/install-sh
delete mode 100644 source4/lib/talloc/libtalloc.m4
delete mode 100644 source4/lib/talloc/rules.mk
delete mode 100644 source4/lib/talloc/talloc.3.xml
delete mode 100644 source4/lib/talloc/talloc.c
delete mode 100644 source4/lib/talloc/talloc.h
delete mode 100644 source4/lib/talloc/talloc.i
delete mode 100644 source4/lib/talloc/talloc.mk
delete mode 100644 source4/lib/talloc/talloc.pc.in
delete mode 100644 source4/lib/talloc/talloc_guide.txt
delete mode 100644 source4/lib/talloc/testsuite.c
delete mode 100644 source4/lib/talloc/web/index.html
delete mode 100644 source4/lib/tdb/Makefile.in
delete mode 100644 source4/lib/tdb/aclocal.m4
delete mode 100755 source4/lib/tdb/autogen.sh
delete mode 100644 source4/lib/tdb/common/dump.c
delete mode 100644 source4/lib/tdb/common/error.c
delete mode 100644 source4/lib/tdb/common/freelist.c
delete mode 100644 source4/lib/tdb/common/freelistcheck.c
delete mode 100644 source4/lib/tdb/common/io.c
delete mode 100644 source4/lib/tdb/common/lock.c
delete mode 100644 source4/lib/tdb/common/open.c
delete mode 100644 source4/lib/tdb/common/tdb.c
delete mode 100644 source4/lib/tdb/common/tdb_private.h
delete mode 100644 source4/lib/tdb/common/transaction.c
delete mode 100644 source4/lib/tdb/common/traverse.c
delete mode 100755 source4/lib/tdb/config.guess
delete mode 100644 source4/lib/tdb/config.mk
delete mode 100755 source4/lib/tdb/config.sub
delete mode 100644 source4/lib/tdb/configure.ac
delete mode 100644 source4/lib/tdb/docs/README
delete mode 100644 source4/lib/tdb/docs/tdb.magic
delete mode 100644 source4/lib/tdb/include/tdb.h
delete mode 100755 source4/lib/tdb/install-sh
delete mode 100644 source4/lib/tdb/libtdb.m4
delete mode 100644 source4/lib/tdb/python.mk
delete mode 100644 source4/lib/tdb/python/tdbdump.py
delete mode 100644 source4/lib/tdb/python/tests/simple.py
delete mode 100644 source4/lib/tdb/rules.mk
delete mode 100644 source4/lib/tdb/tdb.i
delete mode 100644 source4/lib/tdb/tdb.mk
delete mode 100644 source4/lib/tdb/tdb.pc.in
delete mode 100644 source4/lib/tdb/tdb.py
delete mode 100644 source4/lib/tdb/tdb_wrap.c
delete mode 100644 source4/lib/tdb/tools/tdbbackup.c
delete mode 100644 source4/lib/tdb/tools/tdbdump.c
delete mode 100644 source4/lib/tdb/tools/tdbtest.c
delete mode 100644 source4/lib/tdb/tools/tdbtool.c
delete mode 100644 source4/lib/tdb/tools/tdbtorture.c
delete mode 100644 source4/lib/tdb/web/index.html
Changeset truncated at 500 lines:
diff --git a/lib/README b/lib/README
new file mode 100644
index 0000000..b994447
--- /dev/null
+++ b/lib/README
@@ -0,0 +1,10 @@
+compression - Various compression algorithms (MSZIP, lzxpress)
+nss_wrapper - Wrapper for the user and group NSS API allowing the use
+ of other data sources.
+popt - Command-line option parsing library
+replace - Provides replacements for standard (POSIX, C99) functions
+ not provided by the host platform.
+socket_wrapper - Wrapper library allowing TCP/IP traffic to be redirected
+ over Unix domain sockets.
+talloc - Hierarchical pool based memory allocator
+tdb - Simple but fast key/value database library, supporting multiple writers
diff --git a/lib/compression/lzxpress.c b/lib/compression/lzxpress.c
new file mode 100644
index 0000000..0abbfc4
--- /dev/null
+++ b/lib/compression/lzxpress.c
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) Matthieu Suiche 2008
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the author nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include "replace.h"
+#include "lzxpress.h"
+
+
+#define __BUF_POS_CONST(buf,ofs)(((const uint8_t *)buf)+(ofs))
+#define __PULL_BYTE(buf,ofs) \
+ ((uint8_t)((*__BUF_POS_CONST(buf,ofs)) & 0xFF))
+
+#ifndef PULL_LE_UINT16
+#define PULL_LE_UINT16(buf,ofs) ((uint16_t)( \
+ ((uint16_t)(((uint16_t)(__PULL_BYTE(buf,(ofs)+0))) << 0)) | \
+ ((uint16_t)(((uint16_t)(__PULL_BYTE(buf,(ofs)+1))) << 8)) \
+))
+#endif
+
+#ifndef PULL_LE_UINT32
+#define PULL_LE_UINT32(buf,ofs) ((uint32_t)( \
+ ((uint32_t)(((uint32_t)(__PULL_BYTE(buf,(ofs)+0))) << 0)) | \
+ ((uint32_t)(((uint32_t)(__PULL_BYTE(buf,(ofs)+1))) << 8)) | \
+ ((uint32_t)(((uint32_t)(__PULL_BYTE(buf,(ofs)+2))) << 16)) | \
+ ((uint32_t)(((uint32_t)(__PULL_BYTE(buf,(ofs)+3))) << 24)) \
+))
+#endif
+
+ssize_t lzxpress_compress(const uint8_t *uncompressed,
+ uint32_t uncompressed_size,
+ uint8_t *compressed,
+ uint32_t max_compressed_size)
+{
+ uint32_t uncompressed_pos, compressed_pos, byte_left;
+ uint32_t max_offset, best_offset;
+ int32_t offset;
+ uint32_t max_len, len, best_len;
+ const uint8_t *str1, *str2;
+ uint32_t indic;
+ uint8_t *indic_pos;
+ uint32_t indic_bit, nibble_index;
+
+ uint32_t metadata_size;
+ uint16_t metadata;
+ uint16_t *dest;
+
+ if (!uncompressed_size) {
+ return 0;
+ }
+
+ uncompressed_pos = 0;
+ indic = 0;
+ compressed_pos = sizeof(uint32_t);
+ indic_pos = &compressed[0];
+
+ byte_left = uncompressed_size;
+ indic_bit = 0;
+ nibble_index = 0;
+
+ if (uncompressed_pos > XPRESS_BLOCK_SIZE)
+ return 0;
+
+ do {
+ bool found = false;
+
+ max_offset = uncompressed_pos;
+
+ str1 = &uncompressed[uncompressed_pos];
+
+ best_len = 2;
+ best_offset = 0;
+
+ max_offset = MIN(0x1FFF, max_offset);
+
+ /* search for the longest match in the window for the lookahead buffer */
+ for (offset = 1; (uint32_t)offset <= max_offset; offset++) {
+ str2 = &str1[-offset];
+
+ /* maximum len we can encode into metadata */
+ max_len = MIN((255 + 15 + 7 + 3), byte_left);
+
+ for (len = 0; (len < max_len) && (str1[len] == str2[len]); len++);
+
+ /*
+ * We check if len is better than the value found before, including the
+ * sequence of identical bytes
+ */
+ if (len > best_len) {
+ found = true;
+ best_len = len;
+ best_offset = offset;
+ }
+ }
+
+ if (found) {
+ metadata_size = 0;
+ dest = (uint16_t *)&compressed[compressed_pos];
+
+ if (best_len < 10) {
+ /* Classical meta-data */
+ metadata = (uint16_t)(((best_offset - 1) << 3) | (best_len - 3));
+ dest[metadata_size / sizeof(uint16_t)] = metadata;
+ metadata_size += sizeof(uint16_t);
+ } else {
+ metadata = (uint16_t)(((best_offset - 1) << 3) | 7);
+ dest[metadata_size / sizeof(uint16_t)] = metadata;
+ metadata_size = sizeof(uint16_t);
+
+ if (best_len < (15 + 7 + 3)) {
+ /* Shared byte */
+ if (!nibble_index) {
+ compressed[compressed_pos + metadata_size] = (best_len - (3 + 7)) & 0xF;
+ metadata_size += sizeof(uint8_t);
+ } else {
+ compressed[nibble_index] &= 0xF;
+ compressed[nibble_index] |= (best_len - (3 + 7)) * 16;
+ }
+ } else if (best_len < (3 + 7 + 15 + 255)) {
+ /* Shared byte */
+ if (!nibble_index) {
+ compressed[compressed_pos + metadata_size] = 15;
+ metadata_size += sizeof(uint8_t);
+ } else {
+ compressed[nibble_index] &= 0xF;
+ compressed[nibble_index] |= (15 * 16);
+ }
+
+ /* Additionnal best_len */
+ compressed[compressed_pos + metadata_size] = (best_len - (3 + 7 + 15)) & 0xFF;
+ metadata_size += sizeof(uint8_t);
+ } else {
+ /* Shared byte */
+ if (!nibble_index) {
+ compressed[compressed_pos + metadata_size] |= 15;
+ metadata_size += sizeof(uint8_t);
+ } else {
+ compressed[nibble_index] |= 15 << 4;
+ }
+
+ /* Additionnal best_len */
+ compressed[compressed_pos + metadata_size] = 255;
+
+ metadata_size += sizeof(uint8_t);
+
+ compressed[compressed_pos + metadata_size] = (best_len - 3) & 0xFF;
+ compressed[compressed_pos + metadata_size + 1] = ((best_len - 3) >> 8) & 0xFF;
+ metadata_size += sizeof(uint16_t);
+ }
+ }
+
+ indic |= 1 << (32 - ((indic_bit % 32) + 1));
+
+ if (best_len > 9) {
+ if (nibble_index == 0) {
+ nibble_index = compressed_pos + sizeof(uint16_t);
+ } else {
+ nibble_index = 0;
+ }
+ }
+
+ compressed_pos += metadata_size;
+ uncompressed_pos += best_len;
+ byte_left -= best_len;
+ } else {
+ compressed[compressed_pos++] = uncompressed[uncompressed_pos++];
+ byte_left--;
+ }
+ indic_bit++;
+
+ if ((indic_bit - 1) % 32 > (indic_bit % 32)) {
+ *(uint32_t *)indic_pos = indic;
+ indic = 0;
+ indic_pos = &compressed[compressed_pos];
+ compressed_pos += sizeof(uint32_t);
+ }
+ } while (byte_left > 3);
+
+ do {
+ compressed[compressed_pos] = uncompressed[uncompressed_pos];
+ indic_bit++;
+
+ uncompressed_pos++;
+ compressed_pos++;
+ if (((indic_bit - 1) % 32) > (indic_bit % 32)){
+ *(uint32_t *)indic_pos = indic;
+ indic = 0;
+ indic_pos = &compressed[compressed_pos];
+ compressed_pos += sizeof(uint32_t);
+ }
+ } while (uncompressed_pos < uncompressed_size);
+
+ if ((indic_bit % 32) > 0) {
+ for (; (indic_bit % 32) != 0; indic_bit++)
+ indic |= 0 << (32 - ((indic_bit % 32) + 1));
+
+ *(uint32_t *)indic_pos = indic;
+ compressed_pos += sizeof(uint32_t);
+ }
+
+ return compressed_pos;
+}
+
+ssize_t lzxpress_decompress(const uint8_t *input,
+ uint32_t input_size,
+ uint8_t *output,
+ uint32_t max_output_size)
+{
+ uint32_t output_index, input_index;
+ uint32_t indicator, indicator_bit;
+ uint32_t length;
+ uint32_t offset;
+ uint32_t nibble_index;
+
+ output_index = 0;
+ input_index = 0;
+ indicator = 0;
+ indicator_bit = 0;
+ length = 0;
+ offset = 0;
+ nibble_index = 0;
+
+ do {
+ if (indicator_bit == 0) {
+ indicator = PULL_LE_UINT32(input, input_index);
+ input_index += sizeof(uint32_t);
+ indicator_bit = 32;
+ }
+ indicator_bit--;
+
+ /*
+ * check whether the bit specified by indicator_bit is set or not
+ * set in indicator. For example, if indicator_bit has value 4
+ * check whether the 4th bit of the value in indicator is set
+ */
+ if (((indicator >> indicator_bit) & 1) == 0) {
+ output[output_index] = input[input_index];
+ input_index += sizeof(uint8_t);
+ output_index += sizeof(uint8_t);
+ } else {
+ length = PULL_LE_UINT16(input, input_index);
+ input_index += sizeof(uint16_t);
+ offset = length / 8;
+ length = length % 8;
+
+ if (length == 7) {
+ if (nibble_index == 0) {
+ nibble_index = input_index;
+ length = input[input_index] % 16;
+ input_index += sizeof(uint8_t);
+ } else {
+ length = input[nibble_index] / 16;
+ nibble_index = 0;
+ }
+
+ if (length == 15) {
+ length = input[input_index];
+ input_index += sizeof(uint8_t);
+ if (length == 255) {
+ length = PULL_LE_UINT16(input, input_index);
+ input_index += sizeof(uint16_t);
+ length -= (15 + 7);
+ }
+ length += 15;
+ }
+ length += 7;
+ }
+
+ length += 3;
+
+ do {
+ if ((output_index >= max_output_size) || ((offset + 1) > output_index)) break;
+
+ output[output_index] = output[output_index - offset - 1];
+
+ output_index += sizeof(uint8_t);
+ length -= sizeof(uint8_t);
+ } while (length != 0);
+ }
+ } while ((output_index < max_output_size) && (input_index < (input_size)));
+
+ return output_index;
+}
diff --git a/lib/compression/lzxpress.h b/lib/compression/lzxpress.h
new file mode 100644
index 0000000..df0ee59
--- /dev/null
+++ b/lib/compression/lzxpress.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) Matthieu Suiche 2008
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the author nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#ifndef _LZXPRESS_H
+#define _LZXPRESS_H
+
+#define XPRESS_BLOCK_SIZE 0x10000
+
+ssize_t lzxpress_compress(const uint8_t *uncompressed,
+ uint32_t uncompressed_size,
+ uint8_t *compressed,
+ uint32_t max_compressed_size);
+
+ssize_t lzxpress_decompress(const uint8_t *input,
+ uint32_t input_size,
+ uint8_t *output,
+ uint32_t max_output_size);
+
+#endif /* _LZXPRESS_H */
diff --git a/lib/compression/mszip.c b/lib/compression/mszip.c
new file mode 100644
index 0000000..9aa1772
--- /dev/null
+++ b/lib/compression/mszip.c
@@ -0,0 +1,676 @@
+/* mszip decompression - based on cabextract.c code from
+ * Stuart Caie
+ *
+ * adapted for Samba by Andrew Tridgell and Stefan Metzmacher 2005
+ *
+ * (C) 2000-2001 Stuart Caie <kyzer at 4u.net>
+ * reaktivate-specifics by Malte Starostik <malte at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "../compression/mszip.h"
+
+/*--------------------------------------------------------------------------*/
+/* our archiver information / state */
+
+/* MSZIP stuff */
+#define ZIPWSIZE 0x8000 /* window size */
+#define ZIPLBITS 9 /* bits in base literal/length lookup table */
+#define ZIPDBITS 6 /* bits in base distance lookup table */
+#define ZIPBMAX 16 /* maximum bit length of any code */
+#define ZIPN_MAX 288 /* maximum number of codes in any set */
+
+struct Ziphuft {
+ uint8_t e; /* number of extra bits or operation */
+ uint8_t b; /* number of bits in this code or subcode */
+ union {
+ uint16_t n; /* literal, length base, or distance base */
+ struct Ziphuft *t; /* pointer to next level of table */
+ } v;
+};
+
+struct ZIPstate {
+ uint32_t window_posn; /* current offset within the window */
+ uint32_t bb; /* bit buffer */
+ uint32_t bk; /* bits in bit buffer */
+ uint32_t ll[288+32]; /* literal/length and distance code lengths */
+ uint32_t c[ZIPBMAX+1]; /* bit length count table */
+ int32_t lx[ZIPBMAX+1]; /* memory for l[-1..ZIPBMAX-1] */
+ struct Ziphuft *u[ZIPBMAX]; /* table stack */
+ uint32_t v[ZIPN_MAX]; /* values in order of bit length */
+ uint32_t x[ZIPBMAX+1]; /* bit offsets, then code stack */
+ uint8_t *inpos;
+};
+
+/* generic stuff */
+#define CAB(x) (decomp_state->x)
+#define ZIP(x) (decomp_state->methods.zip.x)
+
+/* CAB data blocks are <= 32768 bytes in uncompressed form. Uncompressed
+ * blocks have zero growth. MSZIP guarantees that it won't grow above
+ * uncompressed size by more than 12 bytes. LZX guarantees it won't grow
+ * more than 6144 bytes.
+ */
+#define CAB_BLOCKMAX (32768)
+#define CAB_INPUTMAX (CAB_BLOCKMAX+6144)
+
+struct decomp_state {
+ struct folder *current; /* current folder we're extracting from */
+ uint32_t offset; /* uncompressed offset within folder */
+ uint8_t *outpos; /* (high level) start of data to use up */
+ uint16_t outlen; /* (high level) amount of data to use up */
+ uint16_t split; /* at which split in current folder? */
+ int (*decompress)(int, int); /* the chosen compression func */
+ uint8_t inbuf[CAB_INPUTMAX+2]; /* +2 for lzx bitbuffer overflows! */
+ uint8_t outbuf[CAB_BLOCKMAX];
+ union {
+ struct ZIPstate zip;
+ } methods;
+};
+
+
+/* MSZIP decruncher */
+
+/* Dirk Stoecker wrote the ZIP decoder, based on the InfoZip deflate code */
+
+/* Tables for deflate from PKZIP's appnote.txt. */
+static const uint8_t Zipborder[] = /* Order of the bit length code lengths */
+{ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+static const uint16_t Zipcplens[] = /* Copy lengths for literal codes 257..285 */
+{ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51,
+ 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+static const uint16_t Zipcplext[] = /* Extra bits for literal codes 257..285 */
+{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,
+ 4, 5, 5, 5, 5, 0, 99, 99}; /* 99==invalid */
+static const uint16_t Zipcpdist[] = /* Copy offsets for distance codes 0..29 */
+{ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385,
+513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577};
+static const uint16_t Zipcpdext[] = /* Extra bits for distance codes */
+{ 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10,
+10, 11, 11, 12, 12, 13, 13};
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list