[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-0pre1-183-gc7f43ab
Karolin Seeger
kseeger at samba.org
Mon Sep 15 10:07:52 GMT 2008
The branch, v3-3-stable has been updated
via c7f43abab836731a8ea16359dbf465847b8660c1 (commit)
via c987a59667010fa9499023cd7541abb0dc8286da (commit)
via bd53e333fe001e6539d7a400d2d3f6e879cf4f95 (commit)
via 69ae2dcbfe78b8e25a4ece23b4e04a21a05a36b9 (commit)
via 297c7c20d4a9dd0513678542d814fd0554182ebf (commit)
via c90634acabfcc37ed3d3c0af8b5f203107a956f1 (commit)
via 86542a0219f0edb588b52c2fb713917379b83738 (commit)
via 441015d028be8bdd250736d0a34d113f30b4404f (commit)
via 32d547be112aced8b053b7a93507dd639486ca4d (commit)
via 1796823baa0550c95c07139918ad6aa0f5633ed0 (commit)
via 9038df4a1bae0f7627f9a83782d3af7c12c55fce (commit)
via eb6e29c32114e5dd91cac2fb022ca281818f24b5 (commit)
via 2cbe5254be53256630f2207a4eac4052a730953a (commit)
via 6a4a95bb2542214850dd65b7f1a033a96f24e7f7 (commit)
via 37ca707438dd9ea12fea06cd557f5564ff806006 (commit)
via d21630065c94ff7825114ed2c28367b989d6b3cc (commit)
from 679f2606d64ec6693aadc7ff579d45d769f988f2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit c7f43abab836731a8ea16359dbf465847b8660c1
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Sep 14 19:21:54 2008 +0200
lib/tdb: sync build system changes and python code from samba4
metze
(cherry picked from commit bdb8ed24488fd87cd30dd18744feeef0bd4b2c18)
(cherry picked from commit 4ca2b54440e9adc9a12ccc5c9fd1c3012e2a7574)
commit c987a59667010fa9499023cd7541abb0dc8286da
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Sep 14 19:18:12 2008 +0200
lib/talloc: sync build system changes from samba4
metze
(cherry picked from commit 0143c320ccf21c00e1a09b8363cd42724b76faf9)
(cherry picked from commit 1a95c732bd9f3609567b976a4fa1fae44d1f85b7)
commit bd53e333fe001e6539d7a400d2d3f6e879cf4f95
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 17 11:22:23 2008 +0200
Skip strcmp() on 2 NULL pointers.
Andrew Bartlett
(cherry picked from commit 7b9a647ebbbe9ec9e1b82b42e3a8916396f91273)
(cherry picked from commit 60f7bdac64e32ea39099ababacca6f8a2b780ecb)
(cherry picked from commit 1ed9cd7fa10d30ee4302f6e1700ec9b36fa3133e)
commit 69ae2dcbfe78b8e25a4ece23b4e04a21a05a36b9
Author: Kai Blin <kai at samba.org>
Date: Mon Dec 17 20:18:02 2007 +0100
r26514: Revert the talloc.c part of r26511, as talloc.h already takes care of thois.
Thanks to metze for pointing this out
(cherry picked from commit 4a5e1047fff0620aa534b147ac7e0bd0416a8fe7)
(cherry picked from commit 523cc93f89d00ed5a49fd033988e7221bd2ed902)
(cherry picked from commit 6a84e83384d2bfc9801a18d990336e46f5f9a6f5)
commit 297c7c20d4a9dd0513678542d814fd0554182ebf
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Sep 14 19:12:39 2008 +0200
r26511: Janitorial: Fix a warning for the 'printf' attribute on gendb_search_v
While at it, also add a PRINTF_ATTRIBUTE for talloc_vasprintf.
(partialy cherry picked from commit 5b3a8c8ae195e6a98357a407a0699493f54a8b79)
metze
(cherry picked from commit 0073e41a0157ec43b944372671299b3e8a2b3cd5)
(cherry picked from commit 3f796cd8c653596315aa4bc53562ea9dd5ad6e2b)
commit c90634acabfcc37ed3d3c0af8b5f203107a956f1
Author: Simo Sorce <idra at samba.org>
Date: Mon Feb 25 14:03:07 2008 -0500
Update homepages for talloc, tdb and ldb subprojects
(cherry picked from commit 8cb07814bc6627fc8eba228eafd13336e3ca3758)
(cherry picked from commit 7d85b8d076d6b5b1773c44cd527e016b5d319da5)
(cherry picked from commit 0cd12f2d0e484786f4efa46efcf57dd66a295c1c)
commit 86542a0219f0edb588b52c2fb713917379b83738
Author: Michael Adam <obnox at samba.org>
Date: Mon Feb 18 22:49:32 2008 +0100
Adapt source code checkout information to git repo in talloc website.
Michael
(cherry picked from commit 254be79799acc69db88a5500a2f755c84553f8ef)
(cherry picked from commit ac724cddc4a42c1c0cade3fb1cd551f005f2b54c)
(cherry picked from commit 5db1aca4afee5ab6ead0882074defcbd4b4151b3)
commit 441015d028be8bdd250736d0a34d113f30b4404f
Author: Michael Adam <obnox at samba.org>
Date: Sun Feb 17 22:57:04 2008 +0100
Fix paths for talloc into unpacked directory (rsync commands).
Michael
(cherry picked from commit 2839d7f67a0d3ed5b4841bf3c12ce73972636b88)
(cherry picked from commit a891494d9373a1ecda1ad67c3c6b96cf6d37ea47)
(cherry picked from commit 829d72a13adfa238b818d3061eba81af4ed03752)
commit 32d547be112aced8b053b7a93507dd639486ca4d
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 14 23:10:00 2008 +0100
Fix path to talloc guide. Noted by "teferi" on irc.
Michael
(cherry picked from commit bc4e03f2ddb669758e27e2a5c32e15c7d6c5257d)
(cherry picked from commit 5e5528ff964cd829a8cf8e508983e1a1eda01c32)
(cherry picked from commit 16dd2d4544cf7e62fa077e9e895d8dbaf8b97177)
commit 1796823baa0550c95c07139918ad6aa0f5633ed0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Oct 10 17:04:00 2007 +0200
r25614: Add trivial tdb website.
(cherry picked from commit 6f88c41c31271fd4b634b6393dc4ca44563a88d2)
(cherry picked from commit 830f99fb5d73c999bb0975828bab6e5f7537baf6)
(cherry picked from commit fcc3f3577d029f797feb3c89f0f954fda7496164)
commit 9038df4a1bae0f7627f9a83782d3af7c12c55fce
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Sep 14 18:28:17 2008 +0200
libreplace: include <krb5.h> and <com_err.h> and no heimdal specific headers
metze
(partialy cherry picked from commit cffed8e19e22a1fa7b7a322b153df5d54e4c3be2)
(cherry picked from commit f46a17b408f8c78ecdff724f29d97f8f268d5577)
(cherry picked from commit 91cf798c70b27cfa941eacb876959cf118da6c60)
commit eb6e29c32114e5dd91cac2fb022ca281818f24b5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu May 29 15:50:52 2008 +0200
Fix extra dash in command line flag.
(cherry picked from commit c823cfadb0b20a0782fc4a8a0b63dcb9116f82be)
(cherry picked from commit 176d624376f7e450b34187778fc75d75679bdd0b)
(cherry picked from commit 1b7cc5de2281f55e9769aecd1f42b9ba7da79f5b)
commit 2cbe5254be53256630f2207a4eac4052a730953a
Author: Jeff Layton <jlayton at redhat.com>
Date: Sun Sep 14 08:37:05 2008 -0400
mount.cifs: make local versions of strlcat and strlcpy static
...to silence -Wmissing-prototypes
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit b3e9effe65c7ac1538309aef8d8b7e801947542a)
commit 6a4a95bb2542214850dd65b7f1a033a96f24e7f7
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 12 15:03:45 2008 -0700
Modify a comment to make things clearer.
Jeremy.
(cherry picked from commit 1933227a8c7fad24e964b4085ecb626f3997a89c)
commit 37ca707438dd9ea12fea06cd557f5564ff806006
Author: Jeremy Allison <jra at samba.org>
Date: Thu Sep 11 17:31:00 2008 -0700
Use the given name, not the absolute pathname, when printing out ACL info.
Make this match the non-ACL case.
Jeremy.
(cherry picked from commit 352f8753586f594f4262b3cab988854de393ad97)
commit d21630065c94ff7825114ed2c28367b989d6b3cc
Author: Jeremy Allison <jra at samba.org>
Date: Thu Sep 11 16:21:12 2008 -0700
Fix bug #5751 cannot show ACLs on DFS reported by SATOH Fumiyasu <fumiyas at osstech.co.jp>.
Fix for smbclient and libsmbclient.
Jeremy.
(cherry picked from commit 535d6a458d9cd6f800b1cdc5681be02b844d5cd5)
-----------------------------------------------------------------------
Summary of changes:
source/client/client.c | 4 +-
source/client/mount.cifs.c | 4 +-
source/lib/ldb/web/index.html | 24 +-
source/lib/replace/libreplace_ld.m4 | 2 +-
source/lib/replace/system/kerberos.h | 5 +-
source/lib/talloc/Makefile.in | 5 +-
source/lib/talloc/NEWS | 13 +
source/lib/talloc/config.mk | 11 +-
source/lib/talloc/configure.ac | 1 +
source/lib/talloc/talloc.c | 4 +-
source/lib/talloc/talloc.mk | 10 +-
source/lib/talloc/testsuite.c | 3 +-
source/lib/talloc/web/index.html | 19 +-
source/lib/tdb/Makefile.in | 99 +-
source/lib/tdb/autogen.sh | 2 +
source/lib/tdb/config.mk | 37 +-
source/lib/tdb/configure.ac | 18 +-
source/lib/tdb/libtdb.m4 | 32 -
source/lib/tdb/python.mk | 10 +
source/lib/tdb/python/tdbdump.py | 12 +
source/lib/tdb/python/tests/simple.py | 152 ++
source/lib/tdb/rules.mk | 21 +
source/lib/tdb/swig/Tdb.py | 115 -
source/lib/tdb/swig/tdb.i | 167 --
source/lib/tdb/tdb.i | 323 +++
source/lib/tdb/tdb.mk | 86 +
source/lib/tdb/tdb.pc.in | 1 +
source/lib/tdb/tdb.py | 341 +++
source/lib/tdb/tdb_wrap.c | 4307 +++++++++++++++++++++++++++++++++
source/lib/tdb/web/index.html | 42 +
source/libsmb/libsmb_xattr.c | 89 +-
source/smbd/fileio.c | 4 +-
32 files changed, 5465 insertions(+), 498 deletions(-)
create mode 100644 source/lib/talloc/NEWS
create mode 100644 source/lib/tdb/python.mk
create mode 100644 source/lib/tdb/python/tdbdump.py
create mode 100644 source/lib/tdb/python/tests/simple.py
create mode 100644 source/lib/tdb/rules.mk
delete mode 100644 source/lib/tdb/swig/Tdb.py
delete mode 100644 source/lib/tdb/swig/tdb.i
create mode 100644 source/lib/tdb/tdb.i
create mode 100644 source/lib/tdb/tdb.mk
create mode 100644 source/lib/tdb/tdb.py
create mode 100644 source/lib/tdb/tdb_wrap.c
create mode 100644 source/lib/tdb/web/index.html
Changeset truncated at 500 lines:
diff --git a/source/client/client.c b/source/client/client.c
index 18b2863..bcd3324 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -521,14 +521,14 @@ static void display_finfo(file_info *finfo, const char *dir)
/* create absolute filename for cli_nt_create() FIXME */
afname = talloc_asprintf(ctx,
"%s%s%s",
- client_get_cwd(),
+ dir,
CLI_DIRSEP_STR,
finfo->name);
if (!afname) {
return;
}
/* print file meta date header */
- d_printf( "FILENAME:%s\n", afname);
+ d_printf( "FILENAME:%s\n", finfo->name);
d_printf( "MODE:%s\n", attrib_string(finfo->mode));
d_printf( "SIZE:%.0f\n", (double)finfo->size);
d_printf( "MTIME:%s", time_to_asc(t));
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 9d2b449..3b56e5f 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -94,7 +94,7 @@ char * prefixpath = NULL;
/* like strncpy but does not 0 fill the buffer and always null
* terminates. bufsize is the size of the destination buffer */
-size_t strlcpy(char *d, const char *s, size_t bufsize)
+static size_t strlcpy(char *d, const char *s, size_t bufsize)
{
size_t len = strlen(s);
size_t ret = len;
@@ -108,7 +108,7 @@ size_t strlcpy(char *d, const char *s, size_t bufsize)
/* like strncat but does not 0 fill the buffer and always null
* terminates. bufsize is the length of the buffer, which should
* be one more than the maximum resulting string length */
-size_t strlcat(char *d, const char *s, size_t bufsize)
+static size_t strlcat(char *d, const char *s, size_t bufsize)
{
size_t len1 = strlen(d);
size_t len2 = strlen(s);
diff --git a/source/lib/ldb/web/index.html b/source/lib/ldb/web/index.html
index 2715a0d..4c569ca 100644
--- a/source/lib/ldb/web/index.html
+++ b/source/lib/ldb/web/index.html
@@ -41,9 +41,9 @@ The main features that separate ldb from other solutions are:
Currently ldb is completely lacking in programmer or user
documentation. This is your opportunity to make a contribution! Start
with the public functions declared in <a
-href="http://samba.org/ftp/unpacked/samba4/source/lib/ldb/include/ldb.h">ldb.h</a>
+href="http://samba.org/ftp/unpacked/ldb/include/ldb.h">ldb.h</a>
and the example code in the <a
-href="http://samba.org/ftp/unpacked/samba4/source/lib/ldb/tools/">tools
+href="http://samba.org/ftp/unpacked/ldb/tools/">tools
directory</a>. Documentation in the same docbook format used by Samba
would be preferred.
@@ -52,21 +52,17 @@ would be preferred.
ldb does not currently have its own mailing list or bug tracking
system. For now, please use the <a
href="https://lists.samba.org/mailman/listinfo/samba-technical">samba-technical</a>
-mailing list, and the <a href="http://bugzilla.samba.org/">Samba
-bugzilla</a> bug tracking system.
+mailing list or the <a href="https://lists.samba.org/mailman/listinfo/ldb">ldb</a>
+mailing list, and the <a href="http://bugzilla.samba.org/">Samba bugzilla</a> bug tracking system.
<h2>Download</h2>
-You can download the latest release either via rsync or anonymous
-svn. To fetch via svn use the following commands:
-
-<pre>
- svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/ldb ldb
- svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/tdb tdb
- svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/talloc talloc
- svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/replace libreplace
-</pre>
-
+You can download the latest release either via rsync or thtough git.<br>
+<br>
+To fetch via git see the following guide:<br>
+<a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Using Git for Samba Development</a><br>
+Once you have cloned the tree switch to the v4-0-test branch and cd into the source/lib/ldb directory.<br>
+<br>
To fetch via rsync use these commands:
<pre>
diff --git a/source/lib/replace/libreplace_ld.m4 b/source/lib/replace/libreplace_ld.m4
index 9995d69..81bde46 100644
--- a/source/lib/replace/libreplace_ld.m4
+++ b/source/lib/replace/libreplace_ld.m4
@@ -271,7 +271,7 @@ AC_DEFUN([AC_LIBREPLACE_LD_SHLIB_ALLOW_UNDEF_FLAG],
LD_SHLIB_ALLOW_UNDEF_FLAG="-undefined dynamic_lookup"
;;
*aix*)
- LD_SHLIB_ALLOW_UNDEF_FLAG="--Wl,-bnoentry"
+ LD_SHLIB_ALLOW_UNDEF_FLAG="-Wl,-bnoentry"
;;
esac
diff --git a/source/lib/replace/system/kerberos.h b/source/lib/replace/system/kerberos.h
index 78aa7b9..2981024 100644
--- a/source/lib/replace/system/kerberos.h
+++ b/source/lib/replace/system/kerberos.h
@@ -129,8 +129,9 @@
/* Whether krb5_princ_realm returns krb5_realm or krb5_data */
#define KRB5_PRINC_REALM_RETURNS_REALM 1
-#include "heimdal/lib/krb5/krb5.h"
-#include "heimdal/lib/com_err/com_err.h"
+#include <krb5.h>
+#include <com_err.h>
+
#endif
#endif
diff --git a/source/lib/talloc/Makefile.in b/source/lib/talloc/Makefile.in
index 851dc81..07b8fd4 100644
--- a/source/lib/talloc/Makefile.in
+++ b/source/lib/talloc/Makefile.in
@@ -17,6 +17,7 @@ EXTRA_TARGETS = @DOC_TARGET@
PICFLAG = @PICFLAG@
PACKAGE_VERSION = @PACKAGE_VERSION@
SHLIBEXT = @SHLIBEXT@
+SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
tallocdir = @tallocdir@
@@ -27,8 +28,8 @@ all:: showflags $(EXTRA_TARGETS)
include $(tallocdir)/rules.mk
include $(tallocdir)/talloc.mk
-$(SOLIB): $(LIBOBJ)
- $(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
+$(TALLOC_SOLIB): $(LIBOBJ)
+ $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(TALLOC_SONAME)
check: test
diff --git a/source/lib/talloc/NEWS b/source/lib/talloc/NEWS
new file mode 100644
index 0000000..e5b3aa0
--- /dev/null
+++ b/source/lib/talloc/NEWS
@@ -0,0 +1,13 @@
+1.0.1 26 May 2007
+
+ BUGS
+
+ * Set name of correctly when using talloc_append_string() (metze)
+
+ LICENSE
+
+ * Change license of files in lib/replace to LGPL (was GPL). (jelmer)
+
+1.0.0 30 April 2007
+
+ Initial release.
diff --git a/source/lib/talloc/config.mk b/source/lib/talloc/config.mk
index 540a05d..c13e1b7 100644
--- a/source/lib/talloc/config.mk
+++ b/source/lib/talloc/config.mk
@@ -1,8 +1,7 @@
[LIBRARY::LIBTALLOC]
-VERSION = 1.2.0
-SO_VERSION = 1
-OBJ_FILES = talloc.o
-PC_FILE = talloc.pc
-MANPAGE = talloc.3
+OUTPUT_TYPE = MERGED_OBJ
CFLAGS = -Ilib/talloc
-PUBLIC_HEADERS = talloc.h
+
+LIBTALLOC_OBJ_FILES = lib/talloc/talloc.o
+
+MANPAGES += $(tallocdir)/talloc.3
diff --git a/source/lib/talloc/configure.ac b/source/lib/talloc/configure.ac
index 3dcf74b..4719aa0 100644
--- a/source/lib/talloc/configure.ac
+++ b/source/lib/talloc/configure.ac
@@ -18,6 +18,7 @@ AC_SUBST(DOC_TARGET)
AC_LD_PICFLAG
AC_LD_SHLIBEXT
AC_LD_SONAMEFLAG
+AC_LIBREPLACE_SHLD
AC_LIBREPLACE_SHLD_FLAGS
AC_OUTPUT(Makefile talloc.pc)
diff --git a/source/lib/talloc/talloc.c b/source/lib/talloc/talloc.c
index 99210f3..1f7e524 100644
--- a/source/lib/talloc/talloc.c
+++ b/source/lib/talloc/talloc.c
@@ -1437,12 +1437,12 @@ char *talloc_strndup_append_buffer(char *s, const char *a, size_t n)
#endif
char *talloc_vasprintf(const void *t, const char *fmt, va_list ap)
-{
+{
int len;
char *ret;
va_list ap2;
char c;
-
+
/* this call looks strange, but it makes it work on older solaris boxes */
va_copy(ap2, ap);
len = vsnprintf(&c, 1, fmt, ap2);
diff --git a/source/lib/talloc/talloc.mk b/source/lib/talloc/talloc.mk
index 590adc7..e1fe88c 100644
--- a/source/lib/talloc/talloc.mk
+++ b/source/lib/talloc/talloc.mk
@@ -1,9 +1,9 @@
TALLOC_OBJ = $(tallocdir)/talloc.o
-SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
-SONAME = libtalloc.$(SHLIBEXT).1
+TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
+TALLOC_SONAME = libtalloc.$(SHLIBEXT).1
-all:: libtalloc.a $(SOLIB) testsuite
+all:: libtalloc.a $(TALLOC_SOLIB) testsuite
testsuite:: $(LIBOBJ) testsuite.o
$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
@@ -16,7 +16,7 @@ install:: all
${INSTALLCMD} -d $(DESTDIR)$(libdir)
${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
- ${INSTALLCMD} -m 755 $(SOLIB) $(DESTDIR)$(libdir)
+ ${INSTALLCMD} -m 755 $(TALLOC_SOLIB) $(DESTDIR)$(libdir)
${INSTALLCMD} -d $(DESTDIR)${includedir}
${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
@@ -28,7 +28,7 @@ install:: all
doc:: talloc.3 talloc.3.html
clean::
- rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
+ rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
test:: testsuite
./testsuite
diff --git a/source/lib/talloc/testsuite.c b/source/lib/talloc/testsuite.c
index fedbda9..3f06eee 100644
--- a/source/lib/talloc/testsuite.c
+++ b/source/lib/talloc/testsuite.c
@@ -48,7 +48,8 @@ static double timeval_elapsed(struct timeval *tv)
}
#define torture_assert_str_equal(test, arg1, arg2, desc) \
- if (strcmp(arg1, arg2)) { \
+ if (arg1 == NULL && arg2 == NULL) { \
+ } else if (strcmp(arg1, arg2)) { \
printf("failure: %s [\n%s: Expected %s, got %s: %s\n]\n", \
test, __location__, arg1, arg2, desc); \
return false; \
diff --git a/source/lib/talloc/web/index.html b/source/lib/talloc/web/index.html
index 106920e..5deab93 100644
--- a/source/lib/talloc/web/index.html
+++ b/source/lib/talloc/web/index.html
@@ -12,7 +12,7 @@ destructors. It is the core memory allocator used in Samba4, and has
made a huge difference in many aspects of Samba4 development.<p>
To get started with talloc, I would recommend you read the <a
-href="http://samba.org/ftp/unpacked/samba4/source/lib/talloc/talloc_guide.txt">talloc guide</a>.
+href="http://samba.org/ftp/unpacked/talloc/talloc_guide.txt">talloc guide</a>.
<h2>Discussion and bug reports</h2>
@@ -24,19 +24,16 @@ bugzilla</a> bug tracking system.
<h2>Download</h2>
-You can download the latest release either via rsync or anonymous
-svn. To fetch via svn use the following command:
-
-<pre>
- svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/talloc talloc
- svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/replace libreplace
-</pre>
-
+You can download the latest release either via rsync or git.<br>
+<br>
+To fetch via git see the following guide:<br>
+<a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Using Git for Samba Development</a><br>
+Once you have cloned the tree switch to the v4-0-test branch and cd into the source/lib/talloc directory.<br>
+<br>
To fetch via rsync use this command:
<pre>
- rsync -Pavz samba.org::ftp/unpacked/samba4/source/lib/talloc .
- rsync -Pavz samba.org::ftp/unpacked/samba4/source/lib/libreplace .
+ rsync -Pavz samba.org::ftp/unpacked/talloc .
</pre>
<hr>
diff --git a/source/lib/tdb/Makefile.in b/source/lib/tdb/Makefile.in
index fd36ed0..090bb6e 100644
--- a/source/lib/tdb/Makefile.in
+++ b/source/lib/tdb/Makefile.in
@@ -16,97 +16,44 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude
CFLAGS = $(CPPFLAGS) @CFLAGS@
LDFLAGS = @LDFLAGS@
EXEEXT = @EXEEXT@
+SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
PACKAGE_VERSION = @PACKAGE_VERSION@
PICFLAG = @PICFLAG@
-SONAMEFLAG = @SONAMEFLAG@
SHLIBEXT = @SHLIBEXT@
-
-.PHONY: test
-
-PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT)
-PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT)
-ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
+SWIG = swig
+PYTHON = @PYTHON@
+PYTHON_CONFIG = @PYTHON_CONFIG@
+PYTHON_BUILD_TARGET = @PYTHON_BUILD_TARGET@
+PYTHON_INSTALL_TARGET = @PYTHON_INSTALL_TARGET@
+PYTHON_CHECK_TARGET = @PYTHON_CHECK_TARGET@
+LIB_PATH_VAR = @LIB_PATH_VAR@
+tdbdir = @tdbdir@
TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@
-DIRS = bin common tools
-
-SONAME = libtdb.$(SHLIBEXT).1
-SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
-
-all: showflags dirs $(PROGS) $(SOLIB) libtdb.a
-
-showflags:
- @echo 'tdb will be compiled with flags:'
- @echo ' CFLAGS = $(CFLAGS)'
- @echo ' CPPFLAGS = $(CPPFLAGS)'
- @echo ' LDFLAGS = $(LDFLAGS)'
- @echo ' LIBS = $(LIBS)'
-
-.SUFFIXES: .c .o
-
-.c.o:
- @echo Compiling $*.c
- @mkdir -p `dirname $@`
- @$(CC) $(PICFLAG) $(CFLAGS) -c $< -o $@
-
-dirs:
- @mkdir -p $(DIRS)
-
-install: all
- mkdir -p $(DESTDIR)$(bindir)
- mkdir -p $(DESTDIR)$(includedir)
- mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(libdir)/pkgconfig
- cp $(PROGS) $(DESTDIR)$(bindir)
- cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir)
- cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
- cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir)
-
-libtdb.a: $(TDB_OBJ)
- ar -rv libtdb.a $(TDB_OBJ)
-
-libtdb.(SHLIBEXT): $(SOLIB)
- ln -s $< $@
-
-$(SONAME): $(SOLIB)
- ln -s $< $@
-
-$(SOLIB): $(TDB_OBJ)
- $(CC) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) $(SONAMEFLAG)$(SONAME)
-
-TDB_LIB = libtdb.a
-
-bin/tdbtest$(EXEEXT): tools/tdbtest.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
-
-bin/tdbtool$(EXEEXT): tools/tdbtool.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb
+default: all
-bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb
+include $(tdbdir)/tdb.mk
+include $(tdbdir)/rules.mk
-bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb
+all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
-bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
+install:: all
+$(TDB_SOLIB): $(TDB_OBJ)
+ $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(TDB_SONAME)
-test: bin/tdbtorture$(EXEEXT)
- bin/tdbtorture$(EXEEXT)
+check: test
-installcheck: test install
+test:: $(PYTHON_CHECK_TARGET)
+installcheck:: test install
-clean:
- rm -f $(ALL_PROGS) *.o *.a common/*.o tools/*.o tdb.pc
- rm -f test.db test.tdb torture.tdb test.gdbm
- rm -f $(SONAME) $(SOLIB) libtdb.a
+clean::
+ rm -f *.o *.a */*.o
-distclean: clean
- rm -f *~ */*~
+distclean:: clean
rm -f config.log config.status include/config.h config.cache
rm -f Makefile
-realdistclean: distclean
+realdistclean:: distclean
rm -f configure include/config.h.in
diff --git a/source/lib/tdb/autogen.sh b/source/lib/tdb/autogen.sh
index bf84eee..88ac4cf 100755
--- a/source/lib/tdb/autogen.sh
+++ b/source/lib/tdb/autogen.sh
@@ -9,6 +9,8 @@ autoheader $IPATHS || exit 1
rm -rf autom4te.cache
+swig -O -Wall -python -keyword tdb.i # Ignore errors for now
+
echo "Now run ./configure and then make."
exit 0
diff --git a/source/lib/tdb/config.mk b/source/lib/tdb/config.mk
index 01a23f0..b9a8f80 100644
--- a/source/lib/tdb/config.mk
+++ b/source/lib/tdb/config.mk
@@ -1,68 +1,57 @@
################################################
# Start SUBSYSTEM LIBTDB
[LIBRARY::LIBTDB]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = tdb.pc
-OBJ_FILES = \
- common/tdb.o common/dump.o common/io.o common/lock.o \
- common/open.o common/traverse.o common/freelist.o \
- common/error.o common/transaction.o
+OUTPUT_TYPE = STATIC_LIBRARY
CFLAGS = -Ilib/tdb/include
-PUBLIC_HEADERS = include/tdb.h
#
# End SUBSYSTEM ldb
################################################
+LIBTDB_OBJ_FILES = $(addprefix lib/tdb/common/, \
+ tdb.o dump.o io.o lock.o \
+ open.o traverse.o freelist.o \
+ error.o transaction.o)
+
################################################
# Start BINARY tdbtool
[BINARY::tdbtool]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/tdbtool.o
PRIVATE_DEPENDENCIES = \
LIBTDB
# End BINARY tdbtool
################################################
+tdbtool_OBJ_FILES = lib/tdb/tools/tdbtool.o
+
################################################
# Start BINARY tdbtorture
[BINARY::tdbtorture]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/tdbtorture.o
PRIVATE_DEPENDENCIES = \
LIBTDB
# End BINARY tdbtorture
################################################
+tdbtorture_OBJ_FILES = lib/tdb/tools/tdbtorture.o
+
################################################
# Start BINARY tdbdump
[BINARY::tdbdump]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/tdbdump.o
PRIVATE_DEPENDENCIES = \
LIBTDB
# End BINARY tdbdump
################################################
--
Samba Shared Repository
More information about the samba-cvs
mailing list