date:20090121

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-16-gd965ff0

2009-01-21 Thread Stefan Metzmacher

The branch, master has been updated
   via  d965ff05c9923c8a0e440e905d0d9fe662cc5db0 (commit)
  from  53293f2ccba357eab6c4325a08517660e979c1d8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit d965ff05c9923c8a0e440e905d0d9fe662cc5db0
Author: Stefan Metzmacher 
Date:   Wed Jan 21 09:16:45 2009 +0100

s4:ldb: remove dependency to samba4's events wrapper

metze

---

Summary of changes:
 source4/lib/ldb/common/ldb.c   |   13 ++---
 source4/lib/ldb/config.mk  |   20 ++--
 source4/lib/ldb/include/ldb_includes.h |4 ++--
 source4/lib/ldb/ldb_ildap/ldb_ildap.c  |   12 ++--
 source4/lib/ldb/ldb_tdb/ldb_tdb.c  |4 ++--
 source4/lib/ldb/pyldb.c|2 +-
 source4/lib/ldb/python.mk  |   10 +-
 7 files changed, 36 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 4443362..fe55d14 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -48,7 +48,7 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct 
tevent_context *ev_ctx)
/* FIXME: Hack a new event context so that CMD line utilities work
 * until we have them all converted */
if (ev_ctx == NULL) {
-   ev_ctx = event_context_init(talloc_autofree_context());
+   ev_ctx = tevent_context_init(talloc_autofree_context());
}
 
ret = ldb_setup_wellknown_attributes(ldb);
@@ -394,6 +394,7 @@ static int ldb_autotransaction_request(struct ldb_context 
*ldb,
 int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type)
 {
struct tevent_context *ev;
+   int ret;
 
if (!handle) {
return LDB_ERR_UNAVAILABLE;
@@ -410,7 +411,10 @@ int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type 
type)
 
switch (type) {
case LDB_WAIT_NONE:
-   event_loop_once(ev);
+   ret = tevent_loop_once(ev);
+   if (ret != 0) {
+   return LDB_ERR_OPERATIONS_ERROR;
+   }
if (handle->state == LDB_ASYNC_DONE ||
handle->status != LDB_SUCCESS) {
return handle->status;
@@ -419,7 +423,10 @@ int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type 
type)
 
case LDB_WAIT_ALL:
while (handle->state != LDB_ASYNC_DONE) {
-   event_loop_once(ev);
+   ret = tevent_loop_once(ev);
+   if (ret != 0) {
+   return LDB_ERR_OPERATIONS_ERROR;
+   }
if (handle->status != LDB_SUCCESS) {
return handle->status;
}
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index fe3b71d..6fcf394 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -1,7 +1,7 @@
 
 # Start MODULE ldb_asq
 [MODULE::ldb_asq]
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBTEVENT
 CFLAGS = -I$(ldbsrcdir)/include
 INIT_FUNCTION = LDB_MODULE(asq)
 SUBSYSTEM = LIBLDB
@@ -13,7 +13,7 @@ ldb_asq_OBJ_FILES = $(ldbsrcdir)/modules/asq.o
 
 # Start MODULE ldb_server_sort
 [MODULE::ldb_server_sort]
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBTEVENT
 CFLAGS = -I$(ldbsrcdir)/include
 INIT_FUNCTION = LDB_MODULE(server_sort)
 SUBSYSTEM = LIBLDB
@@ -27,7 +27,7 @@ ldb_server_sort_OBJ_FILES = $(ldbsrcdir)/modules/sort.o
 [MODULE::ldb_paged_results]
 INIT_FUNCTION = LDB_MODULE(paged_results)
 CFLAGS = -I$(ldbsrcdir)/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBTEVENT
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_paged_results
 
@@ -39,7 +39,7 @@ ldb_paged_results_OBJ_FILES = 
$(ldbsrcdir)/modules/paged_results.o
 [MODULE::ldb_paged_searches]
 INIT_FUNCTION = LDB_MODULE(paged_searches)
 CFLAGS = -I$(ldbsrcdir)/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBTEVENT
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_paged_results
 
@@ -51,7 +51,7 @@ ldb_paged_searches_OBJ_FILES = 
$(ldbsrcdir)/modules/paged_searches.o
 [MODULE::ldb_operational]
 SUBSYSTEM = LIBLDB
 CFLAGS = -I$(ldbsrcdir)/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBTEVENT
 INIT_FUNCTION = LDB_MODULE(operational)
 # End MODULE ldb_operational
 
@@ -63,7 +63,7 @@ ldb_operational_OBJ_FILES = $(ldbsrcdir)/modules/oper

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-20-g816934f

2009-01-21 Thread Michael Adam

The branch, master has been updated
   via  816934faa8bbe53dd299bc5e39f471eafdddefa8 (commit)
   via  665b5dc70333ca36129a6fe06645bd9faa4f2350 (commit)
   via  65b79200e46751278c125ad260d899d10d6466a2 (commit)
   via  bd252ad665547d2ad012725ccb18720e160d221f (commit)
  from  d965ff05c9923c8a0e440e905d0d9fe662cc5db0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 816934faa8bbe53dd299bc5e39f471eafdddefa8
Author: Michael Adam 
Date:   Wed Jan 21 10:56:34 2009 +0100

s3:docs: clarify explanation of the allocator in the idmap_ldap manpage

Michael

commit 665b5dc70333ca36129a6fe06645bd9faa4f2350
Author: Michael Adam 
Date:   Wed Jan 21 10:55:19 2009 +0100

s3:docs: clarify explanation of the allocator in the idmap_tdb manpage

Michael

commit 65b79200e46751278c125ad260d899d10d6466a2
Author: Michael Adam 
Date:   Wed Jan 21 10:49:48 2009 +0100

s3:docs: clarify explanation of allocator in the idmap_tdb2 manpage

Michael

commit bd252ad665547d2ad012725ccb18720e160d221f
Author: Michael Adam 
Date:   Wed Jan 21 10:38:49 2009 +0100

s3:docs: fix copy and paste error in the idmap_tdb2 manpage

Michael

---

Summary of changes:
 docs-xml/manpages-3/idmap_ldap.8.xml |   10 --
 docs-xml/manpages-3/idmap_tdb.8.xml  |   14 ++
 docs-xml/manpages-3/idmap_tdb2.8.xml |   11 ++-
 3 files changed, 24 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml 
b/docs-xml/manpages-3/idmap_ldap.8.xml
index ea9e5bf..0c8fa3c 100644
--- a/docs-xml/manpages-3/idmap_ldap.8.xml
+++ b/docs-xml/manpages-3/idmap_ldap.8.xml
@@ -22,9 +22,15 @@
The idmap_ldap plugin provides a means for Winbind to
store and retrieve SID/uid/gid mapping tables in an LDAP directory
service.
+   
+
+   
In contrast to read only backends like idmap_rid, it is an allocating
-   backend: This means that it needs to allocate new user and group IDs to
-   create new mappings as requests to yet unmapped users are answered.
+   backend: This means that it needs to allocate new user and group IDs in
+   order to create new mappings. The allocator can be provided by the
+   idmap_ldap backend itself or by any other allocating backend like
+   idmap_tdb or idmap_tdb2. This is configured with the
+   parameter idmap alloc backend.

 

diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml 
b/docs-xml/manpages-3/idmap_tdb.8.xml
index fb23076..2b4c050 100644
--- a/docs-xml/manpages-3/idmap_tdb.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb.8.xml
@@ -21,10 +21,16 @@
 

The idmap_tdb plugin is the default backend used by winbindd
-   for storing SID/uid/gid mapping tables. In contrast to read only
-   backends like idmap_rid, it is an allocating backend:
-   This means that it needs to allocate new user and group IDs
-   to create new mappings as requests to yet unmapped users are answered.
+   for storing SID/uid/gid mapping tables.
+   
+
+   
+   In contrast to read only backends like idmap_rid, it is an allocating
+   backend: This means that it needs to allocate new user and group IDs in
+   order to create new mappings. The allocator can be provided by the
+   idmap_tdb backend itself or by any other allocating backend like
+   idmap_ldap or idmap_tdb2. This is configured with the
+   parameter idmap alloc backend.

 

diff --git a/docs-xml/manpages-3/idmap_tdb2.8.xml 
b/docs-xml/manpages-3/idmap_tdb2.8.xml
index 6b303b4..4f19ba1 100644
--- a/docs-xml/manpages-3/idmap_tdb2.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb2.8.xml
@@ -26,10 +26,12 @@

 

-   In contrast to read only
-   backends like idmap_rid, it is an allocating backend:
-   This means that it needs to allocate new user and group IDs
-   to create new mappings as requests to yet unmapped users are answered.
+   In contrast to read only backends like idmap_rid, it is an allocating
+   backend: This means that it needs to allocate new user and group IDs in
+   order to create new mappings. The allocator can be provided by the
+   idmap_tdb2 backend itself or by any other allocating backend like
+   idmap_tdb or idmap_ldap. This is configured with the
+   parameter idmap alloc backend.

 

@@ -111,7 +113,6 @@
 

[global]
-   # "idmap backend = tdb2" is redundant here since it is the default
idmap backend = tdb2
idmap uid = 100-200
idmap gid = 100-200


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4841-g162e4b6

2009-01-21 Thread Karolin Seeger

The branch, v3-3-test has been updated
   via  162e4b66601b41dd5adb24e192f3b5a91dfb41cc (commit)
  from  28a80ea826aa53337817f9d0ce545b6ac3fd54f2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 162e4b66601b41dd5adb24e192f3b5a91dfb41cc
Author: Karolin Seeger 
Date:   Wed Jan 21 11:37:30 2009 +0100

build_docs: Use 'make distclean' instead of 'make clean'.

This fixes bug #6058.
Thanks to Christian Perrier for reporting!

Karolin

---

Summary of changes:
 release-scripts/build-docs |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index b80a7fb..bde87f4 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -26,6 +26,6 @@ mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
 cd ../docs-xml || exit 1
-make clean
+make distclean
 
 exit


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3380-g2545fcc

2009-01-21 Thread Karolin Seeger

The branch, v3-2-test has been updated
   via  2545fcc4628eef2d6b83ef5656be1e53bf7e (commit)
  from  067d4a889a218c79cc2e343e542d9c2f0af459d6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 2545fcc4628eef2d6b83ef5656be1e53bf7e
Author: Karolin Seeger 
Date:   Wed Jan 21 11:37:30 2009 +0100

build_docs: Use 'make distclean' instead of 'make clean'.

This fixes bug #6058.
Thanks to Christian Perrier for reporting!

Karolin
(cherry picked from commit 162e4b66601b41dd5adb24e192f3b5a91dfb41cc)

---

Summary of changes:
 release-scripts/build-docs |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index b80a7fb..bde87f4 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -26,6 +26,6 @@ mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
 cd ../docs-xml || exit 1
-make clean
+make distclean
 
 exit


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-23-gce3e34d

2009-01-21 Thread Michael Adam

The branch, master has been updated
   via  ce3e34d37ce5592e0268be5d16240387d971585a (commit)
   via  65c92fea3d18c3520ff2a1e53a0c5c8825c9788f (commit)
  from  2bb126679646889780c54f674a22e271761080af (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit ce3e34d37ce5592e0268be5d16240387d971585a
Author: Michael Adam 
Date:   Wed Jan 21 11:45:23 2009 +0100

s3:create-tarball: also include the VENDOR_PATCH in the version

Michael

commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f
Author: Michael Adam 
Date:   Wed Jan 21 11:41:14 2009 +0100

s3:docs: fix distclean target and add realdistclean target

- remove stuff created by configure in distclean
- remove stuff created by autoconf in realdistclean

Michael

---

Summary of changes:
 docs-xml/Makefile  |5 -
 release-scripts/create-tarball |4 
 2 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 2acef3e..f5e196d 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -320,7 +320,10 @@ xslt/man.xsl:
 xslt/pearson.xsl:
 
 distclean clobber:: clean
-   rm Makefile.settings config.status config.log configure
+   rm -f Makefile.settings config.status config.log configure
+
+realdistclean:: distclean
+   rm -f configure
rm -rf autom4te.cache
 
 
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index ab27f08..3e80cd1 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -183,6 +183,10 @@ function main
 if [ -n "$vendor_version" ]; then
version="$version-$vendor_version"
 fi
+vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk 
'{print $3}'`
+if [ -n "$vendor_patch" ]; then
+   version="$version-$vendor_patch"
+fi
 version=`echo $version | sed 's/\"//g'`
 
 echo "Creating release tarball for Samba $version"


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-120-g0098eb4

2009-01-21 Thread Karolin Seeger

The branch, v3-0-test has been updated
   via  0098eb45d99373a4d1945e61dda24ea282c377e7 (commit)
  from  ec585601dabc10ebbc17b24684e3932f23e93e25 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -
commit 0098eb45d99373a4d1945e61dda24ea282c377e7
Author: Karolin Seeger 
Date:   Wed Jan 21 11:37:30 2009 +0100

build_docs: Use 'make distclean' instead of 'make clean'.

This fixes bug #6058.
Thanks to Christian Perrier for reporting!

Karolin
(cherry picked from commit 162e4b66601b41dd5adb24e192f3b5a91dfb41cc)
(cherry picked from commit 2545fcc4628eef2d6b83ef5656be1e53bf7e)

---

Summary of changes:
 release-scripts/build-docs |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index b80a7fb..bde87f4 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -26,6 +26,6 @@ mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
 cd ../docs-xml || exit 1
-make clean
+make distclean
 
 exit


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-24-g3741201

2009-01-21 Thread Michael Adam

The branch, master has been updated
   via  37412017c5dd2f05a7f4bbe0410a6e00ce4805e5 (commit)
  from  ce3e34d37ce5592e0268be5d16240387d971585a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5
Author: Michael Adam 
Date:   Wed Jan 21 11:47:46 2009 +0100

s3:docs: fix ommission in fix of (real)distclean targets

Michael

---

Summary of changes:
 docs-xml/Makefile |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index f5e196d..08e3f5e 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -320,7 +320,7 @@ xslt/man.xsl:
 xslt/pearson.xsl:
 
 distclean clobber:: clean
-   rm -f Makefile.settings config.status config.log configure
+   rm -f Makefile.settings config.status config.log
 
 realdistclean:: distclean
rm -f configure


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4844-gba94107

2009-01-21 Thread Michael Adam

The branch, v3-3-test has been updated
   via  ba941074ce20617856c138eff5762646384d37de (commit)
   via  05b83098ed49cee906a5b16d15dce9e6baf62b07 (commit)
   via  58db911a3845c4a8475c413e5fd8d755498dd447 (commit)
  from  162e4b66601b41dd5adb24e192f3b5a91dfb41cc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit ba941074ce20617856c138eff5762646384d37de
Author: Michael Adam 
Date:   Wed Jan 21 11:47:46 2009 +0100

s3:docs: fix ommission in fix of (real)distclean targets

Michael
(cherry picked from commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)

Signed-off-by: Michael Adam 

commit 05b83098ed49cee906a5b16d15dce9e6baf62b07
Author: Michael Adam 
Date:   Wed Jan 21 11:45:23 2009 +0100

s3:create-tarball: also include the VENDOR_PATCH in the version

Michael
(cherry picked from commit ce3e34d37ce5592e0268be5d16240387d971585a)

Signed-off-by: Michael Adam 

commit 58db911a3845c4a8475c413e5fd8d755498dd447
Author: Michael Adam 
Date:   Wed Jan 21 11:41:14 2009 +0100

s3:docs: fix distclean target and add realdistclean target

- remove stuff created by configure in distclean
- remove stuff created by autoconf in realdistclean

Michael
(cherry picked from commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f)

Signed-off-by: Michael Adam 

---

Summary of changes:
 docs-xml/Makefile  |5 -
 release-scripts/create-tarball |4 
 2 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 2acef3e..08e3f5e 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -320,7 +320,10 @@ xslt/man.xsl:
 xslt/pearson.xsl:
 
 distclean clobber:: clean
-   rm Makefile.settings config.status config.log configure
+   rm -f Makefile.settings config.status config.log
+
+realdistclean:: distclean
+   rm -f configure
rm -rf autom4te.cache
 
 
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index da39d89..d468dd3 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -183,6 +183,10 @@ function main
 if [ -n "$vendor_version" ]; then
version="$version-$vendor_version"
 fi
+vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk 
'{print $3}'`
+if [ -n "$vendor_patch" ]; then
+   version="$version-$vendor_patch"
+fi
 version=`echo $version | sed 's/\"//g'`
 
 echo "Creating release tarball for Samba $version"


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-21-g2bb1266

2009-01-21 Thread Volker Lendecke

The branch, master has been updated
   via  2bb126679646889780c54f674a22e271761080af (commit)
  from  816934faa8bbe53dd299bc5e39f471eafdddefa8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 2bb126679646889780c54f674a22e271761080af
Author: Volker Lendecke 
Date:   Tue Jan 20 23:31:51 2009 +0100

Fix a typo

---

Summary of changes:
 source3/auth/auth_util.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index d2a8591..e3677c4 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -573,7 +573,7 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info 
**server_info,
}
 
result->sam_account = sampass;
-   /* Ensure thaat the sampass will be freed with the result */
+   /* Ensure that the sampass will be freed with the result */
talloc_steal(result, sampass);
result->unix_name = pwd->pw_name;
/* Ensure that we keep pwd->pw_name, because we will free pwd below */


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3386-gf3d355f

2009-01-21 Thread Michael Adam

The branch, v3-2-test has been updated
   via  f3d355ffa75cd2b0f8cc51189e80aaf3552766d0 (commit)
   via  410acb0410ce3c33da15dbefd0b59e971494d2fb (commit)
   via  d2e79f3e54cf1762df2ef814af90dcb16cb8e859 (commit)
   via  fe3680cb7ab54142d589c89789af73a3e32a6b79 (commit)
   via  d5f74cfc4434d754afc9fdd746c2a575ebdd3641 (commit)
   via  299f1ae3f335ce99cb9b5d477e0950a4108f80cb (commit)
  from  2545fcc4628eef2d6b83ef5656be1e53bf7e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit f3d355ffa75cd2b0f8cc51189e80aaf3552766d0
Author: Michael Adam 
Date:   Wed Jan 21 11:47:46 2009 +0100

s3:docs: fix ommission in fix of (real)distclean targets

Michael
(cherry picked from commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)

Signed-off-by: Michael Adam 

commit 410acb0410ce3c33da15dbefd0b59e971494d2fb
Author: Michael Adam 
Date:   Wed Jan 21 11:41:14 2009 +0100

s3:docs: fix distclean target and add realdistclean target

- remove stuff created by configure in distclean
- remove stuff created by autoconf in realdistclean

Michael
(cherry picked from commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f)

Signed-off-by: Michael Adam 

commit d2e79f3e54cf1762df2ef814af90dcb16cb8e859
Author: Jelmer Vernooij 
Date:   Tue May 27 18:40:14 2008 +0200

Depend on latexfigures files directly as using a rule in between causes 
problems.
(This used to be commit bf3c2773f94c1db29a8a3e5935ff587f16f9a905)
(cherry picked from commit 5f6d0078d41e790ab4fa7dac15294821cdb4d4f0)

Signed-off-by: Michael Adam 

commit fe3680cb7ab54142d589c89789af73a3e32a6b79
Author: Jelmer Vernooij 
Date:   Wed May 21 17:55:20 2008 +0200

Use double colon targets.
(This used to be commit 825cf91fa8b30a67d04cbda8885ff62a4c26458f)
(cherry picked from commit 323be4a6907e4915bb76aa103bf5b868f0b459b1)

Signed-off-by: Michael Adam 

commit d5f74cfc4434d754afc9fdd746c2a575ebdd3641
Author: Jelmer Vernooij 
Date:   Fri May 16 15:46:36 2008 +0200

Add test target in Makefile.
(This used to be commit ac0d768676b1b8105a9141169b1afa248df6ce66)
(cherry picked from commit 0f3ba4b766ed83d2a38e6cae8db8690374d88989)

Signed-off-by: Michael Adam 

commit 299f1ae3f335ce99cb9b5d477e0950a4108f80cb
Author: Jelmer Vernooij 
Date:   Fri May 16 15:31:54 2008 +0200

Make the make output a bit less chatty.
(This used to be commit 1fa4ef553c437bae07389c0f6a5410ba22ee4905)
(cherry picked from commit 70f52c06ba1d0d9638f1dfb8c42cd0d70364e9df)

Signed-off-by: Michael Adam 

---

Summary of changes:
 docs-xml/Makefile |   78 -
 1 files changed, 41 insertions(+), 37 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0f401d6..08e3f5e 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -50,10 +50,10 @@ $(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out 
Samba3-Developers-Guide/
 $(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard 
Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
 
 # Pseudo targets 
-all: $(TARGETS)
-everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson 
-release: manpages3 htmlman3 html pdf 
-clean:
+all:: $(TARGETS)
+everything:: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp 
pearson 
+release:: manpages3 htmlman3 html pdf 
+clean::
@echo "Cleaning up..." 
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
@@ -61,38 +61,43 @@ clean:
$(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx 
*.aux
rm -f *-images-html*
-   rm -f *-images-latex-* latexfigures
+   rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
 
 # Output format targets
-pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
-dvi: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
-ps: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
-txt: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
-txt-chunks: $(addsuffix -txt-chunks,$(MAIN_DOCS))
-fo: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
-fo-pdf: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
-tex: $(addsuffix .tex,$(MAIN_DOCS))
-texi: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
-texiinfo: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
-manpages3: $(patsubst 
$(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
-pearson: $(PEARSONDIR)/Samba3-HOWTO.xml
-pearson-verify: $(PEARSONDIR)/Samba3-HOWTO.report.html
-plucker: $(patsubst %,

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-31-ga83feb2

2009-01-21 Thread Stefan Metzmacher

The branch, master has been updated
   via  a83feb2fe3e00241c340cdcab5674a250a1858ce (commit)
   via  bc42f251c3c0a2fd33e4b8487410f61392f8dcc3 (commit)
   via  6f6533aa81791d40b37a9e715c7b7669cc92a1c9 (commit)
   via  ccffe1ca71392f8d4f62b8ca64f9eafe42505808 (commit)
   via  5a18607a3b9450b6fdb3bd19a3762d3fb5388b7c (commit)
   via  ac364b4bab0f0b48eb3cf46cd174ecf2bd6f60e3 (commit)
   via  74471512745d22fc997184dd27977fdf6410ac46 (commit)
  from  37412017c5dd2f05a7f4bbe0410a6e00ce4805e5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a83feb2fe3e00241c340cdcab5674a250a1858ce
Author: Stefan Metzmacher 
Date:   Wed Jan 21 10:43:15 2009 +0100

s4:auth: move make_server_info_netlogon_validation() function arround

metze

commit bc42f251c3c0a2fd33e4b8487410f61392f8dcc3
Author: Stefan Metzmacher 
Date:   Wed Jan 21 10:15:22 2009 +0100

merged-build: propare to fix make test4

metze

commit 6f6533aa81791d40b37a9e715c7b7669cc92a1c9
Author: Stefan Metzmacher 
Date:   Wed Jan 21 10:14:29 2009 +0100

selftest: add --exeext parameter

metze

commit ccffe1ca71392f8d4f62b8ca64f9eafe42505808
Author: Stefan Metzmacher 
Date:   Wed Jan 21 10:12:04 2009 +0100

s4:selftest: reference binaries via variables in tests.sh

metze

commit 5a18607a3b9450b6fdb3bd19a3762d3fb5388b7c
Author: Stefan Metzmacher 
Date:   Wed Jan 21 10:09:30 2009 +0100

selftest:Samba4: add bindir_path() utility function to construct the binary 
pathes

metze

commit ac364b4bab0f0b48eb3cf46cd174ecf2bd6f60e3
Author: Stefan Metzmacher 
Date:   Wed Jan 21 10:05:53 2009 +0100

selftest: bin/ is under $(builddir) instead of $(srcdir)

metze

commit 74471512745d22fc997184dd27977fdf6410ac46
Author: Stefan Metzmacher 
Date:   Wed Jan 21 13:34:11 2009 +0100

s4:python glue: fix dependecy to pyldb

metze

---

Summary of changes:
 selftest/selftest.pl   |   14 +++-
 selftest/target/Samba4.pm  |   43 +++
 source3/samba4.mk  |5 +-
 source4/auth/auth_sam_reply.c  |  139 +++
 source4/auth/gensec/gensec_krb5.c  |2 +-
 source4/auth/ntlm/auth_winbind.c   |2 +-
 source4/auth/session.c |  140 
 source4/auth/session.h |5 --
 source4/scripting/python/config.mk |2 +-
 source4/selftest/tests.sh  |   16 +++--
 source4/smbd/service_named_pipe.c  |1 +
 source4/torture/auth/pac.c |2 +-
 12 files changed, 196 insertions(+), 175 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 292a2d2..6f0883c 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -13,7 +13,7 @@ selftest - Samba test runner
 
 selftest --help
 
-selftest [--srcdir=DIR] [--builddir=DIR] [--target=samba4|samba3|win|kvm] 
[--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] 
[--prefix=prefix] [--immediate] [--testlist=FILE] [TESTS]
+selftest [--srcdir=DIR] [--builddir=DIR] 
[--exeext=EXT][--target=samba4|samba3|win|kvm] [--socket-wrapper] [--quick] 
[--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--immediate] 
[--testlist=FILE] [TESTS]
 
 =head1 DESCRIPTION
 
@@ -35,6 +35,10 @@ Source directory.
 
 Build directory.
 
+=item I<--exeext=EXT>
+
+Executable extention
+
 =item I<--prefix=DIR>
 
 Change directory to run tests in. Default is 'st'.
@@ -156,6 +160,7 @@ my @testlists = ();
 
 my $srcdir = ".";
 my $builddir = ".";
+my $exeext = "";
 my $prefix = "./st";
 
 my @expected_failures = ();
@@ -294,6 +299,7 @@ Paths:
  --prefix=DIR   prefix to run tests in [st]
  --srcdir=DIR   source directory [.]
  --builddir=DIR output directory [.]
+ --exeext=EXT   executable extention []
 
 Target Specific:
  --socket-wrapper-pcap save traffic to pcap directories
@@ -334,6 +340,7 @@ my $result = GetOptions (
'include=s' => \...@opt_include,
'srcdir=s' => \$srcdir,
'builddir=s' => \$builddir,
+   'exeext=s' => \$exeext,
'verbose' => \$opt_verbose,
'testenv' => \$opt_testenv,
'ldap:s' => \$ldap,
@@ -443,9 +450,10 @@ my $testenv_default = "none";
 if ($opt_target eq "samba4") {
$testenv_default = "member";
require target::Samba4;
-   $target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, 
"$srcdir/setup");
+   $target = new Samba4($opt_bindir or "$builddir/bin",
+$ldap, "$srcdir/setup", $exeext);
 } elsif ($opt_target eq "samba3") {
-   my $bindir = ($opt_bindir or "$srcdir/bin");
+   my $bindir = ($opt_bindir or "$builddir/bin");
if ($opt_socket_wra

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-34-g157864d

2009-01-21 Thread Michael Adam

The branch, master has been updated
   via  157864d1e8cb069a3be0aadf71e114f9ae827df3 (commit)
   via  ab4e84f09acfbbf2787d5dac911d5fd814cf2a72 (commit)
   via  9ec279f8e688fa04ec507df8be945a2a54e3e235 (commit)
  from  a83feb2fe3e00241c340cdcab5674a250a1858ce (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 157864d1e8cb069a3be0aadf71e114f9ae827df3
Author: Karolin Seeger 
Date:   Wed Jan 21 11:37:30 2009 +0100

build_docs: Use 'make distclean' instead of 'make clean'.

This fixes bug #6058.
Thanks to Christian Perrier for reporting!

Karolin
(cherry picked from commit 162e4b66601b41dd5adb24e192f3b5a91dfb41cc)

Signed-off-by: Michael Adam 

commit ab4e84f09acfbbf2787d5dac911d5fd814cf2a72
Author: Karolin Seeger 
Date:   Tue Dec 9 22:08:13 2008 +0100

build-docs: Change to the right directory before calling 'make clean'.
This fixes build-docs if it's called from the create-tarball script.

Karolin
(cherry picked from commit dd3ef73c8c184eaec7ee515ef2130f30f9e481b3)
(cherry picked from commit 8dd3a7bfde16e85a9ee509cf6bcfc788062705a5)

Signed-off-by: Michael Adam 

commit 9ec279f8e688fa04ec507df8be945a2a54e3e235
Author: Karolin Seeger 
Date:   Thu Sep 18 15:52:06 2008 +0200

build-docs: Add 'make clean'.

Karolin
(cherry picked from commit cf40fb97239ed9a11e5750fde6e078233e567bba)

Signed-off-by: Michael Adam 

---

Summary of changes:
 release-scripts/build-docs |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index c138149..bde87f4 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -25,4 +25,7 @@ cd ../docs || exit 1
 mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
+cd ../docs-xml || exit 1
+make distclean
+
 exit


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-39-ge4801a4

2009-01-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  e4801a426a954040aeb6d2c6d5c1b3e596bd1cab (commit)
   via  1101d7aa57eb559a13cc35422c57e8c5766c2a9c (commit)
   via  1d59fd4d733007ccabb69c945e1da2208c376b96 (commit)
   via  11a25f90500b64f4b43907f6f311dc5e9731da39 (commit)
   via  b64b78e4cc2aaed779a07dbcb180323bfb3652d6 (commit)
  from  157864d1e8cb069a3be0aadf71e114f9ae827df3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit e4801a426a954040aeb6d2c6d5c1b3e596bd1cab
Author: Jelmer Vernooij 
Date:   Wed Jan 21 14:26:06 2009 +0100

Use script path to find the setup directory.

commit 1101d7aa57eb559a13cc35422c57e8c5766c2a9c
Merge: 1d59fd4d733007ccabb69c945e1da2208c376b96 
157864d1e8cb069a3be0aadf71e114f9ae827df3
Author: Jelmer Vernooij 
Date:   Wed Jan 21 14:25:08 2009 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 1d59fd4d733007ccabb69c945e1da2208c376b96
Merge: b64b78e4cc2aaed779a07dbcb180323bfb3652d6 
11a25f90500b64f4b43907f6f311dc5e9731da39
Author: Jelmer Vernooij 
Date:   Wed Jan 21 14:07:38 2009 +0100

Merge branch 'v4-0-test' of /home/jelmer/samba4

commit 11a25f90500b64f4b43907f6f311dc5e9731da39
Author: Jelmer Vernooij 
Date:   Wed Jan 21 14:05:51 2009 +0100

Allow calling DCE/RPC server implementations directly using
rpc_pipe_client.

commit b64b78e4cc2aaed779a07dbcb180323bfb3652d6
Author: Jelmer Vernooij 
Date:   Wed Jan 21 13:40:18 2009 +0100

Allow overriding the function that ships the request in the Samba 3
client code.

---

Summary of changes:
 librpc/gen_ndr/cli_dfs.c|   46 +-
 librpc/gen_ndr/cli_drsuapi.c|   50 +-
 librpc/gen_ndr/cli_dssetup.c|   22 +-
 librpc/gen_ndr/cli_echo.c   |   20 +-
 librpc/gen_ndr/cli_epmapper.c   |   16 +-
 librpc/gen_ndr/cli_eventlog.c   |   48 +-
 librpc/gen_ndr/cli_initshutdown.c   |6 +-
 librpc/gen_ndr/cli_lsa.c|  164 
 librpc/gen_ndr/cli_netlogon.c   |   94 ++--
 librpc/gen_ndr/cli_ntsvcs.c |  130 +++---
 librpc/gen_ndr/cli_samr.c   |  136 +++---
 librpc/gen_ndr/cli_srvsvc.c |  108 +++---
 librpc/gen_ndr/cli_svcctl.c |   88 ++--
 librpc/gen_ndr/cli_winreg.c |   70 ++--
 librpc/gen_ndr/cli_wkssvc.c |   62 ++--
 librpc/gen_ndr/srv_dfs.c|  177 +++
 librpc/gen_ndr/srv_dfs.h|   24 +
 librpc/gen_ndr/srv_dssetup.c|   85 
 librpc/gen_ndr/srv_dssetup.h|   12 +
 librpc/gen_ndr/srv_echo.c   |  109 +
 librpc/gen_ndr/srv_echo.h   |   11 +
 librpc/gen_ndr/srv_epmapper.c   |   87 
 librpc/gen_ndr/srv_epmapper.h   |9 +
 librpc/gen_ndr/srv_eventlog.c   |  193 
 librpc/gen_ndr/srv_eventlog.h   |   25 +
 librpc/gen_ndr/srv_initshutdown.c   |   31 ++
 librpc/gen_ndr/srv_initshutdown.h   |4 +
 librpc/gen_ndr/srv_lsa.c|  764 ++
 librpc/gen_ndr/srv_lsa.h|   83 
 librpc/gen_ndr/srv_netlogon.c   |  633 +
 librpc/gen_ndr/srv_netlogon.h   |   48 ++
 librpc/gen_ndr/srv_ntsvcs.c |  441 +
 librpc/gen_ndr/srv_ntsvcs.h |   66 +++
 librpc/gen_ndr/srv_samr.c   |  785 +++
 librpc/gen_ndr/srv_samr.h   |   69 +++
 librpc/gen_ndr/srv_srvsvc.c |  492 +++
 librpc/gen_ndr/srv_srvsvc.h |   55 +++
 librpc/gen_ndr/srv_svcctl.c |  563 ++
 librpc/gen_ndr/srv_svcctl.h |   45 ++
 librpc/gen_ndr/srv_winreg.c |  361 ++
 librpc/gen_ndr/srv_winreg.h |   36 ++
 librpc/gen_ndr/srv_wkssvc.c |  282 +++
 librpc/gen_ndr/srv_wkssvc.h |   32 ++
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |2 +-
 pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm |  133 --
 source3/include/client.h|8 +
 source3/include/proto.h |4 +
 source3/librpc/rpc/dcerpc.h |2 +-
 source3/rpc_client/cli_pipe.c   |   42 ++
 source3/rpc_client/ndr.c|2 +-
 source4/dsdb/common/util.c  |2 +-
 source4/setup/provision |2 +-
 source4/setup/provision-backend |2 +-
 source4/setup/upgrade   |2 +-
 54 files changed, 6205 insertions(+), 578 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_dfs.c b/librpc/gen_ndr/cli_dfs.c
index d2c9b4f..e8691dc 100644
--- a/librpc/gen_ndr/cli_dfs.c
+++ b/librpc/gen_ndr/cli_dfs.c
@@ -19,7 +19,7 @@ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_cli

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4851-g0b1036d

2009-01-21 Thread Michael Adam

The branch, v3-3-test has been updated
   via  0b1036d5d6e06e2fa14dab163d51a902ca63fc0a (commit)
   via  83a03a3ced255f0a64935fe788ac3b0ddf669ca5 (commit)
   via  73a835335e329f0aaa0b72ebfd538b8c2b813812 (commit)
   via  ea5be10d0656d4f7edec43a4cb926573050823aa (commit)
   via  c52948a2b019bb1620ffa69605673d88bfa34bb4 (commit)
   via  1bbc5f228b8b73a623f7afc5eb79c08757366029 (commit)
   via  4145a1de91a18ea9a09b3088f0e5cd054875760b (commit)
  from  ba941074ce20617856c138eff5762646384d37de (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 0b1036d5d6e06e2fa14dab163d51a902ca63fc0a
Author: Michael Adam 
Date:   Wed Jan 21 10:56:34 2009 +0100

s3:docs: clarify explanation of the allocator in the idmap_ldap manpage

Michael
(cherry picked from commit 816934faa8bbe53dd299bc5e39f471eafdddefa8)

Signed-off-by: Michael Adam 

commit 83a03a3ced255f0a64935fe788ac3b0ddf669ca5
Author: Michael Adam 
Date:   Wed Jan 21 10:55:19 2009 +0100

s3:docs: clarify explanation of the allocator in the idmap_tdb manpage

Michael
(cherry picked from commit 665b5dc70333ca36129a6fe06645bd9faa4f2350)

Signed-off-by: Michael Adam 

commit 73a835335e329f0aaa0b72ebfd538b8c2b813812
Author: Michael Adam 
Date:   Wed Jan 21 10:49:48 2009 +0100

s3:docs: clarify explanation of allocator in the idmap_tdb2 manpage

Michael
(cherry picked from commit 65b79200e46751278c125ad260d899d10d6466a2)

Signed-off-by: Michael Adam 

commit ea5be10d0656d4f7edec43a4cb926573050823aa
Author: Michael Adam 
Date:   Wed Jan 21 10:38:49 2009 +0100

s3:docs: fix copy and paste error in the idmap_tdb2 manpage

Michael
(cherry picked from commit bd252ad665547d2ad012725ccb18720e160d221f)

Signed-off-by: Michael Adam 

commit c52948a2b019bb1620ffa69605673d88bfa34bb4
Author: Michael Adam 
Date:   Wed Jan 21 00:56:03 2009 +0100

s3:docs: add a manpage for idmap_tdb2

Michael
(cherry picked from commit 84f2b2d731fb7d97c98414196bf96ee94ea88bb3)

Signed-off-by: Michael Adam 

commit 1bbc5f228b8b73a623f7afc5eb79c08757366029
Author: Michael Adam 
Date:   Wed Jan 21 00:13:29 2009 +0100

s3:docs: update the idmap_ldap manpage to reflect current facts.

Michael
(cherry picked from commit 7c5621b6e09d9ae3fe936a86e46d1b0f35906e6d)

Signed-off-by: Michael Adam 

commit 4145a1de91a18ea9a09b3088f0e5cd054875760b
Author: Michael Adam 
Date:   Wed Jan 21 00:06:10 2009 +0100

s3:docs: update the idmap_tdb manpage to reflect current facts.

Michael
(cherry picked from commit 32be66b19da07983670002d1b2b5bc80cf0c8d16)

Signed-off-by: Michael Adam 

---

Summary of changes:
 docs-xml/manpages-3/idmap_ldap.8.xml |   36 --
 docs-xml/manpages-3/idmap_tdb.8.xml  |   87 +-
 docs-xml/manpages-3/idmap_tdb2.8.xml |  133 ++
 3 files changed, 229 insertions(+), 27 deletions(-)
 create mode 100644 docs-xml/manpages-3/idmap_tdb2.8.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml 
b/docs-xml/manpages-3/idmap_ldap.8.xml
index 5bd65aa..603f800 100644
--- a/docs-xml/manpages-3/idmap_ldap.8.xml
+++ b/docs-xml/manpages-3/idmap_ldap.8.xml
@@ -21,8 +21,31 @@
 
The idmap_ldap plugin provides a means for Winbind to
store and retrieve SID/uid/gid mapping tables in an LDAP directory
-   service.  The module implements both the "idmap" and
-   "idmap alloc" APIs.
+   service.
+   
+
+   
+   In contrast to read only backends like idmap_rid, it is an allocating
+   backend: This means that it needs to allocate new user and group IDs in
+   order to create new mappings. The allocator can be provided by the
+   idmap_ldap backend itself or by any other allocating backend like
+   idmap_tdb or idmap_tdb2. This is configured with the
+   parameter idmap alloc backend.
+   
+
+   
+   Note that in order for this (or any other allocating) backend to
+   function at all, the default backend needs to be writeable.
+   The ranges used for uid and gid allocation are the default ranges
+   configured by "idmap uid" and "idmap gid".
+   
+
+   
+   Furthermore, since there is only one global allocating backend
+   responsible for all domains using writeable idmap backends,
+   any explicitly configured domain with idmap backend ldap
+   should have the same range as the default range, since it needs
+   to use the global uid / gid allocator. See the example below.

 
 
@@ -60,11 +83,10 @@
range = low - high
 
Defines the available matching uid and gid range for 
which the
-

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-42-gb319549

2009-01-21 Thread Michael Adam

The branch, master has been updated
   via  b319549f129b1c79afc9bfd4a84f2730b96d69a3 (commit)
   via  5e21fc3506f2ba7b1135b1acad2697dfb86b5df0 (commit)
   via  9b32e839bec8611c30745607a3a6b124d5b34c01 (commit)
  from  e4801a426a954040aeb6d2c6d5c1b3e596bd1cab (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b319549f129b1c79afc9bfd4a84f2730b96d69a3
Author: Michael Adam 
Date:   Wed Jan 21 15:10:10 2009 +0100

build-docs: cleanup exit of the script

exit in the directory where it was called using pushd/popd.

Michael

commit 5e21fc3506f2ba7b1135b1acad2697dfb86b5df0
Author: Michael Adam 
Date:   Wed Jan 21 15:09:46 2009 +0100

s3:docs: clean build/catalog.xml in "make clean"

Michael

commit 9b32e839bec8611c30745607a3a6b124d5b34c01
Author: Michael Adam 
Date:   Wed Jan 21 15:09:12 2009 +0100

s3:docs: clean generated .png images in "make clean"

Michael

---

Summary of changes:
 docs-xml/Makefile  |4 +++-
 release-scripts/build-docs |   20 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 08e3f5e..610d720 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -58,13 +58,15 @@ clean::
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
$(patsubst %.svg,%.pdf,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-   $(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+   $(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+   $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx 
*.aux
rm -f *-images-html*
rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
+   rm -f build/catalog.xml
 
 # Output format targets
 pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index bde87f4..5da641a 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -1,8 +1,14 @@
 #!/bin/sh
 
+_exit() {
+   echo $@
+   popd
+   exit 1
+}
+
 DOCSRCDIR=`dirname $0`/../docs-xml
 
-cd $DOCSRCDIR || exit 1
+pushd $DOCSRCDIR || exit 1
 
 git clean -d -x -f
 autoconf && \
@@ -11,21 +17,23 @@ autoconf && \
make release
 
 if [ $? != 0 ]; then
-echo "Docs build failed!"
-exit 1
+_exit "Docs build failed!"
 fi
 
-mkdir ../docs
+mkdir -p ../docs
 rsync -Ca --delete --exclude=.git output/ ../docs/
 rsync -Ca --exclude=.svn registry ../docs/
 rsync -Ca --exclude=.svn archives/ ../docs/
 
-cd ../docs || exit 1
+cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
+
 /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
 mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
-cd ../docs-xml || exit 1
+cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
 make distclean
 
+echo "Success"
+popd
 exit


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4854-gb7d6536

2009-01-21 Thread Michael Adam

The branch, v3-3-test has been updated
   via  b7d6536b323df9c5503b6a225e03a47ae2112e5c (commit)
   via  a33ec84ef7c64bf94526383340fb446e86d919e0 (commit)
   via  6a9346f0c2f900d95d0ba3ae0bdb22a6e88a7916 (commit)
  from  0b1036d5d6e06e2fa14dab163d51a902ca63fc0a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit b7d6536b323df9c5503b6a225e03a47ae2112e5c
Author: Michael Adam 
Date:   Wed Jan 21 15:10:10 2009 +0100

build-docs: cleanup exit of the script

exit in the directory where it was called using pushd/popd.

Michael
(cherry picked from commit b319549f129b1c79afc9bfd4a84f2730b96d69a3)

Signed-off-by: Michael Adam 

commit a33ec84ef7c64bf94526383340fb446e86d919e0
Author: Michael Adam 
Date:   Wed Jan 21 15:09:46 2009 +0100

s3:docs: clean build/catalog.xml in "make clean"

Michael
(cherry picked from commit 5e21fc3506f2ba7b1135b1acad2697dfb86b5df0)

Signed-off-by: Michael Adam 

commit 6a9346f0c2f900d95d0ba3ae0bdb22a6e88a7916
Author: Michael Adam 
Date:   Wed Jan 21 15:09:12 2009 +0100

s3:docs: clean generated .png images in "make clean"

Michael
(cherry picked from commit 9b32e839bec8611c30745607a3a6b124d5b34c01)

Signed-off-by: Michael Adam 

---

Summary of changes:
 docs-xml/Makefile  |4 +++-
 release-scripts/build-docs |   20 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 08e3f5e..610d720 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -58,13 +58,15 @@ clean::
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
$(patsubst %.svg,%.pdf,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-   $(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+   $(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+   $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx 
*.aux
rm -f *-images-html*
rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
+   rm -f build/catalog.xml
 
 # Output format targets
 pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index bde87f4..5da641a 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -1,8 +1,14 @@
 #!/bin/sh
 
+_exit() {
+   echo $@
+   popd
+   exit 1
+}
+
 DOCSRCDIR=`dirname $0`/../docs-xml
 
-cd $DOCSRCDIR || exit 1
+pushd $DOCSRCDIR || exit 1
 
 git clean -d -x -f
 autoconf && \
@@ -11,21 +17,23 @@ autoconf && \
make release
 
 if [ $? != 0 ]; then
-echo "Docs build failed!"
-exit 1
+_exit "Docs build failed!"
 fi
 
-mkdir ../docs
+mkdir -p ../docs
 rsync -Ca --delete --exclude=.git output/ ../docs/
 rsync -Ca --exclude=.svn registry ../docs/
 rsync -Ca --exclude=.svn archives/ ../docs/
 
-cd ../docs || exit 1
+cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
+
 /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
 mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
-cd ../docs-xml || exit 1
+cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
 make distclean
 
+echo "Success"
+popd
 exit


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3389-g0ee05c0

2009-01-21 Thread Michael Adam

The branch, v3-2-test has been updated
   via  0ee05c012e5f58c9132549c59cfd1ed74dd27759 (commit)
   via  c421d57e69de4d8c135123ed9f78dc9712bc7b3d (commit)
   via  bd3bb83824803c5301201f7fa2703a52971eae8f (commit)
  from  f3d355ffa75cd2b0f8cc51189e80aaf3552766d0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 0ee05c012e5f58c9132549c59cfd1ed74dd27759
Author: Michael Adam 
Date:   Wed Jan 21 15:10:10 2009 +0100

build-docs: cleanup exit of the script

exit in the directory where it was called using pushd/popd.

Michael
(cherry picked from commit b319549f129b1c79afc9bfd4a84f2730b96d69a3)

Signed-off-by: Michael Adam 

commit c421d57e69de4d8c135123ed9f78dc9712bc7b3d
Author: Michael Adam 
Date:   Wed Jan 21 15:09:46 2009 +0100

s3:docs: clean build/catalog.xml in "make clean"

Michael
(cherry picked from commit 5e21fc3506f2ba7b1135b1acad2697dfb86b5df0)

Signed-off-by: Michael Adam 

commit bd3bb83824803c5301201f7fa2703a52971eae8f
Author: Michael Adam 
Date:   Wed Jan 21 15:09:12 2009 +0100

s3:docs: clean generated .png images in "make clean"

Michael
(cherry picked from commit 9b32e839bec8611c30745607a3a6b124d5b34c01)

Signed-off-by: Michael Adam 

---

Summary of changes:
 docs-xml/Makefile  |4 +++-
 release-scripts/build-docs |   20 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 08e3f5e..610d720 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -58,13 +58,15 @@ clean::
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
$(patsubst %.svg,%.pdf,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-   $(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+   $(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+   $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx 
*.aux
rm -f *-images-html*
rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
+   rm -f build/catalog.xml
 
 # Output format targets
 pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index bde87f4..5da641a 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -1,8 +1,14 @@
 #!/bin/sh
 
+_exit() {
+   echo $@
+   popd
+   exit 1
+}
+
 DOCSRCDIR=`dirname $0`/../docs-xml
 
-cd $DOCSRCDIR || exit 1
+pushd $DOCSRCDIR || exit 1
 
 git clean -d -x -f
 autoconf && \
@@ -11,21 +17,23 @@ autoconf && \
make release
 
 if [ $? != 0 ]; then
-echo "Docs build failed!"
-exit 1
+_exit "Docs build failed!"
 fi
 
-mkdir ../docs
+mkdir -p ../docs
 rsync -Ca --delete --exclude=.git output/ ../docs/
 rsync -Ca --exclude=.svn registry ../docs/
 rsync -Ca --exclude=.svn archives/ ../docs/
 
-cd ../docs || exit 1
+cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
+
 /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
 mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
-cd ../docs-xml || exit 1
+cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
 make distclean
 
+echo "Success"
+popd
 exit


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-46-g4977d91

2009-01-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  4977d913ed54935383155f7b2045fd6679bacc33 (commit)
   via  f3ecb701335b1129947127d4c45eef970b66875c (commit)
   via  47951fc5d0085e124666b7667715bba98076820e (commit)
   via  d3199276eac8caa55c8334458d156fd4badae338 (commit)
  from  b319549f129b1c79afc9bfd4a84f2730b96d69a3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 4977d913ed54935383155f7b2045fd6679bacc33
Merge: f3ecb701335b1129947127d4c45eef970b66875c 
b319549f129b1c79afc9bfd4a84f2730b96d69a3
Author: Jelmer Vernooij 
Date:   Wed Jan 21 16:18:06 2009 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit f3ecb701335b1129947127d4c45eef970b66875c
Author: Jelmer Vernooij 
Date:   Wed Jan 21 16:15:53 2009 +0100

Replace ldb_search() with ldb_search_exp_fmt(), like in Samba 4.

commit 47951fc5d0085e124666b7667715bba98076820e
Author: Jelmer Vernooij 
Date:   Wed Jan 21 15:18:05 2009 +0100

Reorder arguments to ldb_search() to match what is in Samba 4.

commit d3199276eac8caa55c8334458d156fd4badae338
Merge: 1d59fd4d733007ccabb69c945e1da2208c376b96 
157864d1e8cb069a3be0aadf71e114f9ae827df3
Author: Jelmer Vernooij 
Date:   Wed Jan 21 14:24:16 2009 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba

---

Summary of changes:
 source3/groupdb/mapping_ldb.c|   52 +
 source3/lib/ldb/common/ldb.c |   24 +++---
 source3/lib/ldb/common/ldb_modules.c |2 +-
 source3/lib/ldb/examples/ldbreader.c |5 +--
 source3/lib/ldb/include/ldb.h|   13 +---
 source3/lib/ldb/modules/ldb_map.c|2 +-
 source3/lib/ldb/nssldb/ldb-grp.c |   53 ++---
 source3/lib/ldb/nssldb/ldb-pwd.c |   38 
 source3/lib/ldb/tools/ad2oLschema.c  |   21 +
 source3/lib/ldb/tools/ldbdel.c   |2 +-
 source3/lib/ldb/tools/ldbedit.c  |2 +-
 source3/lib/ldb/tools/ldbtest.c  |   10 ++
 12 files changed, 62 insertions(+), 162 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index db32155..af99b86 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -221,7 +221,7 @@ static bool get_group_map_from_sid(DOM_SID sid, GROUP_MAP 
*map)
dn = mapping_dn(ldb, &sid);
if (dn == NULL) goto failed;
 
-   ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res);
+   ret = ldb_search(ldb, ldb, &res, dn, LDB_SCOPE_BASE, NULL, NULL);
talloc_steal(dn, res);
if (ret != LDB_SUCCESS || res->count != 1) {
goto failed;
@@ -243,24 +243,16 @@ failed:
 static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
 {
int ret;
-   char *expr;
struct ldb_result *res=NULL;
 
-   expr = talloc_asprintf(ldb, "(&(gidNumber=%u)(objectClass=groupMap))", 
-  (unsigned)gid);
-   if (expr == NULL) goto failed;
-
-   ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res);
-   talloc_steal(expr, res);
+   ret = ldb_search(ldb, ldb, &res, NULL, LDB_SCOPE_SUBTREE, NULL, 
"(&(gidNumber=%u)(objectClass=groupMap))", (unsigned)gid);
if (ret != LDB_SUCCESS || res->count != 1) goto failed;

if (!msg_to_group_map(res->msgs[0], map)) goto failed;
 
-   talloc_free(expr);
return True;
 
 failed:
-   talloc_free(expr);
return False;
 }
 
@@ -270,23 +262,16 @@ failed:
 static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
 {
int ret;
-   char *expr;
struct ldb_result *res=NULL;
 
-   expr = talloc_asprintf(ldb, "(&(ntName=%s)(objectClass=groupMap))", 
name);
-   if (expr == NULL) goto failed;
-
-   ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res);
-   talloc_steal(expr, res);
+   ret = ldb_search(ldb, ldb, &res, NULL, LDB_SCOPE_SUBTREE, NULL, 
"(&(ntName=%s)(objectClass=groupMap))", name);
if (ret != LDB_SUCCESS || res->count != 1) goto failed;

if (!msg_to_group_map(res->msgs[0], map)) goto failed;
 
-   talloc_free(expr);
return True;
 
 failed:
-   talloc_free(expr);
return False;
 }
 
@@ -317,7 +302,6 @@ static bool enum_group_mapping(const DOM_SID *domsid, enum 
lsa_SidType sid_name_
   size_t *p_num_entries, bool unix_only)
 {
int i, ret;
-   char *expr;
fstring name;
struct ldb_result *res = NULL;
struct ldb_dn *basedn=NULL;
@@ -326,14 +310,6 @@ static bool enum_group_mapping(const DOM_SID *domsid, enum 
lsa_SidType sid_name_
tmp_ctx = talloc_new(ldb);
if (tmp_ctx == NULL) goto failed;
 
-   if (sid_name_use == SID_NAME_UNKN

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-48-g3a4e61e

2009-01-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  3a4e61ecd809ceccced6e863a27b53264eee3efe (commit)
   via  4967f6948f479b0b2a3b7a3c05b5709e42207604 (commit)
  from  4977d913ed54935383155f7b2045fd6679bacc33 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 3a4e61ecd809ceccced6e863a27b53264eee3efe
Author: Jelmer Vernooij 
Date:   Wed Jan 21 16:49:36 2009 +0100

Only check for Perl once in Samba 3.

commit 4967f6948f479b0b2a3b7a3c05b5709e42207604
Author: Jelmer Vernooij 
Date:   Wed Jan 21 16:46:52 2009 +0100

Move check_make.m4 to the top-level.

---

Summary of changes:
 {source4/build/m4 => m4}/check_make.m4 |0 
 {source4/build/m4 => m4}/check_perl.m4 |0 
 source3/configure.in   |   19 ---
 source4/build/m4/env.m4|4 ++--
 4 files changed, 10 insertions(+), 13 deletions(-)
 rename {source4/build/m4 => m4}/check_make.m4 (100%)
 rename {source4/build/m4 => m4}/check_perl.m4 (100%)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/check_make.m4 b/m4/check_make.m4
similarity index 100%
rename from source4/build/m4/check_make.m4
rename to m4/check_make.m4
diff --git a/source4/build/m4/check_perl.m4 b/m4/check_perl.m4
similarity index 100%
rename from source4/build/m4/check_perl.m4
rename to m4/check_perl.m4
diff --git a/source3/configure.in b/source3/configure.in
index fb5e7b3..4191915 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -227,10 +227,17 @@ AC_ARG_WITH(profiling-data,
 )
 
 dnl Checks for programs.
+merged_build_possible=yes
 
 AC_PROG_INSTALL
 AC_PROG_AWK
-AC_PATH_PROG(PERL, perl)
+# Check for GNU make
+m4_include(../m4/check_make.m4)
+AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no])
+
+# Check for perl
+m4_include(../m4/check_perl.m4)
+AC_SAMBA_PERL([true], [merged_build_possible=no])
 
 AC_CHECK_TOOL(AR, ar)
 
@@ -6278,16 +6285,6 @@ AC_ARG_ENABLE(merged-build,
 m4_include(../lib/zlib/zlib.m4)
 
 if test x$enable_merged_build = xauto; then
-   merged_build_possible=yes
-
-   # Check for GNU make
-   m4_include(../source4/build/m4/check_make.m4)
-   AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no])
-
-   # Check for perl
-   m4_include(../source4/build/m4/check_perl.m4)
-   AC_SAMBA_PERL([true], [merged_build_possible=no])
-
# Check for python
m4_include(../source4/build/m4/check_python.m4)
AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 6f582aa..a988dd0 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -40,7 +40,7 @@ if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then
 fi
 
 m4_include(build/m4/check_path.m4)
-m4_include(build/m4/check_perl.m4)
+m4_include(../m4/check_perl.m4)
 
 AC_SAMBA_PERL([], [AC_MSG_ERROR([Please install perl from 
http://www.perl.com/])])
 
@@ -48,7 +48,7 @@ AC_PATH_PROG(YAPP, yapp, false)
 
 m4_include(build/m4/check_cc.m4)
 m4_include(build/m4/check_ld.m4)
-m4_include(build/m4/check_make.m4)
+m4_include(../m4/check_make.m4)
 
 AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU 
make])])
 AC_SAMBA_GNU_MAKE_VERSION()


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-49-g2c1d70a

2009-01-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  2c1d70ab79ef3ae9de8074cae7e11cfaa1a84810 (commit)
  from  3a4e61ecd809ceccced6e863a27b53264eee3efe (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 2c1d70ab79ef3ae9de8074cae7e11cfaa1a84810
Author: Jelmer Vernooij 
Date:   Wed Jan 21 17:21:45 2009 +0100

Automagically expand includes in Makefile.in during configure time
when make is not GNU Make.

---

Summary of changes:
 source3/configure.in  |   18 +-
 source3/script/expand-includes.pl |   25 +
 2 files changed, 42 insertions(+), 1 deletions(-)
 create mode 100755 source3/script/expand-includes.pl


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 4191915..f100477 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6374,7 +6374,17 @@ else
fi
 fi
 
-AC_OUTPUT(Makefile
+AC_SUBST(MAKEFILE)
+if test x$samba_cv_gnu_make = xyes; then
+   MAKEFILE=Makefile
+else
+   # When we don't have GNU Make, generate a copy of Makefile.in 
+   # that doesn't have the "include " statements but just includes 
+   # the files verbatim.
+   MAKEFILE=Makefile-noincludes
+   $PERL ./script/expand-includes.pl Makefile.in > $MAKEFILE.in
+fi
+AC_OUTPUT($MAKEFILE
  script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh 
script/uninstallbin.sh
  lib/netapi/examples/Makefile
  lib/netapi/tests/Makefile
@@ -6384,6 +6394,12 @@ AC_OUTPUT(Makefile
  pkgconfig/smbsharemodes.pc
  ../examples/libsmbclient/Makefile.internal
  )
+dnl If we had to expand the includes, make tsure the output file is moved back
+AC_OUTPUT_COMMANDS([
+if test x$MAKEFILE != Makefile; then
+   mv $MAKEFILE Makefile
+fi
+])
 
 #
 # Print very concise instructions on building/use
diff --git a/source3/script/expand-includes.pl 
b/source3/script/expand-includes.pl
new file mode 100755
index 000..da64363
--- /dev/null
+++ b/source3/script/expand-includes.pl
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+# Expand the include lines in a Makefile
+# Copyright (C) 2009 Jelmer Vernooij 
+# Published under the GNU GPLv3 or later
+
+sub process($)
+{
+   my ($f) = @_;
+   open(IN, $f) or die("Unable to open $f: $!");
+   foreach () {
+   my $l = $_;
+   if ($l =~ /^include (.*)$/) {
+   process($1);
+   } else {
+   print $l;
+   }
+   }
+}
+
+my $path = shift;
+unless ($path) {
+   print STDERR "Usage: $0 Makefile.in > Makefile-noincludes.in\n";
+   exit(1);
+}
+process($path);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-50-g076bb89

2009-01-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  076bb89028ea4d27a96492b2030d873b0d78ca24 (commit)
  from  2c1d70ab79ef3ae9de8074cae7e11cfaa1a84810 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 076bb89028ea4d27a96492b2030d873b0d78ca24
Author: Jelmer Vernooij 
Date:   Wed Jan 21 17:32:08 2009 +0100

expand-includes: Add simple protection against infinite recursion.

---

Summary of changes:
 source3/script/expand-includes.pl |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/expand-includes.pl 
b/source3/script/expand-includes.pl
index da64363..33fc44b 100755
--- a/source3/script/expand-includes.pl
+++ b/source3/script/expand-includes.pl
@@ -3,9 +3,13 @@
 # Copyright (C) 2009 Jelmer Vernooij 
 # Published under the GNU GPLv3 or later
 
+my $depth = 0;
+
 sub process($)
 {
my ($f) = @_;
+   $depth++;
+   die("Recursion in $f?") if ($depth > 100);
open(IN, $f) or die("Unable to open $f: $!");
foreach () {
my $l = $_;
@@ -15,6 +19,7 @@ sub process($)
print $l;
}
}
+   $depth--;
 }
 
 my $path = shift;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-52-g1377f28

2009-01-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  1377f28f85118b97b723da6636a865499774b448 (commit)
   via  f607ad2e9013bc52d409faf8e628b8c6092f7d61 (commit)
  from  076bb89028ea4d27a96492b2030d873b0d78ca24 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 1377f28f85118b97b723da6636a865499774b448
Author: Jelmer Vernooij 
Date:   Wed Jan 21 18:20:23 2009 +0100

Fix warning; base dn is no longer const.

commit f607ad2e9013bc52d409faf8e628b8c6092f7d61
Author: Jelmer Vernooij 
Date:   Wed Jan 21 18:07:41 2009 +0100

Move check_python.m4 to common m4 directory.

---

Summary of changes:
 {source4/build/m4 => m4}/check_python.m4 |0 
 source3/configure.in |2 +-
 source3/lib/ldb/tools/ldbdel.c   |4 ++--
 source4/build/m4/env.m4  |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename {source4/build/m4 => m4}/check_python.m4 (100%)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/check_python.m4 b/m4/check_python.m4
similarity index 100%
rename from source4/build/m4/check_python.m4
rename to m4/check_python.m4
diff --git a/source3/configure.in b/source3/configure.in
index f100477..87b4c33 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6286,7 +6286,7 @@ m4_include(../lib/zlib/zlib.m4)
 
 if test x$enable_merged_build = xauto; then
# Check for python
-   m4_include(../source4/build/m4/check_python.m4)
+   m4_include(../m4/check_python.m4)
AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
 
AC_MSG_CHECKING([whether it would be possible to do a merged build])
diff --git a/source3/lib/ldb/tools/ldbdel.c b/source3/lib/ldb/tools/ldbdel.c
index cafe0bd..c58a82a 100644
--- a/source3/lib/ldb/tools/ldbdel.c
+++ b/source3/lib/ldb/tools/ldbdel.c
@@ -35,7 +35,7 @@
 #include "ldb/include/includes.h"
 #include "ldb/tools/cmdline.h"
 
-static int ldb_delete_recursive(struct ldb_context *ldb, const struct ldb_dn 
*dn)
+static int ldb_delete_recursive(struct ldb_context *ldb, struct ldb_dn *dn)
 {
int ret, i, total=0;
const char *attrs[] = { NULL };
@@ -90,7 +90,7 @@ int main(int argc, const char **argv)
}
 
for (i=0;iargc;i++) {
-   const struct ldb_dn *dn;
+   struct ldb_dn *dn;
 
dn = ldb_dn_explode(ldb, options->argv[i]);
if (dn == NULL) {
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index a988dd0..738ab8b 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -73,7 +73,7 @@ AC_SUBST(automatic_dependencies)
 
 m4_include(build/m4/check_doc.m4)
 
-m4_include(build/m4/check_python.m4)
+m4_include(../m4/check_python.m4)
 
 AC_SAMBA_PYTHON_DEVEL([
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-53-g3089cfc

2009-01-21 Thread Karolin Seeger

The branch, master has been updated
   via  3089cfcc4b75088db4dd5683902be81bc4ee48b4 (commit)
  from  1377f28f85118b97b723da6636a865499774b448 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 3089cfcc4b75088db4dd5683902be81bc4ee48b4
Author: Karolin Seeger 
Date:   Wed Jan 21 18:31:30 2009 +0100

s3/vfs_extd_audit: Don't ignore "syslog = 0".

This fixes bug #5956.
Thanks to Oskar Wycislak  for reporting
and providing a patch!

Karolin

---

Summary of changes:
 source3/modules/vfs_extd_audit.c |  145 ++---
 1 files changed, 86 insertions(+), 59 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c
index 7516cba..d7c9d39 100644
--- a/source3/modules/vfs_extd_audit.c
+++ b/source3/modules/vfs_extd_audit.c
@@ -132,8 +132,11 @@ static int audit_connect(vfs_handle_struct *handle, const 
char *svc, const char
 
openlog("smbd_audit", LOG_PID, audit_syslog_facility(handle));
 
-   syslog(audit_syslog_priority(handle), "connect to service %s by user 
%s\n", 
-  svc, user);
+   if (lp_syslog() > 0) {
+   syslog(audit_syslog_priority(handle),
+  "connect to service %s by user %s\n",
+  svc, user);
+   }
DEBUG(10, ("Connected to service %s as user %s\n",
   svc, user));
 
@@ -144,7 +147,9 @@ static int audit_connect(vfs_handle_struct *handle, const 
char *svc, const char
 
 static void audit_disconnect(vfs_handle_struct *handle)
 {
-   syslog(audit_syslog_priority(handle), "disconnected\n");
+   if (lp_syslog() > 0) {
+   syslog(audit_syslog_priority(handle), "disconnected\n");
+   }
DEBUG(10, ("Disconnected from VFS module extd_audit\n"));
SMB_VFS_NEXT_DISCONNECT(handle);
 
@@ -157,10 +162,12 @@ static SMB_STRUCT_DIR *audit_opendir(vfs_handle_struct 
*handle, const char *fnam
 
result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 
-   syslog(audit_syslog_priority(handle), "opendir %s %s%s\n",
-  fname,
-  (result == NULL) ? "failed: " : "",
-  (result == NULL) ? strerror(errno) : "");
+   if (lp_syslog() > 0) {
+   syslog(audit_syslog_priority(handle), "opendir %s %s%s\n",
+  fname,
+  (result == NULL) ? "failed: " : "",
+  (result == NULL) ? strerror(errno) : "");
+   }
DEBUG(1, ("vfs_extd_audit: opendir %s %s %s\n",
   fname,
   (result == NULL) ? "failed: " : "",
@@ -172,13 +179,15 @@ static SMB_STRUCT_DIR *audit_opendir(vfs_handle_struct 
*handle, const char *fnam
 static int audit_mkdir(vfs_handle_struct *handle, const char *path, mode_t 
mode)
 {
int result;
-   
+
result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
-   
-   syslog(audit_syslog_priority(handle), "mkdir %s %s%s\n", 
-  path,
-  (result < 0) ? "failed: " : "",
-  (result < 0) ? strerror(errno) : "");
+
+   if (lp_syslog() > 0) {
+   syslog(audit_syslog_priority(handle), "mkdir %s %s%s\n",
+  path,
+  (result < 0) ? "failed: " : "",
+  (result < 0) ? strerror(errno) : "");
+   }
DEBUG(0, ("vfs_extd_audit: mkdir %s %s %s\n",
   path,
   (result < 0) ? "failed: " : "",
@@ -190,13 +199,15 @@ static int audit_mkdir(vfs_handle_struct *handle, const 
char *path, mode_t mode)
 static int audit_rmdir(vfs_handle_struct *handle, const char *path)
 {
int result;
-   
+
result = SMB_VFS_NEXT_RMDIR(handle, path);
 
-   syslog(audit_syslog_priority(handle), "rmdir %s %s%s\n", 
-  path, 
-  (result < 0) ? "failed: " : "",
-  (result < 0) ? strerror(errno) : "");
+   if (lp_syslog() > 0) {
+   syslog(audit_syslog_priority(handle), "rmdir %s %s%s\n",
+  path,
+  (result < 0) ? "failed: " : "",
+  (result < 0) ? strerror(errno) : "");
+   }
DEBUG(0, ("vfs_extd_audit: rmdir %s %s %s\n",
path,
   (result < 0) ? "failed: " : "",
@@ -208,14 +219,16 @@ static int audit_rmdir(vfs_handle_struct *handle, const 
char *path)
 static int audit_open(vfs_handle_struct *handle, const char *fname, 
files_struct *fsp, int flags, mode_t mode)
 {
int result;
-   
+
result = SMB_VFS_NEXT_OPEN(handle, fname, fsp, flags, mode);
 
-   syslog(audit_syslog_priority(handle), "open %s (fd %d) %s%s%s\n", 
-  fname, result,
-  ((flags & O_WRONLY) || (flags & O_RDWR)) ? "for writing " : "", 
-

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-63-ga868d2f

2009-01-21 Thread Michael Adam

The branch, master has been updated
   via  a868d2f3d5281dea923718486e4e42b20cf8fe74 (commit)
   via  85447ac7479daebe1f9dfefccef5529eba99dadc (commit)
   via  7ac06f16095c45e0a4388e9420dca28077b0e2b7 (commit)
   via  1ed0cc7c9bc0043fe34562438136c0fed30a1746 (commit)
   via  d0a8c356fb7bc5536a8ea7db53ba8a5dd6bee78e (commit)
   via  f0f5029fd73e2c6edcaac4e381bc12316fe381cc (commit)
   via  53ea5742554f1a7064e5836df5d05ea2632b3088 (commit)
   via  c94fd054ca441f7ef6ea04dd268f495ec4884569 (commit)
   via  9f3c67e80c8b791cbfef9d58b5aa7a9ecdf909f3 (commit)
   via  52b77c928c14c9742293bcd0b0f82f56696fb5b3 (commit)
  from  3089cfcc4b75088db4dd5683902be81bc4ee48b4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a868d2f3d5281dea923718486e4e42b20cf8fe74
Author: Michael Adam 
Date:   Wed Jan 21 18:10:23 2009 +0100

libsmbconf: move the non-registry parts of libsmbconf to top level

Michael

commit 85447ac7479daebe1f9dfefccef5529eba99dadc
Author: Michael Adam 
Date:   Wed Jan 21 18:25:47 2009 +0100

s3:libsmbconf: include smbconf headers with lib/smbconf prefix

Michael

commit 7ac06f16095c45e0a4388e9420dca28077b0e2b7
Author: Michael Adam 
Date:   Wed Jan 21 17:16:37 2009 +0100

s3:libsmbconf: use talloc_free instead of TALLOC_FREE in reg backend

Michael

commit 1ed0cc7c9bc0043fe34562438136c0fed30a1746
Author: Michael Adam 
Date:   Wed Jan 21 17:14:56 2009 +0100

s3:libsmbconf: use talloc_free instead of TALLOC_FREE in txt backend

Michael

commit d0a8c356fb7bc5536a8ea7db53ba8a5dd6bee78e
Author: Michael Adam 
Date:   Wed Jan 21 17:12:50 2009 +0100

s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf_init

Michael

commit f0f5029fd73e2c6edcaac4e381bc12316fe381cc
Author: Michael Adam 
Date:   Wed Jan 21 17:11:46 2009 +0100

s3:libsmbconf: use talloc_free instead of TALLOC_FREE in testsuite

Michael

commit 53ea5742554f1a7064e5836df5d05ea2632b3088
Author: Michael Adam 
Date:   Wed Jan 21 17:11:02 2009 +0100

s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf_util.c

Michael

commit c94fd054ca441f7ef6ea04dd268f495ec4884569
Author: Michael Adam 
Date:   Wed Jan 21 17:10:20 2009 +0100

s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf.c

Michael

commit 9f3c67e80c8b791cbfef9d58b5aa7a9ecdf909f3
Author: Michael Adam 
Date:   Wed Jan 21 16:59:09 2009 +0100

s3:libsmbconf: remove the init headers from smbconf.h

give the smbconf_init() dispatcher and the backends
(smbconf_reg and smbconf_txt) a header of their own each.

This allows to use the basic infrastructure and
single backends individually.

Michael

commit 52b77c928c14c9742293bcd0b0f82f56696fb5b3
Author: Michael Adam 
Date:   Wed Jan 21 16:24:32 2009 +0100

s3:libsmbconf: remove unused function smbconf_is_writeable_bystring()

Michael

---

Summary of changes:
 lib/smbconf/smbconf.c  |  405 +++
 lib/smbconf/smbconf.h  |   97 
 {source3/lib => lib}/smbconf/smbconf_private.h |0 
 lib/smbconf/smbconf_txt.c  |  655 
 lib/smbconf/smbconf_txt.h  |   33 ++
 lib/smbconf/smbconf_util.c |  151 ++
 source3/Makefile.in|5 +-
 source3/include/includes.h |3 +
 source3/lib/smbconf/smbconf.c  |  431 
 source3/lib/smbconf/smbconf.h  |  117 -
 source3/lib/smbconf/smbconf_init.c |6 +-
 source3/lib/smbconf/smbconf_init.h |   32 ++
 source3/lib/smbconf/smbconf_reg.c  |   42 +-
 source3/lib/smbconf/smbconf_reg.h  |   33 ++
 source3/lib/smbconf/smbconf_txt.c  |  654 ---
 source3/lib/smbconf/smbconf_util.c |  151 --
 source3/lib/smbconf/testsuite.c|   10 +-
 17 files changed, 1442 insertions(+), 1383 deletions(-)
 create mode 100644 lib/smbconf/smbconf.c
 create mode 100644 lib/smbconf/smbconf.h
 rename {source3/lib => lib}/smbconf/smbconf_private.h (100%)
 create mode 100644 lib/smbconf/smbconf_txt.c
 create mode 100644 lib/smbconf/smbconf_txt.h
 create mode 100644 lib/smbconf/smbconf_util.c
 delete mode 100644 source3/lib/smbconf/smbconf.c
 delete mode 100644 source3/lib/smbconf/smbconf.h
 create mode 100644 source3/lib/smbconf/smbconf_init.h
 create mode 100644 source3/lib/smbconf/smbconf_reg.h
 delete mode 100644 source3/lib/smbconf/smbconf_txt.c
 delete mode 100644 source3/lib/smbconf/smbconf_util.c


Changeset truncated at 500 lines:

diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
new file mode 100644
index 0

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-68-ge9615b4

2009-01-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  e9615b43b4dc7037da7bc274d720b8e54c7f85bc (commit)
   via  b711faa53f38aa5250808ae5f6db884f198211a0 (commit)
   via  97ff9d479aa5e535862073c4bba1143877bc2506 (commit)
   via  715cc00bc01e151c10e3d723cd29e126a6464637 (commit)
   via  293acaf92e7234665e15c3fb7fd600427ffcd5ce (commit)
  from  a868d2f3d5281dea923718486e4e42b20cf8fe74 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit e9615b43b4dc7037da7bc274d720b8e54c7f85bc
Author: Jelmer Vernooij 
Date:   Wed Jan 21 18:54:20 2009 +0100

Fix path to check_python.m4.

commit b711faa53f38aa5250808ae5f6db884f198211a0
Author: Jelmer Vernooij 
Date:   Wed Jan 21 18:50:16 2009 +0100

libsmbconf: Remove use of some Samba3-specific macros.

commit 97ff9d479aa5e535862073c4bba1143877bc2506
Author: Jelmer Vernooij 
Date:   Wed Jan 21 18:50:02 2009 +0100

libsmbconf: Add build magic for Samba 4.

commit 715cc00bc01e151c10e3d723cd29e126a6464637
Merge: 293acaf92e7234665e15c3fb7fd600427ffcd5ce 
a868d2f3d5281dea923718486e4e42b20cf8fe74
Author: Jelmer Vernooij 
Date:   Wed Jan 21 18:40:06 2009 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 293acaf92e7234665e15c3fb7fd600427ffcd5ce
Author: Jelmer Vernooij 
Date:   Wed Jan 21 18:38:40 2009 +0100

pidl/python: Add explicit casts, fixes warnings about casts when enabled.

---

Summary of changes:
 lib/smbconf/config.mk|3 +++
 lib/smbconf/smbconf.c|2 +-
 lib/smbconf/smbconf_private.h|6 ++
 lib/smbconf/smbconf_txt.c|   12 ++--
 lib/smbconf/smbconf_util.c   |4 ++--
 pidl/lib/Parse/Pidl/Samba4/Python.pm |8 
 source3/samba4.m4|2 +-
 source4/main.mk  |1 +
 8 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 lib/smbconf/config.mk


Changeset truncated at 500 lines:

diff --git a/lib/smbconf/config.mk b/lib/smbconf/config.mk
new file mode 100644
index 000..de66b90
--- /dev/null
+++ b/lib/smbconf/config.mk
@@ -0,0 +1,3 @@
+[SUBSYSTEM::LIBSMBCONF]
+
+LIBSMBCONF_OBJ_FILES = $(addprefix ../lib/smbconf/, smbconf.o smbconf_txt.o 
smbconf_util.o)
diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index d723f0b..bcab0b9 100644
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -130,7 +130,7 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
goto done;
}
 
-   tmp_services = TALLOC_ARRAY(tmp_ctx, struct smbconf_service *,
+   tmp_services = talloc_array(tmp_ctx, struct smbconf_service *,
tmp_num_shares);
 
if (tmp_services == NULL) {
diff --git a/lib/smbconf/smbconf_private.h b/lib/smbconf/smbconf_private.h
index b0333e9..c9e4418 100644
--- a/lib/smbconf/smbconf_private.h
+++ b/lib/smbconf/smbconf_private.h
@@ -20,6 +20,12 @@
 #ifndef __LIBSMBCONF_PRIVATE_H__
 #define __LIBSMBCONF_PRIVATE_H__
 
+#ifndef GLOBAL_NAME
+#define GLOBAL_NAME "global"
+#endif
+
+#include "lib/smbconf/smbconf.h"
+
 struct smbconf_ops {
WERROR (*init)(struct smbconf_ctx *ctx, const char *path);
int (*shutdown)(struct smbconf_ctx *ctx);
diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c
index c4d2d2b..1df4a9f 100644
--- a/lib/smbconf/smbconf_txt.c
+++ b/lib/smbconf/smbconf_txt.c
@@ -79,7 +79,7 @@ static bool smbconf_txt_do_section(const char *section, void 
*private_data)
cache->current_share = cache->num_shares;
cache->num_shares++;
 
-   cache->param_names = TALLOC_REALLOC_ARRAY(cache,
+   cache->param_names = talloc_realloc(cache,
  cache->param_names,
  char **,
  cache->num_shares);
@@ -88,7 +88,7 @@ static bool smbconf_txt_do_section(const char *section, void 
*private_data)
}
cache->param_names[cache->current_share] = NULL;
 
-   cache->param_values = TALLOC_REALLOC_ARRAY(cache,
+   cache->param_values = talloc_realloc(cache,
   cache->param_values,
   char **,
   cache->num_shares);
@@ -97,7 +97,7 @@ static bool smbconf_txt_do_section(const char *section, void 
*private_data)
}
cache->param_values[cache->current_share] = NULL;
 
-   cache->num_params = TALLOC_REALLOC_ARRAY(cache,
+   cache->num_params = talloc_realloc(cache,
 cache->num_params,
 uint32_t,
 cache->num_shares);
@@ -170,7 +170,7 @@ static WER

Build status as of Thu Jan 22 00:00:02 2009

2009-01-21 Thread build

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2009-01-21 
00:00:20.0 +
+++ /home/build/master/cache/broken_results.txt 2009-01-22 00:00:36.0 
+
@@ -1,23 +1,23 @@
-Build status as of Wed Jan 21 00:00:02 2009
+Build status as of Thu Jan 22 00:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   27 6  0 
+ccache   28 6  0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  27 27 0 
-libreplace   25 9  0 
+ldb  27 28 0 
+libreplace   27 10 0 
 lorikeet-heimdal 24 16 0 
-pidl 16 2  0 
+pidl 17 15 0 
 ppp  10 0  0 
-rsync27 9  0 
+rsync28 9  0 
 samba-docs   0  0  0 
 samba-gtk4  4  0 
-samba_3_X_devel 25 23 1 
-samba_3_X_test 25 20 0 
-samba_4_0_test 26 25 1 
-smb-build25 5  0 
-talloc   26 27 0 
-tdb  24 9  0 
+samba_3_X_devel 26 26 0 
+samba_3_X_test 26 21 0 
+samba_4_0_test 28 26 1 
+smb-build26 5  0 
+talloc   28 28 0 
+tdb  25 9  0

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-69-g989ad44

2009-01-21 Thread Steven Danneman

The branch, master has been updated
   via  989ad44d32c2e77972a966d91f1813b0b929f83b (commit)
  from  e9615b43b4dc7037da7bc274d720b8e54c7f85bc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 989ad44d32c2e77972a966d91f1813b0b929f83b
Author: todd stecher 
Date:   Mon Jan 19 15:09:51 2009 -0800

Memory leaks and other fixes found by Coverity

---

Summary of changes:
 source3/auth/pampass.c   |4 ++-
 source3/include/proto.h  |2 +-
 source3/lib/dprintf.c|   26 --
 source3/libsmb/clikrb5.c |   10 +++---
 source3/nmbd/nmbd_incomingrequests.c |4 +-
 source3/nmbd/nmbd_serverlistdb.c |2 +-
 source3/passdb/pdb_interface.c   |6 +++
 source3/passdb/pdb_ldap.c|1 +
 source3/rpc_client/cli_spoolss.c |   66 ++---
 source3/rpc_parse/parse_buffer.c |   11 +++---
 source3/rpc_server/srv_pipe.c|4 ++-
 source3/rpc_server/srv_spoolss_nt.c  |3 +-
 source3/rpc_server/srv_svcctl_nt.c   |2 -
 source3/utils/net_rpc.c  |   12 +-
 source3/winbindd/winbindd_group.c|8 -
 source3/winbindd/winbindd_user.c |8 -
 source3/winbindd/winbindd_util.c |   12 +-
 source3/winbindd/winbindd_wins.c |   10 -
 testsuite/printing/psec.c|7 +++-
 19 files changed, 136 insertions(+), 62 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index 9345eed..4312b77 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -462,7 +462,9 @@ static bool smb_pam_end(pam_handle_t *pamh, struct pam_conv 
*smb_pam_conv_ptr)
 static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char 
*rhost, struct pam_conv *pconv)
 {
int pam_error;
+#ifdef PAM_RHOST
const char *our_rhost;
+#endif
char addr[INET6_ADDRSTRLEN];
 
*pamh = (pam_handle_t *)NULL;
@@ -475,6 +477,7 @@ static bool smb_pam_start(pam_handle_t **pamh, const char 
*user, const char *rho
return False;
}
 
+#ifdef PAM_RHOST
if (rhost == NULL) {
our_rhost = client_name(get_client_fd());
if (strequal(our_rhost,"UNKNOWN"))
@@ -483,7 +486,6 @@ static bool smb_pam_start(pam_handle_t **pamh, const char 
*user, const char *rho
our_rhost = rhost;
}
 
-#ifdef PAM_RHOST
DEBUG(4,("smb_pam_start: PAM: setting rhost to: %s\n", our_rhost));
pam_error = pam_set_item(*pamh, PAM_RHOST, our_rhost);
if(!smb_pam_error_handler(*pamh, pam_error, "set rhost failed", 0)) {
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9ce6a9d..1445b10 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5581,7 +5581,7 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
 
 /* The following definitions come from rpc_parse/parse_buffer.c  */
 
-void rpcbuf_init(RPC_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx);
+bool rpcbuf_init(RPC_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx);
 bool prs_rpcbuffer(const char *desc, prs_struct *ps, int depth, RPC_BUFFER 
*buffer);
 bool prs_rpcbuffer_p(const char *desc, prs_struct *ps, int depth, RPC_BUFFER 
**buffer);
 bool rpcbuf_alloc_size(RPC_BUFFER *buffer, uint32 buffer_size);
diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index b3c830d..631c45a 100644
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -32,24 +32,27 @@
 
  int d_vfprintf(FILE *f, const char *format, va_list ap)
 {
-   char *p, *p2;
+   char *p = NULL, *p2 = NULL;
int ret, maxlen, clen;
const char *msgstr;
va_list ap2;
 
+   va_copy(ap2, ap);
+
/* do any message translations */
msgstr = lang_msg(format);
-   if (!msgstr) return -1;
-
-   va_copy(ap2, ap);
+   if (!msgstr) {
+   ret = -1;
+   goto out;
+   }
 
ret = vasprintf(&p, msgstr, ap2);
 
lang_msg_free(msgstr);
 
if (ret <= 0) {
- va_end(ap2);
- return ret;
+   ret = -1;
+   goto out;
}
 
/* now we have the string in unix format, convert it to the display
@@ -58,10 +61,10 @@
 again:
p2 = (char *)SMB_MALLOC(maxlen);
if (!p2) {
-   SAFE_FREE(p);
-   va_end(ap2);
-   return -1;
+   ret = -1;
+   goto out;
}
+
clen = convert_string(CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen, True);
 
if (clen >= maxlen) {
@@ -72,10 +75,11 @@ again:
}
 
/* good, its converted OK */
-   SAFE_FREE(p);
ret = fwrite(p2, 1, clen, f);
-   SAFE_FREE(p2);
+out:
 
+   SAFE_FREE(p);
+   SAFE_FREE(p2);
va_end(ap2);

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-73-g63e23a7

2009-01-21 Thread Michael Adam

The branch, master has been updated
   via  63e23a7d648cb608a9834b4397c0aed765a1d459 (commit)
   via  210830392999691469a55f4f5e2032abcdb20b8a (commit)
   via  de5313cbb5d83277db638788de2ddd5743d5d0cd (commit)
   via  842d24f23dad527f47b2cbbc8c4ac21b532d181d (commit)
  from  989ad44d32c2e77972a966d91f1813b0b929f83b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 63e23a7d648cb608a9834b4397c0aed765a1d459
Author: Michael Adam 
Date:   Thu Jan 22 08:14:06 2009 +0100

s3: run "make samba3-idl"

Michael

commit 210830392999691469a55f4f5e2032abcdb20b8a
Author: Michael Adam 
Date:   Thu Jan 22 08:10:11 2009 +0100

pidl/python: Add explicit casts, fixing implicit cast warnings.

Michael

commit de5313cbb5d83277db638788de2ddd5743d5d0cd
Author: Michael Adam 
Date:   Thu Jan 22 01:19:38 2009 +0100

run make idl_full, thus adding explicit casts to gen_ndr server code

Michael

commit 842d24f23dad527f47b2cbbc8c4ac21b532d181d
Author: Michael Adam 
Date:   Thu Jan 22 01:17:40 2009 +0100

pidl: reduce implicit cast warnings in gen_ndr server code

Michael

---

Summary of changes:
 librpc/gen_ndr/srv_dfs.c|   46 +-
 librpc/gen_ndr/srv_dssetup.c|   22 ++--
 librpc/gen_ndr/srv_echo.c   |   20 ++--
 librpc/gen_ndr/srv_epmapper.c   |   16 ++--
 librpc/gen_ndr/srv_eventlog.c   |   48 +-
 librpc/gen_ndr/srv_initshutdown.c   |6 +-
 librpc/gen_ndr/srv_lsa.c|  164 +++---
 librpc/gen_ndr/srv_netlogon.c   |   94 +-
 librpc/gen_ndr/srv_ntsvcs.c |  130 
 librpc/gen_ndr/srv_samr.c   |  136 +-
 librpc/gen_ndr/srv_srvsvc.c |  108 ++--
 librpc/gen_ndr/srv_svcctl.c |   88 
 librpc/gen_ndr/srv_winreg.c |   70 +++---
 librpc/gen_ndr/srv_wkssvc.c |   62 ++--
 pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm |2 +-
 pidl/lib/Parse/Pidl/Samba4/Python.pm|2 +-
 source3/librpc/gen_ndr/ndr_libnetapi.c  |2 +
 17 files changed, 509 insertions(+), 507 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/srv_dfs.c b/librpc/gen_ndr/srv_dfs.c
index f4b73d8..623df13 100644
--- a/librpc/gen_ndr/srv_dfs.c
+++ b/librpc/gen_ndr/srv_dfs.c
@@ -1757,7 +1757,7 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx, c
switch (opnum)
{
case NDR_DFS_GETMANAGERVERSION: {
-   struct dfs_GetManagerVersion *r = _r;
+   struct dfs_GetManagerVersion *r = (struct 
dfs_GetManagerVersion *)_r;
ZERO_STRUCT(r->out);
r->out.version = talloc_zero(mem_ctx, enum 
dfs_ManagerVersion);
if (r->out.version == NULL) {
@@ -1769,25 +1769,25 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client 
*cli, TALLOC_CTX *mem_ctx, c
}
 
case NDR_DFS_ADD: {
-   struct dfs_Add *r = _r;
+   struct dfs_Add *r = (struct dfs_Add *)_r;
r->out.result = _dfs_Add(cli->pipes_struct, r);
return NT_STATUS_OK;
}
 
case NDR_DFS_REMOVE: {
-   struct dfs_Remove *r = _r;
+   struct dfs_Remove *r = (struct dfs_Remove *)_r;
r->out.result = _dfs_Remove(cli->pipes_struct, r);
return NT_STATUS_OK;
}
 
case NDR_DFS_SETINFO: {
-   struct dfs_SetInfo *r = _r;
+   struct dfs_SetInfo *r = (struct dfs_SetInfo *)_r;
r->out.result = _dfs_SetInfo(cli->pipes_struct, r);
return NT_STATUS_OK;
}
 
case NDR_DFS_GETINFO: {
-   struct dfs_GetInfo *r = _r;
+   struct dfs_GetInfo *r = (struct dfs_GetInfo *)_r;
ZERO_STRUCT(r->out);
r->out.info = talloc_zero(mem_ctx, union dfs_Info);
if (r->out.info == NULL) {
@@ -1799,7 +1799,7 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx, c
}
 
case NDR_DFS_ENUM: {
-   struct dfs_Enum *r = _r;
+   struct dfs_Enum *r = (struct dfs_Enum *)_r;
ZERO_STRUCT(r->out);
r->out.info = r->in.info;
r->out.total = r->in.total;
@@ -1808,31 +1808,31 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client 
*cli, T

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-16-gd965ff0

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-20-g816934f

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4841-g162e4b6

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3380-g2545fcc

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-23-gce3e34d

[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-120-g0098eb4

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-24-g3741201

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4844-gba94107

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-21-g2bb1266

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3386-gf3d355f

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-31-ga83feb2

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-34-g157864d

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-39-ge4801a4

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4851-g0b1036d

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-42-gb319549

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4854-gb7d6536

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3389-g0ee05c0

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-46-g4977d91

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-48-g3a4e61e

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-49-g2c1d70a

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-50-g076bb89

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-52-g1377f28

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-53-g3089cfc

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-63-ga868d2f

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-68-ge9615b4

Build status as of Thu Jan 22 00:00:02 2009

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-69-g989ad44

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-73-g63e23a7

28 matches

Site Navigation

Mail list logo

Footer information