[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-360-g53b5166

[Andrew Bartlett]

The branch, v4-0-test has been updated
   via  53b51660ae6b733b19b0ba3403f229b215de7b47 (commit)
   via  f917ccec85f854423f423bbffc41459d92960a1b (commit)
   via  47a1b76f7fff30229d3f23c6723f047923faf196 (commit)
  from  cbf3b74e5f5076d864b08c772f21b20751ea5163 (commit)

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


- Log -
commit 53b51660ae6b733b19b0ba3403f229b215de7b47
Merge: f917ccec85f854423f423bbffc41459d92960a1b 
cbf3b74e5f5076d864b08c772f21b20751ea5163
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 15:22:22 2008 +1100

Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

commit f917ccec85f854423f423bbffc41459d92960a1b
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 15:21:23 2008 +1100

Use 'dn' less, as this is not a valid attribute in AD, and I want to
remove it from ldb.  It is not longer mapped against OpenLDAP.

Andrew Bartlett

commit 47a1b76f7fff30229d3f23c6723f047923faf196
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 15:19:27 2008 +1100

Remove 'dn' from mapping, it isn't a valid attribute in AD, and causes
problems with ldap.js test with OpenLDAP as the backend.

Likewise, remove it from the template lookup (for consistancy).

TODO:  see if it can be removed from ldb

Andrew Bartlett

---

Summary of changes:
 source/dsdb/samdb/ldb_modules/simple_ldap_map.c |   18 --
 source/dsdb/samdb/samdb.c   |2 +-
 source/scripting/libjs/provision.js |8 
 3 files changed, 5 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/samdb/ldb_modules/simple_ldap_map.c 
b/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 91001d4..9701067 100644
--- a/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -376,15 +376,6 @@ static const struct ldb_map_attribute 
entryuuid_attributes[] =
}
},
{
-   .local_name = "dn",
-   .type = MAP_RENAME,
-   .u = {
-   .rename = {
-.remote_name = "entryDN"
-}
-   }
-   },
-   {
.local_name = "groupType",
.type = MAP_CONVERT,
.u = {
@@ -534,15 +525,6 @@ static const struct ldb_map_attribute 
nsuniqueid_attributes[] =
}
},
{
-   .local_name = "dn",
-   .type = MAP_RENAME,
-   .u = {
-   .rename = {
-.remote_name = "entryDN"
-}
-   }
-   },
-   {
.local_name = "groupType",
.type = MAP_CONVERT,
.u = {
diff --git a/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index b042d1d..c11eea1 100644
--- a/source/dsdb/samdb/samdb.c
+++ b/source/dsdb/samdb/samdb.c
@@ -134,7 +134,7 @@ int samdb_copy_template(struct ldb_context *ldb,
}

/* pull the template record */
-   ret = ldb_search(templates_ldb, basedn, LDB_SCOPE_BASE, "(dn=*)", NULL, 
&res);  
+   ret = ldb_search(templates_ldb, basedn, LDB_SCOPE_BASE, 
"distinguishedName=*", NULL, &res); 
talloc_free(basedn);
if (ret != LDB_SUCCESS) {
*errstring = talloc_steal(msg, ldb_errstring(templates_ldb));
diff --git a/source/scripting/libjs/provision.js 
b/source/scripting/libjs/provision.js
index 0da02ae..266bac1 100644
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -170,7 +170,7 @@ function ldb_erase(info, ldb)
/* and the rest */
attrs = new Array("dn");
var basedn = "";
-   var res = ldb.search("(&(|(objectclass=*)(dn=*))(!([EMAIL 
PROTECTED])))", basedn, ldb.SCOPE_SUBTREE, attrs);
+   var res = 
ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!([EMAIL PROTECTED])))", 
basedn, ldb.SCOPE_SUBTREE, attrs);
var i;
if (res.error != 0) {
ldb_delete(info, ldb);
@@ -180,7 +180,7 @@ function ldb_erase(info, ldb)
ldb.del(res.msgs[i].dn);
}
 
-   var res = ldb.search("(&(|(objectclass=*)(dn=*))(!([EMAIL 
PROTECTED])))", basedn, ldb.SCOPE_SUBTREE, attrs);
+   var res = 
ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!([EMAIL PROTECTED])))", 
basedn, ldb.SCOPE_SUBTREE, attrs);
if (res.error != 0 || res.msgs.length != 0) {
ldb_delete(info, ldb);
return;
@@ -207,8 +207,8 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
return;
}   
for (j=0; j

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-357-gcbf3b74

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  cbf3b74e5f5076d864b08c772f21b20751ea5163 (commit)
   via  874c00b1c1ef011c85226135144fafdc97d91116 (commit)
   via  355878907970b396e4031426fda260d981c417eb (commit)
   via  3a0d14f33532d88ace770d037c50375fe822dbb6 (commit)
   via  017aa400c7097cf6132f2bec969b9bbb5237f4d8 (commit)
   via  0c27eabbc40657493dc72f12b4fbdb07b0a3200f (commit)
   via  52f64afd4324eb185303ca192b88ccb632ee8587 (commit)
   via  d7a3f9612c4cb265279598c09f6983305656 (commit)
   via  74209fa6b097c6cd3c919dc6a67d998de12fa575 (commit)
   via  583881ae5a2a173abad9ba1ffd766b009d9ca8cd (commit)
   via  d029c0bedf8b3d300050786991e2df0e446fca72 (commit)
  from  9eddc27f13fa2feb56d6b015e66d8c54081487da (commit)

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


- Log -
commit cbf3b74e5f5076d864b08c772f21b20751ea5163
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 04:07:14 2008 +0100

Python: Update STATUS.

commit 874c00b1c1ef011c85226135144fafdc97d91116
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 04:06:00 2008 +0100

ldap/python: Fix last tests.

commit 355878907970b396e4031426fda260d981c417eb
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 04:05:41 2008 +0100

ldb/python: Support comparing Dn's to strings.

commit 3a0d14f33532d88ace770d037c50375fe822dbb6
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 02:06:30 2008 +0100

python/ldap: Fix a couple more tests.

commit 017aa400c7097cf6132f2bec969b9bbb5237f4d8
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 01:47:32 2008 +0100

Make a few more tests pass.

commit 0c27eabbc40657493dc72f12b4fbdb07b0a3200f
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 01:01:36 2008 +0100

python/ldap: Get further.

commit 52f64afd4324eb185303ca192b88ccb632ee8587
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 00:32:31 2008 +0100

python/ldap: Fix some tests.

commit d7a3f9612c4cb265279598c09f6983305656
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 00:22:23 2008 +0100

python: More work getting the LDAP test to compile again.

commit 74209fa6b097c6cd3c919dc6a67d998de12fa575
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 23:37:35 2008 +0100

python: Specify right arguments for the ldap test, fix some more calls.

commit 583881ae5a2a173abad9ba1ffd766b009d9ca8cd
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 23:06:14 2008 +0100

ldap/python: Fix some more calls.

commit d029c0bedf8b3d300050786991e2df0e446fca72
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 20:17:03 2008 +0100

python: No longer skip LDAP tests.

---

Summary of changes:
 source/lib/ldb/ldb.i|8 +
 source/lib/ldb/ldb.py   |7 +
 source/lib/ldb/tests/python/api.py  |4 +
 source/lib/ldb/tests/python/ldap.py |  514 +++---
 source/samba4-skip  |1 -
 source/scripting/python/STATUS  |2 +-
 source/selftest/samba4_tests.sh |2 +-
 7 files changed, 248 insertions(+), 290 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index 2604393..560142e 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -201,6 +201,14 @@ fail:
 
 /* FIXME: implement __getslice__ */
 #endif
+%pythoncode {
+def __eq__(self, other):
+if isinstance(other, self.__class__):
+return self.__cmp__(other) == 0
+if isinstance(other, str):
+return str(self) == other
+return False
+}
 }
 } ldb_dn;
 
diff --git a/source/lib/ldb/ldb.py b/source/lib/ldb/ldb.py
index 4cc8b52..ab2a68a 100644
--- a/source/lib/ldb/ldb.py
+++ b/source/lib/ldb/ldb.py
@@ -71,6 +71,13 @@ class Dn(object):
 def __init__(self, *args, **kwargs): 
 _ldb.Dn_swiginit(self,_ldb.new_Dn(*args, **kwargs))
 __swig_destroy__ = _ldb.delete_Dn
+def __eq__(self, other):
+if isinstance(other, self.__class__):
+return self.__cmp__(other) == 0
+if isinstance(other, str):
+return str(self) == other
+return False
+
 Dn.validate = new_instancemethod(_ldb.Dn_validate,None,Dn)
 Dn.get_casefold = new_instancemethod(_ldb.Dn_get_casefold,None,Dn)
 Dn.__str__ = new_instancemethod(_ldb.Dn___str__,None,Dn)
diff --git a/source/lib/ldb/tests/python/api.py 
b/source/lib/ldb/tests/python/api.py
index b071b84..d5346c3 100755
--- a/source/lib/ldb/tests/python/api.py
+++ b/source/lib/ldb/tests/python/api.py
@@ -249,6 +249,10 @@ class DnTests(unittest.TestCase):
 def setUp(self):
 self.ldb = ldb.Ldb("foo.tdb")
 
+def test_eq_str(self):
+x = ldb.Dn(self.l

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-346-g9eddc27

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  9eddc27f13fa2feb56d6b015e66d8c54081487da (commit)
  from  597f9fe17685fb7909269bc0af04bf4a040e2ad7 (commit)

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


- Log -
commit 9eddc27f13fa2feb56d6b015e66d8c54081487da
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 03:25:22 2008 +0100

python/ldap: Support controls argument to ldb.search().

---

Summary of changes:
 source/lib/ldb/ldb.i   |   52 +-
 source/lib/ldb/ldb.py  |   10 +++-
 source/lib/ldb/ldb_wrap.c  |  133 ---
 source/lib/ldb/tests/python/api.py |   22 ---
 4 files changed, 162 insertions(+), 55 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index cf4a335..2604393 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -514,11 +514,49 @@ typedef struct ldb_context {
 const char *options[] = NULL);
 
 ~ldb() { talloc_free($self); }
-ldb_error search(ldb_dn *base = NULL, 
+ldb_error search_ex(TALLOC_CTX *mem_ctx,
+   ldb_dn *base = NULL, 
enum ldb_scope scope = LDB_SCOPE_DEFAULT, 
const char *expression = NULL, 
-   const char * const *attrs = NULL, 
-   struct ldb_result **OUT);
+   const char *const *attrs = NULL, 
+   struct ldb_control **controls = NULL,
+   struct ldb_result **OUT) {
+int ret;
+struct ldb_result *res;
+struct ldb_request *req;
+res = talloc_zero(mem_ctx, struct ldb_result);
+if (!res) {
+return LDB_ERR_OPERATIONS_ERROR;
+}
+
+ret = ldb_build_search_req(&req, $self, mem_ctx,
+   base?base:ldb_get_default_basedn($self),
+   scope,
+   expression,
+   attrs,
+   controls,
+   res,
+   ldb_search_default_callback);
+
+if (ret != LDB_SUCCESS) {
+talloc_free(res);
+return ret;
+}
+
+ldb_set_timeout($self, req, 0); /* use default timeout */
+
+ret = ldb_request($self, req);
+
+if (ret == LDB_SUCCESS) {
+ret = ldb_wait(req->handle, LDB_WAIT_ALL);
+}
+
+talloc_free(req);
+
+*OUT = res;
+return ret;
+}
+
 ldb_error delete(ldb_dn *dn);
 ldb_error rename(ldb_dn *olddn, ldb_dn *newdn);
 struct ldb_control **parse_control_strings(TALLOC_CTX *mem_ctx, 
@@ -615,6 +653,14 @@ typedef struct ldb_context {
 _ldb.Ldb_swiginit(self,_ldb.new_Ldb())
 if url is not None:
 self.connect(url, flags, options)
+
+def search(self, base=None, scope=SCOPE_DEFAULT, expression=None, 
+   attrs=None, controls=None):
+parsed_controls = None
+if controls is not None:
+parsed_controls = self.parse_control_strings(controls)
+return self.search_ex(base, scope, expression, attrs, 
+  parsed_controls)
 }
 
 } ldb;
diff --git a/source/lib/ldb/ldb.py b/source/lib/ldb/ldb.py
index 5a921b5..4cc8b52 100644
--- a/source/lib/ldb/ldb.py
+++ b/source/lib/ldb/ldb.py
@@ -192,8 +192,16 @@ class Ldb(object):
 if url is not None:
 self.connect(url, flags, options)
 
+def search(self, base=None, scope=SCOPE_DEFAULT, expression=None, 
+   attrs=None, controls=None):
+parsed_controls = None
+if controls is not None:
+parsed_controls = self.parse_control_strings(controls)
+return self.search_ex(base, scope, expression, attrs, 
+  parsed_controls)
+
 Ldb.connect = new_instancemethod(_ldb.Ldb_connect,None,Ldb)
-Ldb.search = new_instancemethod(_ldb.Ldb_search,None,Ldb)
+Ldb.search_ex = new_instancemethod(_ldb.Ldb_search_ex,None,Ldb)
 Ldb.delete = new_instancemethod(_ldb.Ldb_delete,None,Ldb)
 Ldb.rename = new_instancemethod(_ldb.Ldb_rename,None,Ldb)
 Ldb.parse_control_strings = 
new_instancemethod(_ldb.Ldb_parse_control_strings,None,Ldb)
diff --git a/source/lib/ldb/ldb_wrap.c b/source/lib/ldb/ldb_wrap.c
index 282a218..c833246 100644
--- a/source/lib/ldb/ldb_wrap.c
+++ b/source/lib/ldb/ldb_wrap.c
@@ -3047,6 +3047,42 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int 
*val)
 }
 
 SWIGINTERN void delete_ldb(ldb *self){ talloc_free(self); }
+SWIGINTERN ldb_error ldb_search_ex(ldb *self,TALLOC_CTX *mem_ctx,ldb_dn 
*base,enum ldb_scop

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-345-g597f9fe

[Andrew Bartlett]

The branch, v4-0-test has been updated
   via  597f9fe17685fb7909269bc0af04bf4a040e2ad7 (commit)
   via  8099facff99dab4de27ea6f857d0e8f5eaa3db5a (commit)
   via  c72c39326b263b3aacd178ddc2fc3b1a2906f3d3 (commit)
   via  e3a76be04760a81a9c1b7ad9b139f088decc9ee6 (commit)
  from  b27e5a68530c4fd6430cbb174b63f8ff2b6f4e53 (commit)

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


- Log -
commit 597f9fe17685fb7909269bc0af04bf4a040e2ad7
Merge: 8099facff99dab4de27ea6f857d0e8f5eaa3db5a 
b27e5a68530c4fd6430cbb174b63f8ff2b6f4e53
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 13:16:08 2008 +1100

Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

commit 8099facff99dab4de27ea6f857d0e8f5eaa3db5a
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 13:15:49 2008 +1100

Rework ldbsearch to avoid segfault when remote LDAP server returns
referrals.

Andrew Bartlett

commit c72c39326b263b3aacd178ddc2fc3b1a2906f3d3
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 12:47:51 2008 +1100

Fix segfault when sorting LDAP replies on the client.

Andrew Bartlett

commit e3a76be04760a81a9c1b7ad9b139f088decc9ee6
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 10:44:49 2008 +1100

Add in new module to normalise DNs being returned from OpenLDAP.  This
fixes the case of the attribute in teh DN.

Fix option spelling for example re-provision

Andrew Bartlett

---

Summary of changes:
 source/dsdb/samdb/ldb_modules/config.mk   |   13 +++
 source/dsdb/samdb/ldb_modules/normalise.c |  166 +
 source/lib/ldb/tools/ldbsearch.c  |   24 ++---
 source/setup/provision|4 +-
 4 files changed, 192 insertions(+), 15 deletions(-)
 create mode 100644 source/dsdb/samdb/ldb_modules/normalise.c


Changeset truncated at 500 lines:

diff --git a/source/dsdb/samdb/ldb_modules/config.mk 
b/source/dsdb/samdb/ldb_modules/config.mk
index 95bb7de..a41a29b 100644
--- a/source/dsdb/samdb/ldb_modules/config.mk
+++ b/source/dsdb/samdb/ldb_modules/config.mk
@@ -320,3 +320,16 @@ OBJ_FILES = \
 # End MODULE ldb_anr
 
 
+
+# Start MODULE ldb_normalise
+[MODULE::ldb_normalise]
+INIT_FUNCTION = ldb_normalise_init
+CFLAGS = -Ilib/ldb/include
+OUTPUT_TYPE = SHARED_LIBRARY
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
+SUBSYSTEM = LIBLDB
+OBJ_FILES = \
+   normalise.o
+# End MODULE ldb_normalise
+
+
diff --git a/source/dsdb/samdb/ldb_modules/normalise.c 
b/source/dsdb/samdb/ldb_modules/normalise.c
new file mode 100644
index 000..efc9bb2
--- /dev/null
+++ b/source/dsdb/samdb/ldb_modules/normalise.c
@@ -0,0 +1,166 @@
+/* 
+   ldb database library
+
+   Copyright (C) Amdrew Bartlett <[EMAIL PROTECTED]> 2007-2008
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .
+*/
+
+/*
+ *  Name: ldb
+ *
+ *  Component: ldb normalisation module
+ *
+ *  Description: module to ensure all DNs and attribute names are normalised
+ *
+ *  Author: Andrew Bartlett
+ */
+
+#include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_errors.h"
+#include "ldb/include/ldb_private.h"
+#include "dsdb/samdb/samdb.h"
+
+/* Fix up the DN to be in the standard form, taking particular care to match 
the parent DN
+
+   This should mean that if the parent is:
+CN=Users,DC=samba,DC=example,DC=com
+   and a proposed child is
+cn=Admins ,cn=USERS,dc=Samba,dc=example,dc=COM
+
+   The resulting DN should be:
+
+CN=Admins,CN=Users,DC=samba,DC=example,DC=com
+   
+ */
+static int fix_dn(struct ldb_dn *dn) 
+{
+   int i, ret;
+   char *upper_rdn_attr;
+
+   for (i=0; i < ldb_dn_get_comp_num(dn); i++) {
+   /* We need the attribute name in upper case */
+   upper_rdn_attr = strupper_talloc(dn,
+ldb_dn_get_component_name(dn, 
i));
+   if (!upper_rdn_attr) {
+   return LDB_ERR_OPERATIONS_ERROR;
+   }
+   
+   /* And replace it with CN=

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-341-gb27e5a6

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  b27e5a68530c4fd6430cbb174b63f8ff2b6f4e53 (commit)
  from  1ccbab81d79f83bb419104f2bbaf2ae7b368e90f (commit)

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


- Log -
commit b27e5a68530c4fd6430cbb174b63f8ff2b6f4e53
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 02:36:59 2008 +0100

python/ldap: Wrap parse_control_strings().

---

Summary of changes:
 source/lib/ldb/ldb.i   |   27 +-
 source/lib/ldb/ldb.py  |1 +
 source/lib/ldb/ldb_wrap.c  |  106 
 source/lib/ldb/tests/python/api.py |5 ++
 4 files changed, 114 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index b671835..cf4a335 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -50,6 +50,15 @@ typedef int ldb_error;
 %include "exception.i"
 %import "stdint.i"
 
+/* Don't expose talloc contexts in Python code. Python does reference 
+   counting for us, so just create a new top-level talloc context.
+ */
+%typemap(in, numinputs=0, noblock=1) TALLOC_CTX * {
+$1 = NULL;
+}
+
+
+
 %constant int SCOPE_DEFAULT = LDB_SCOPE_DEFAULT;
 %constant int SCOPE_BASE = LDB_SCOPE_BASE;
 %constant int SCOPE_ONELEVEL = LDB_SCOPE_ONELEVEL;
@@ -115,7 +124,7 @@ typedef int ldb_error;
 }
 }
 
-%typemap(in,noblock=1,numinputs=1) const char * const *attrs {
+%typemap(in,noblock=1,numinputs=1) const char * const *NULL_STR_LIST {
 if ($input == Py_None) {
 $1 = NULL;
 } else if (PySequence_Check($input)) {
@@ -129,9 +138,13 @@ typedef int ldb_error;
 }
 }
 
-%typemap(freearg,noblock=1) const char * const *attrs {
+%typemap(freearg,noblock=1) const char * const *NULL_STR_LIST {
 talloc_free($1);
 }
+
+%apply const char * const *NULL_STR_LIST { const char * const *attrs }
+%apply const char * const *NULL_STR_LIST { const char * const *control_strings 
}
+
 #endif
 
 %types(struct ldb_result *);
@@ -472,6 +485,14 @@ PyObject *PyExc_LdbError;
 $result = Py_None;
 };
 
+%typemap(out,noblock=1) struct ldb_control ** {
+if ($1 == NULL) {
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)"(s)", 
ldb_errstring(arg1)));
+SWIG_fail;
+}
+$result = SWIG_NewPointerObj($1, $1_descriptor, 0);
+}
+
 %rename(Ldb) ldb_context;
 
 %typemap(in,noblock=1) struct ldb_dn * {
@@ -500,6 +521,8 @@ typedef struct ldb_context {
struct ldb_result **OUT);
 ldb_error delete(ldb_dn *dn);
 ldb_error rename(ldb_dn *olddn, ldb_dn *newdn);
+struct ldb_control **parse_control_strings(TALLOC_CTX *mem_ctx, 
+   const char * 
const*control_strings);
 ldb_error add(ldb_msg *add_msg);
 ldb_error add(PyObject *py_msg) 
 {
diff --git a/source/lib/ldb/ldb.py b/source/lib/ldb/ldb.py
index 6aacc8c..5a921b5 100644
--- a/source/lib/ldb/ldb.py
+++ b/source/lib/ldb/ldb.py
@@ -196,6 +196,7 @@ Ldb.connect = new_instancemethod(_ldb.Ldb_connect,None,Ldb)
 Ldb.search = new_instancemethod(_ldb.Ldb_search,None,Ldb)
 Ldb.delete = new_instancemethod(_ldb.Ldb_delete,None,Ldb)
 Ldb.rename = new_instancemethod(_ldb.Ldb_rename,None,Ldb)
+Ldb.parse_control_strings = 
new_instancemethod(_ldb.Ldb_parse_control_strings,None,Ldb)
 Ldb.add = new_instancemethod(_ldb.Ldb_add,None,Ldb)
 Ldb.modify = new_instancemethod(_ldb.Ldb_modify,None,Ldb)
 Ldb.get_config_basedn = new_instancemethod(_ldb.Ldb_get_config_basedn,None,Ldb)
diff --git a/source/lib/ldb/ldb_wrap.c b/source/lib/ldb/ldb_wrap.c
index 10ea4f4..282a218 100644
--- a/source/lib/ldb/ldb_wrap.c
+++ b/source/lib/ldb/ldb_wrap.c
@@ -2459,29 +2459,31 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info 
*ty, int argnum, int flags)
 
 /*  TYPES TABLE (BEGIN)  */
 
-#define SWIGTYPE_p_char swig_types[0]
-#define SWIGTYPE_p_f_p_void_enum_ldb_debug_level_p_q_const__char_va_list__void 
swig_types[1]
-#define SWIGTYPE_p_int swig_types[2]
-#define SWIGTYPE_p_ldb_context swig_types[3]
-#define SWIGTYPE_p_ldb_dn swig_types[4]
-#define SWIGTYPE_p_ldb_ldif swig_types[5]
-#define SWIGTYPE_p_ldb_message swig_types[6]
-#define SWIGTYPE_p_ldb_message_element swig_types[7]
-#define SWIGTYPE_p_ldb_module_ops swig_types[8]
-#define SWIGTYPE_p_ldb_result swig_types[9]
-#define SWIGTYPE_p_long_long swig_types[10]
-#define SWIGTYPE_p_p_char swig_types[11]
-#define SWIGTYPE_p_p_ldb_result swig_types[12]
-#define SWIGTYPE_p_short swig_types[13]
-#define SWIGTYPE_p_signed_char swig_types[14]
-#define SWIGTYPE_p_unsigned_char swig_types[15]
-#define SWIGTYPE_p_unsigned_int swig_types[16]
-#define SWIGTYPE_p_unsigned_long swig_types[17]
-#define SWIGTYPE_p_unsigned_long_long swig_types[18]
-#define SWIGTYPE_p_unsigned_short swig_types[19]
-#def

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-340-g1ccbab8

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  1ccbab81d79f83bb419104f2bbaf2ae7b368e90f (commit)
  from  a8f90ed34ce9341080b63c801ef54b82de42b8e6 (commit)

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


- Log -
commit 1ccbab81d79f83bb419104f2bbaf2ae7b368e90f
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 01:55:56 2008 +0100

ldb/python: Allow comparing a MessageElement to a list or a singleton.

---

Summary of changes:
 source/lib/ldb/ldb.i   |   13 -
 source/lib/ldb/ldb.py  |   13 -
 source/lib/ldb/tests/python/api.py |6 ++
 3 files changed, 22 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index 57fa365..b671835 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -306,12 +306,15 @@ typedef struct ldb_message_element {
 return ret
 
 def __eq__(self, other):
-if (isinstance(other, str) and 
-len(set(self)) == 1 and 
-set(self).pop() == other):
+if (len(self) == 1 and self.get(0) == other):
 return True
-return self.__cmp__(other) == 0
-
+if isinstance(other, self.__class__):
+return self.__cmp__(other) == 0
+o = iter(other)
+for i in range(len(self)):
+if self.get(i) != o.next():
+return False
+return True
 }
 } ldb_msg_element;
 
diff --git a/source/lib/ldb/ldb.py b/source/lib/ldb/ldb.py
index 2d037f0..6aacc8c 100644
--- a/source/lib/ldb/ldb.py
+++ b/source/lib/ldb/ldb.py
@@ -101,12 +101,15 @@ class ldb_msg_element(object):
 return ret
 
 def __eq__(self, other):
-if (isinstance(other, str) and 
-len(set(self)) == 1 and 
-set(self).pop() == other):
+if (len(self) == 1 and self.get(0) == other):
 return True
-return self.__cmp__(other) == 0
-
+if isinstance(other, self.__class__):
+return self.__cmp__(other) == 0
+o = iter(other)
+for i in range(len(self)):
+if self.get(i) != o.next():
+return False
+return True
 
 ldb_msg_element.__iter__ = 
new_instancemethod(_ldb.ldb_msg_element___iter__,None,ldb_msg_element)
 ldb_msg_element.__set__ = 
new_instancemethod(_ldb.ldb_msg_element___set__,None,ldb_msg_element)
diff --git a/source/lib/ldb/tests/python/api.py 
b/source/lib/ldb/tests/python/api.py
index 5ab4010..8469e8f 100755
--- a/source/lib/ldb/tests/python/api.py
+++ b/source/lib/ldb/tests/python/api.py
@@ -392,6 +392,12 @@ class MessageElementTests(unittest.TestCase):
 x = ldb.MessageElement(["foo", "bar"])
 self.assertEquals(2, len(x))
 
+def test_eq(self):
+x = ldb.MessageElement(["foo", "bar"])
+self.assertEquals(["foo", "bar"], x)
+x = ldb.MessageElement(["foo"])
+self.assertEquals("foo", x)
+
 class ExampleModule:
 name = "example"
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1266-g767e016

[Jeremy Allison]

The branch, v3-2-test has been updated
   via  767e0164adf8803df50b0b7bd8e81d25af72bb78 (commit)
   via  3caeeaea162e2083a087c242b850c107a3be1bf9 (commit)
  from  3958abffaf2866c69ad9e13ec345364fde5c78bb (commit)

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


- Log -
commit 767e0164adf8803df50b0b7bd8e81d25af72bb78
Merge: 3caeeaea162e2083a087c242b850c107a3be1bf9 
3958abffaf2866c69ad9e13ec345364fde5c78bb
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Thu Jan 10 16:36:05 2008 -0800

Merge branch 'v3-2-test' of ssh://[EMAIL PROTECTED]/data/git/samba into 
v3-2-test

commit 3caeeaea162e2083a087c242b850c107a3be1bf9
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Thu Jan 10 16:35:54 2008 -0800

Don't switch user contexts unless you have to. Saves
a bunch of syscalls on close. Noticed by Volker.
Jeremy.

---

Summary of changes:
 source/smbd/close.c   |   39 +--
 source/smbd/sec_ctx.c |   17 +
 2 files changed, 42 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/close.c b/source/smbd/close.c
index c74e133..f67a4ad 100644
--- a/source/smbd/close.c
+++ b/source/smbd/close.c
@@ -163,7 +163,8 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
enum file_close_type close_type)
 {
connection_struct *conn = fsp->conn;
-   bool delete_file = False;
+   bool delete_file = false;
+   bool changed_user = false;
struct share_mode_lock *lck;
SMB_STRUCT_STAT sbuf;
NTSTATUS status = NT_STATUS_OK;
@@ -246,18 +247,26 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
DEBUG(5,("close_remove_share_mode: file %s. Delete on close was set "
 "- deleting file.\n", fsp->fsp_name));
 
-   /* Become the user who requested the delete. */
+   if (!unix_token_equal(lck->delete_token, ¤t_user.ut)) {
+   /* Become the user who requested the delete. */
 
-   if (!push_sec_ctx()) {
-   smb_panic("close_remove_share_mode: file %s. failed to push "
- "sec_ctx.\n");
-   }
+   DEBUG(5,("close_remove_share_mode: file %s. "
+   "Change user to uid %u\n",
+   (unsigned int)lck->delete_token->uid));
 
-   set_sec_ctx(lck->delete_token->uid,
-   lck->delete_token->gid,
-   lck->delete_token->ngroups,
-   lck->delete_token->groups,
-   NULL);
+   if (!push_sec_ctx()) {
+   smb_panic("close_remove_share_mode: file %s. failed to 
push "
+ "sec_ctx.\n");
+   }
+
+   set_sec_ctx(lck->delete_token->uid,
+   lck->delete_token->gid,
+   lck->delete_token->ngroups,
+   lck->delete_token->groups,
+   NULL);
+
+   changed_user = true;
+   }
 
/* We can only delete the file if the name we have is still valid and
   hasn't been renamed. */
@@ -326,9 +335,11 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 
  done:
 
-   /* unbecome user. */
-   pop_sec_ctx();
-   
+   if (changed_user) {
+   /* unbecome user. */
+   pop_sec_ctx();
+   }
+
TALLOC_FREE(lck);
return status;
 }
diff --git a/source/smbd/sec_ctx.c b/source/smbd/sec_ctx.c
index 6edcc36..0f307f6 100644
--- a/source/smbd/sec_ctx.c
+++ b/source/smbd/sec_ctx.c
@@ -33,6 +33,23 @@ static struct sec_ctx sec_ctx_stack[MAX_SEC_CTX_DEPTH + 1];
 static int sec_ctx_stack_ndx;
 
 /
+ Are two UNIX tokens equal ?
+/
+
+bool unix_token_equal(const UNIX_USER_TOKEN *t1, const UNIX_USER_TOKEN *t2)
+{
+   if (t1->uid != t2->uid || t1->gid != t2->gid ||
+   t1->ngroups != t2->ngroups) {
+   return false;
+   }
+   if (memcmp(t1->groups, t2->groups,
+   t1->ngroups*sizeof(gid_t)) != 0) {
+   return false;
+   }
+   return true;
+}
+
+/
  Become the specified uid.
 /
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1264-g3958abf

[Michael Adam]

The branch, v3-2-test has been updated
   via  3958abffaf2866c69ad9e13ec345364fde5c78bb (commit)
   via  63acaf1b9755cd5be5342929e1210afa06e170f3 (commit)
   via  a52cfb7d777157c93c9dc26c67f457be592dd537 (commit)
  from  3936de735a7bb548df8ce7f06f2cc8f7ffdf56cd (commit)

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


- Log -
commit 3958abffaf2866c69ad9e13ec345364fde5c78bb
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Fri Jan 11 01:26:54 2008 +0100

Combine fsp and tofd to tofsp in SMB_VFS_RECVFILE().

Michael

commit 63acaf1b9755cd5be5342929e1210afa06e170f3
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Fri Jan 11 00:56:06 2008 +0100

Remove now redundant parameter fd from prime_cache().

Michael

commit a52cfb7d777157c93c9dc26c67f457be592dd537
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Fri Jan 11 00:51:19 2008 +0100

Combine fsp and fromfd to fromfsp in SMB_VFS_SENDFILE().

Michael

---

Summary of changes:
 examples/VFS/skel_opaque.c  |8 
 examples/VFS/skel_transparent.c |8 
 source/include/vfs.h|6 --
 source/include/vfs_macros.h |   12 ++--
 source/modules/vfs_cacheprime.c |   14 ++
 source/modules/vfs_default.c|9 -
 source/modules/vfs_full_audit.c |   18 --
 source/modules/vfs_readahead.c  |   14 ++
 source/smbd/reply.c |4 ++--
 source/smbd/vfs.c   |2 --
 10 files changed, 44 insertions(+), 51 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 6b1f29b..5b196af 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -155,15 +155,15 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, 
files_struct *fsp, SMB_OF
return vfswrap_lseek(NULL, fsp, offset, whence);
 }
 
-static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct 
*fsp, int fromfd, const DATA_BLOB *hdr,
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct 
*fromfsp, const DATA_BLOB *hdr,
SMB_OFF_T offset, size_t n)
 {
-   return vfswrap_sendfile(NULL, tofd, fsp, fromfd, hdr, offset, n);
+   return vfswrap_sendfile(NULL, tofd, fromfsp, hdr, offset, n);
 }
 
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, 
files_struct *fsp, int tofd, SMB_OFF_T offset, size_t n)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, 
files_struct *tofsp, SMB_OFF_T offset, size_t n)
 {
-   return vfswrap_recvfile(NULL, fromfd, fsp, tofd, offset, n);
+   return vfswrap_recvfile(NULL, fromfd, tofsp, offset, n);
 }
 
 static int skel_rename(vfs_handle_struct *handle,  const char *oldname, const 
char *newname)
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index c168b46..55407be 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -149,14 +149,14 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, 
files_struct *fsp, SMB_OF
return SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence);
 }
 
-static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct 
*fsp, int fromfd, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n)
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct 
*fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n)
 {
-   return SMB_VFS_NEXT_SENDFILE(handle, tofd, fsp, fromfd, hdr, offset, n);
+   return SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n);
 }
 
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, 
files_struct *fsp, int tofd, SMB_OFF_T offset, size_t n)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, 
files_struct *tofsp, SMB_OFF_T offset, size_t n)
 {
-   return SMB_VFS_NEXT_RECVFILE(handle, fromfd, fsp, tofd, offset, n);
+   return SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n);
 }
 
 static int skel_rename(vfs_handle_struct *handle,  const char *oldname, const 
char *newname)
diff --git a/source/include/vfs.h b/source/include/vfs.h
index 8aa8057..0be3886 100644
--- a/source/include/vfs.h
+++ b/source/include/vfs.h
@@ -101,6 +101,8 @@
 /* Leave at 22 - not yet released. Remove parameter fd from aio_cancel. - 
obnox */
 /* Leave at 22 - not yet released. Remove parameter fd from read. - obnox */
 /* Leave at 22 - not yet released. Remove parameter fd from write. - obnox */
+/* Leave at 22 - not yet released. Remove parameter fromfd from sendfile. - 
obnox */
+/* Leave at 22 - not yet released. Remove parameter fromfd from recvfile. - 
obnox */
 
 
 
@@ -297,8 +299,8 @@ struct vfs_ops {
ssize_t (*write)(struct vfs_handle_struct *handle, struct

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-339-ga8f90ed

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  a8f90ed34ce9341080b63c801ef54b82de42b8e6 (commit)
   via  e6498a0780dd31dfc623a69432004b606aeaccbe (commit)
  from  588531bf211f5ede2731df56fd540934b673a2d7 (commit)

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


- Log -
commit a8f90ed34ce9341080b63c801ef54b82de42b8e6
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 01:02:58 2008 +0100

ldb/python: Implement __len__ for MessageElement.

commit e6498a0780dd31dfc623a69432004b606aeaccbe
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Jan 11 00:23:33 2008 +0100

python/ldb: Add __getitem__ implementation for LdbMessageElement.

---

Summary of changes:
 source/lib/ldb/ldb.i   |   22 +++
 source/lib/ldb/ldb.py  |8 
 source/lib/ldb/ldb_wrap.c  |   70 
 source/lib/ldb/tests/python/api.py |   10 +
 4 files changed, 110 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index 57cb6b5..57fa365 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -278,11 +278,33 @@ typedef struct ldb_message_element {
 {
 return ldb_msg_element_from_pyobject(NULL, set_obj, flags, name);
 }
+
+int __len__()
+{
+return $self->num_values;
+}
 #endif
+
+PyObject *get(int i)
+{
+if (i < 0 || i >= $self->num_values)
+return Py_None;
+
+return PyString_FromStringAndSize(
+(const char *)$self->values[i].data, 
+$self->values[i].length);
+}
+
 ~ldb_msg_element() { talloc_free($self); }
 int compare(ldb_msg_element *);
 }
 %pythoncode {
+def __getitem__(self, i):
+ret = self.get(i)
+if ret is None:
+raise KeyError("no such value")
+return ret
+
 def __eq__(self, other):
 if (isinstance(other, str) and 
 len(set(self)) == 1 and 
diff --git a/source/lib/ldb/ldb.py b/source/lib/ldb/ldb.py
index ebf8f60..2d037f0 100644
--- a/source/lib/ldb/ldb.py
+++ b/source/lib/ldb/ldb.py
@@ -94,6 +94,12 @@ class ldb_msg_element(object):
 def __init__(self): raise AttributeError, "No constructor defined"
 __repr__ = _swig_repr
 __swig_destroy__ = _ldb.delete_ldb_msg_element
+def __getitem__(self, i):
+ret = self.get(i)
+if ret is None:
+raise KeyError("no such value")
+return ret
+
 def __eq__(self, other):
 if (isinstance(other, str) and 
 len(set(self)) == 1 and 
@@ -104,6 +110,8 @@ class ldb_msg_element(object):
 
 ldb_msg_element.__iter__ = 
new_instancemethod(_ldb.ldb_msg_element___iter__,None,ldb_msg_element)
 ldb_msg_element.__set__ = 
new_instancemethod(_ldb.ldb_msg_element___set__,None,ldb_msg_element)
+ldb_msg_element.__len__ = 
new_instancemethod(_ldb.ldb_msg_element___len__,None,ldb_msg_element)
+ldb_msg_element.get = 
new_instancemethod(_ldb.ldb_msg_element_get,None,ldb_msg_element)
 ldb_msg_element.__cmp__ = 
new_instancemethod(_ldb.ldb_msg_element___cmp__,None,ldb_msg_element)
 ldb_msg_element_swigregister = _ldb.ldb_msg_element_swigregister
 ldb_msg_element_swigregister(ldb_msg_element)
diff --git a/source/lib/ldb/ldb_wrap.c b/source/lib/ldb/ldb_wrap.c
index 7368d7f..10ea4f4 100644
--- a/source/lib/ldb/ldb_wrap.c
+++ b/source/lib/ldb/ldb_wrap.c
@@ -2889,6 +2889,17 @@ SWIG_AsVal_int (PyObject * obj, int *val)
 SWIGINTERN ldb_msg_element *new_ldb_msg_element(PyObject *set_obj,int 
flags,char const *name){
 return ldb_msg_element_from_pyobject(NULL, set_obj, flags, name);
 }
+SWIGINTERN int ldb_msg_element___len__(ldb_msg_element *self){
+return self->num_values;
+}
+SWIGINTERN PyObject *ldb_msg_element_get(ldb_msg_element *self,int i){
+if (i < 0 || i >= self->num_values)
+return Py_None;
+
+return PyString_FromStringAndSize(
+(const char *)self->values[i].data, 
+self->values[i].length);
+}
 SWIGINTERN void delete_ldb_msg_element(ldb_msg_element *self){ 
talloc_free(self); }
 
 PyObject *ldb_msg_list_elements(ldb_msg *msg)
@@ -3671,6 +3682,63 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ldb_msg_element___len__(PyObject 
*SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ldb_msg_element *arg1 = (ldb_msg_element *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ldb_message_element, 0 
|  0 );
+  if (!SWIG_IsOK(res1)) {
+SWIG_exc

Build status as of Fri Jan 11 00:00:01 2008

[build]

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

--- /home/build/master/cache/broken_results.txt.old 2008-01-10 
00:00:25.0 +
+++ /home/build/master/cache/broken_results.txt 2008-01-11 00:00:27.0 
+
@@ -1,23 +1,23 @@
-Build status as of Thu Jan 10 00:00:02 2008
+Build status as of Fri Jan 11 00:00:01 2008
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   28 9  0 
+ccache   32 9  0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  28 13 0 
-libreplace   27 13 0 
-lorikeet-heimdal 23 15 0 
-pidl 16 4  0 
-ppp  8  8  0 
-rsync27 12 0 
+ldb  31 27 0 
+libreplace   31 15 0 
+lorikeet-heimdal 27 14 0 
+pidl 20 6  0 
+ppp  12 9  0 
+rsync32 10 0 
 samba-docs   0  0  0 
-samba-gtk3  3  0 
-samba4   25 17 1 
-samba_3_2_test 27 14 0 
-samba_4_0_test 0  0  0 
-smb-build26 3  0 
-talloc   28 8  0 
-tdb  28 7  0 
+samba-gtk4  4  0 
+samba4   29 21 0 
+samba_3_2_test 31 15 0 
+samba_4_0_test 29 23 3 
+smb-build30 3  0 
+talloc   32 10 0 
+tdb  32 19 0 
 

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1261-g3936de7

[Jeremy Allison]

The branch, v3-2-test has been updated
   via  3936de735a7bb548df8ce7f06f2cc8f7ffdf56cd (commit)
  from  88102b5b7c4eaad5445e9cb96e547dd918abc0c2 (commit)

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


- Log -
commit 3936de735a7bb548df8ce7f06f2cc8f7ffdf56cd
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Thu Jan 10 15:15:01 2008 -0800

Don't print out debug messages at level 0 if we can't
bind to a socket if we've already bound to one (this
prevents :
bind failed on port 445 socket_addr = 0.0.0.0.
Error = Address already in use
bind failed on port 139 socket_addr = 0.0.0.0.
Error = Address already in use
messages when trying to bind to an IPv4 address
when we've already bound to the IPv6 equivalent.
Jeremy.

---

Summary of changes:
 source/smbd/server.c |   14 ++
 1 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 43a6d62..8371d17 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -390,8 +390,11 @@ static bool open_sockets_smbd(bool is_daemon, bool 
interactive, const char *smb_
}
 
s = fd_listenset[num_sockets] =
-   open_socket_in(SOCK_STREAM, port, 0,
-   ifss, True);
+   open_socket_in(SOCK_STREAM,
+   port,
+   num_sockets == 0 ? 0 : 
2,
+   ifss,
+   true);
if(s == -1) {
continue;
}
@@ -467,8 +470,11 @@ static bool open_sockets_smbd(bool is_daemon, bool 
interactive, const char *smb_
continue;
}
 
-   s = open_socket_in(SOCK_STREAM, port, 0,
-  &ss, true);
+   s = open_socket_in(SOCK_STREAM,
+   port,
+   num_sockets == 0 ? 0 : 2,
+   &ss,
+   true);
if (s == -1) {
continue;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-337-g588531b

[Andrew Bartlett]

The branch, v4-0-test has been updated
   via  588531bf211f5ede2731df56fd540934b673a2d7 (commit)
   via  48dc07902ffb792532ff216e507e53103d448b7b (commit)
  from  ff14ffc6582874d8248798bebd57703fbdbda942 (commit)

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


- Log -
commit 588531bf211f5ede2731df56fd540934b673a2d7
Merge: 48dc07902ffb792532ff216e507e53103d448b7b 
ff14ffc6582874d8248798bebd57703fbdbda942
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 09:55:28 2008 +1100

Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

commit 48dc07902ffb792532ff216e507e53103d448b7b
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 09:54:22 2008 +1100

Make Samba4 and Fedora DS happier

Recent changes to Samba4 have made the Fedora DS backend fail.  This
is a start on fixing that.

Andrew Bartlett

---

Summary of changes:
 source/setup/fedorads-partitions.ldif |2 ++
 source/setup/schema-map-fedora-ds-1.0 |2 ++
 source/setup/schema_samba4.ldif   |   20 
 3 files changed, 24 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/setup/fedorads-partitions.ldif 
b/source/setup/fedorads-partitions.ldif
index 12855f9..571fb59 100644
--- a/source/setup/fedorads-partitions.ldif
+++ b/source/setup/fedorads-partitions.ldif
@@ -7,6 +7,7 @@ nsslapd-backend: configData
 cn: ${CONFIGDN}
 
 dn: cn=configData,cn=ldbm database,cn=plugins,cn=config
+objectclass: top
 objectclass: extensibleObject
 objectclass: nsBackendInstance
 nsslapd-suffix: ${CONFIGDN}
@@ -21,6 +22,7 @@ nsslapd-backend: schemaData
 cn: ${SCHEMADN}
 
 dn: cn=schemaData,cn=ldbm database,cn=plugins,cn=config
+objectclass: top
 objectclass: extensibleObject
 objectclass: nsBackendInstance
 nsslapd-suffix: ${SCHEMADN}
diff --git a/source/setup/schema-map-fedora-ds-1.0 
b/source/setup/schema-map-fedora-ds-1.0
index 7419a8d..86f8c0b 100644
--- a/source/setup/schema-map-fedora-ds-1.0
+++ b/source/setup/schema-map-fedora-ds-1.0
@@ -14,6 +14,8 @@ dITContentRules
 top
 #This shouldn't make it to the ldap server
 sambaPassword
+#This should be provided by the LDAP server, only in our schema to permit 
provision
+aci
 #Skip ObjectClasses
 #MiddleName has a conflicting OID
 2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1
diff --git a/source/setup/schema_samba4.ldif b/source/setup/schema_samba4.ldif
index a9f79f1..8bd1705 100644
--- a/source/setup/schema_samba4.ldif
+++ b/source/setup/schema_samba4.ldif
@@ -174,3 +174,23 @@ oMSyntax: 20
 #Allocated: (objectClasses) samba4ObjectClasses: 1.3.6.1.4.1.7165.4.255.5
 #Allocated: (ditContentRules) samba4DitContentRules: 1.3.6.1.4.1.7165.4.255.6
 #Allocated: (attributeTypes) samba4AttributeTypes: 1.3.6.1.4.1.7165.4.255.7
+
+
+#
+# Fedora DS uses this attribute, and we need to set it via our module stack
+#
+dn: CN=aci,${SCHEMADN}
+cn: aci
+name: aci
+objectClass: top
+objectClass: attributeSchema
+lDAPDisplayName: aci
+isSingleValued: TRUE
+systemFlags: 16
+systemOnly: FALSE
+schemaIDGUID: d8e6c1fa-db08-4f26-a53b-23c414aac92d
+adminDisplayName: aci
+attributeID: 1.3.6.1.4.1.7165.4.1.11
+attributeSyntax: 2.5.5.4
+oMSyntax: 20
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-335-gff14ffc

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  ff14ffc6582874d8248798bebd57703fbdbda942 (commit)
   via  c21886614ddacbabef2420e4cf67e0488439c9c8 (commit)
   via  47d797f7885b1e7bcff724496ecb1990e8440eea (commit)
  from  4720f53a92644dd6959e18923924fbe01889111c (commit)

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


- Log -
commit ff14ffc6582874d8248798bebd57703fbdbda942
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 23:40:08 2008 +0100

Ignore compiled Python files.

commit c21886614ddacbabef2420e4cf67e0488439c9c8
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 22:04:50 2008 +0100

Update ignore list.

commit 47d797f7885b1e7bcff724496ecb1990e8440eea
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 21:44:38 2008 +0100

tdb: Add simple reimplementation of tdbdump in Python as an example of the 
tdb Python bindings.

---

Summary of changes:
 .gitignore   |   13 +
 source/lib/tdb/python/tdbdump.py |   12 
 2 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 source/lib/tdb/python/tdbdump.py


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 8af28d0..7d87dbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ autom4te.cache
 *.x
 *.hd
 *.ho
+*.pyc
 Makefile
 configure
 source/bin/*
@@ -179,3 +180,15 @@ source/lib/registry/tools/common.h
 source/librpc/ndr/ndr_table.h
 source/rpc_server/lsa/proto.h
 source/torture/winbind/proto.h
+*~
+source/auth/auth_sam_reply.h
+source/auth/session_proto.h
+source/auth/system_session_proto.h
+source/dsdb/common/proto.h
+source/dsdb/schema/proto.h
+source/lib/crypto/test_proto.h
+source/lib/registry/tests/proto.h
+source/lib/util/apidocs
+source/lib/util/util_ldb.h
+source/libcli/ldap/ldap_ndr.h
+source/libcli/resolve/lp_proto.h
diff --git a/source/lib/tdb/python/tdbdump.py b/source/lib/tdb/python/tdbdump.py
new file mode 100644
index 000..d759d77
--- /dev/null
+++ b/source/lib/tdb/python/tdbdump.py
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+# Trivial reimplementation of tdbdump in Python
+
+import tdb, sys
+
+if len(sys.argv) < 2:
+print "Usage: tdbdump.py "
+sys.exit(1)
+
+db = tdb.Tdb(sys.argv[1])
+for (k, v) in db.iteritems():
+print "{\nkey(%d) = %r\ndata(%d) = %r\n}" % (len(k), k, len(v), v)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1260-g88102b5

[Michael Adam]

The branch, v3-2-test has been updated
   via  88102b5b7c4eaad5445e9cb96e547dd918abc0c2 (commit)
  from  7a88cd61e09f6db9db38916704ae65e03b33139c (commit)

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


- Log -
commit 88102b5b7c4eaad5445e9cb96e547dd918abc0c2
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 23:40:13 2008 +0100

Fix the build of the cacheprime VFS module after API changes.

Sorry, that had escaped my attention.

Michael

---

Summary of changes:
 source/modules/vfs_cacheprime.c |7 +++
 1 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_cacheprime.c b/source/modules/vfs_cacheprime.c
index 4ac7843..5675108 100644
--- a/source/modules/vfs_cacheprime.c
+++ b/source/modules/vfs_cacheprime.c
@@ -142,16 +142,15 @@ static ssize_t cprime_sendfile(
 static ssize_t cprime_read(
 vfs_handle_struct * handle,
 files_struct *  fsp,
-int fd,
 void *  data,
 size_t  count)
 {
 SMB_OFF_T offset;
 
-offset = SMB_VFS_LSEEK(fsp, fd, 0, SEEK_CUR);
+offset = SMB_VFS_LSEEK(fsp, 0, SEEK_CUR);
 if (offset >= 0 && g_readbuf)  {
-prime_cache(handle, fsp, fd, offset, count);
-SMB_VFS_LSEEK(fsp, fd, offset, SEEK_SET);
+prime_cache(handle, fsp, fsp->fh->fd, offset, count);
+SMB_VFS_LSEEK(fsp, offset, SEEK_SET);
 }
 
 return SMB_VFS_NEXT_READ(handle, fsp, data, count);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-332-g4720f53

[Andrew Bartlett]

The branch, v4-0-test has been updated
   via  4720f53a92644dd6959e18923924fbe01889111c (commit)
   via  9cd3a76c25019f4d8d7b41d75e1f7efb4475e86a (commit)
   via  5c39f3135666854b57a7d2643f59feee7ceeabc8 (commit)
  from  ad9089c413bfac6a5e837d7143fe7a2c29fb (commit)

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


- Log -
commit 4720f53a92644dd6959e18923924fbe01889111c
Merge: 9cd3a76c25019f4d8d7b41d75e1f7efb4475e86a 
ad9089c413bfac6a5e837d7143fe7a2c29fb
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 09:25:14 2008 +1100

Merge commit 'origin/v4-0-test' into 4-0-local

commit 9cd3a76c25019f4d8d7b41d75e1f7efb4475e86a
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 09:24:38 2008 +1100

Return 'not implemented' on more RPCs.  (easy way to 'pass' the
torture test, as I see little reason to implement these RPCs).

Add information regarding the importance of the LogonGetDomainInfo calls

Andrew Bartlett

commit 5c39f3135666854b57a7d2643f59feee7ceeabc8
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Fri Jan 11 09:22:26 2008 +1100

Native move servers will refuse these SamSync operations, so don't
count them as errors.

Andrew Bartlett

---

Summary of changes:
 source/rpc_server/netlogon/dcerpc_netlogon.c |9 +++--
 source/torture/rpc/netlogon.c|9 +
 2 files changed, 16 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/netlogon/dcerpc_netlogon.c 
b/source/rpc_server/netlogon/dcerpc_netlogon.c
index 1ef50cd..3d9262b 100644
--- a/source/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source/rpc_server/netlogon/dcerpc_netlogon.c
@@ -669,7 +669,8 @@ static NTSTATUS dcesrv_netr_DatabaseDeltas(struct 
dcesrv_call_state *dce_call, T
 static NTSTATUS dcesrv_netr_DatabaseSync(struct dcesrv_call_state *dce_call, 
TALLOC_CTX *mem_ctx,
   struct netr_DatabaseSync *r)
 {
-   DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+   /* win2k3 native mode returns  "NOT IMPLEMENTED" for this call */
+   return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 
@@ -741,7 +742,8 @@ static WERROR dcesrv_netr_LogonControl2(struct 
dcesrv_call_state *dce_call, TALL
 static NTSTATUS dcesrv_netr_DatabaseSync2(struct dcesrv_call_state *dce_call, 
TALLOC_CTX *mem_ctx,
   struct netr_DatabaseSync2 *r)
 {
-   DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+   /* win2k3 native mode returns  "NOT IMPLEMENTED" for this call */
+   return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 
@@ -867,6 +869,9 @@ static NTSTATUS fill_domain_trust_info(TALLOC_CTX *mem_ctx,
 /* 
   netr_LogonGetDomainInfo
   this is called as part of the ADS domain logon procedure.
+
+  It has an important role in convaying details about the client, such
+  as Operating System, Version, Service Pack etc.
 */
 static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state 
*dce_call, TALLOC_CTX *mem_ctx,
struct netr_LogonGetDomainInfo *r)
diff --git a/source/torture/rpc/netlogon.c b/source/torture/rpc/netlogon.c
index 74bc3a2..a13172b 100644
--- a/source/torture/rpc/netlogon.c
+++ b/source/torture/rpc/netlogon.c
@@ -647,6 +647,10 @@ static bool test_DatabaseSync(struct torture_context *tctx,
if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES))
break;
 
+   /* Native mode servers don't do this */
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+   return true;
+   }
torture_assert_ntstatus_ok(tctx, status, 
"DatabaseSync");
 
if (!creds_client_check(creds, 
&r.out.return_authenticator.cred)) {
@@ -968,6 +972,11 @@ static bool test_DatabaseSync2(struct torture_context 
*tctx,
if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES))
break;
 
+   /* Native mode servers don't do this */
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+   return true;
+   }
+
torture_assert_ntstatus_ok(tctx, status, 
"DatabaseSync2");
 
if (!creds_client_check(creds, 
&r.out.return_authenticator.cred)) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1259-g7a88cd6

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  7a88cd61e09f6db9db38916704ae65e03b33139c (commit)
  from  c82c1d462be6ddccd6e395b4a9630df91dacbda2 (commit)

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


- Log -
commit 7a88cd61e09f6db9db38916704ae65e03b33139c
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Mon Jan 7 18:27:10 2008 +0100

--enable-libwbclient-shared

This patch adds the configure option --enable-libwbclient-shared that 
defaults
to yes. If you set --enable-developer=yes, then you can say
--enable-libwbclient-shared=no to avoid problems you might have with the 
wrong
shared libaries.

Jerry, is this acceptable to you? If yes, please push.

Thanks!

Volker

---

Summary of changes:
 source/Makefile.in  |   47 +++
 source/configure.in |   13 -
 2 files changed, 35 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 94c3e7b..5257b6f 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -337,8 +337,7 @@ LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o  
libaddns/dnssock.o \
   libaddns/dnsgss.o libaddns/dnsmarshall.o
 LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(TALLOC_OBJ)
 
-LIBWBCLIENT_OBJ = nsswitch/wb_common.o lib/talloc/talloc.o \
- nsswitch/libwbclient/wbclient.o \
+LIBWBCLIENT_OBJ = nsswitch/libwbclient/wbclient.o \
  nsswitch/libwbclient/wbc_util.o \
  nsswitch/libwbclient/wbc_pwd.o \
  nsswitch/libwbclient/wbc_idmap.o \
@@ -573,7 +572,7 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) 
$(LIBSMB_OBJ) \
$(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
-   $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
+   $(REGISTRY_OBJ) $(POPT_LIB_OBJ) @LIBWBCLIENT_STATIC@ \
$(BUILDOPT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ)
 
 PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
@@ -606,7 +605,7 @@ SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o 
web/statuspage.o \
web/swat.o web/neg_lang.o
 
 SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
-  $(LOCKING_OBJ) $(PASSDB_OBJ) $(SECRETS_OBJ) $(KRBCLIENT_OBJ) \
+  $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SECRETS_OBJ) 
$(KRBCLIENT_OBJ) \
   $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
   $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) 
$(LIBMSRPC_OBJ) \
$(PASSCHANGE_OBJ) $(LDB_OBJ)
@@ -627,7 +626,7 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
 $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) \
  rpc_client/cli_pipe.o $(RPC_PARSE_OBJ2) \
  $(RPC_CLIENT_OBJ1) \
-$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
+$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) 
$(GROUPDB_OBJ) \
 $(LIBMSRPC_GEN_OBJ)
 
 TESTPARM_OBJ = utils/testparm.o \
@@ -637,12 +636,12 @@ TESTPARM_OBJ = utils/testparm.o \
 PASSWD_UTIL_OBJ = utils/passwd_util.o
 
 SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
-   $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
+   $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) 
@LIBWBCLIENT_STATIC@ \
$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \
$(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ) 
 
-PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
+PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) 
@LIBWBCLIENT_STATIC@ \
$(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) $(ERRORMAP_OBJ) 
@@ -663,7 +662,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o 
rpcclient/cmd_lsarpc.o \
 
 RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
  $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) 
$(LIBMSRPC_OBJ) \
+ $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ 
$(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
  $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
 $(LIBADS_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \
 $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) 
@@ -676,7 +675,7 @@ LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o 
libsmb/libsmb_compat.o \
   $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
   

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1258-gc82c1d4

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  c82c1d462be6ddccd6e395b4a9630df91dacbda2 (commit)
  from  c8ae7d095a2a6a7eac920a68ca7244e3a423e1b1 (commit)

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


- Log -
commit c82c1d462be6ddccd6e395b4a9630df91dacbda2
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 10 13:22:51 2008 +0100

Tiny cosmetic fix

---

Summary of changes:
 source/lib/dbwrap_tdb.c |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap_tdb.c b/source/lib/dbwrap_tdb.c
index 83a0d11..710e45d 100644
--- a/source/lib/dbwrap_tdb.c
+++ b/source/lib/dbwrap_tdb.c
@@ -160,8 +160,7 @@ static int db_tdb_fetch(struct db_context *db, TALLOC_CTX 
*mem_ctx,
 
state.mem_ctx = mem_ctx;
state.result = 0;
-   state.data.dptr = NULL;
-   state.data.dsize = 0;
+   state.data = tdb_null;
 
tdb_parse_record(ctx->wtdb->tdb, key, db_tdb_fetch_parse, &state);
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-329-gad9089c

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  ad9089c413bfac6a5e837d7143fe7a2c29fb (commit)
   via  bd4ce069b4b6d3fdc182b16060c20e6fe8e8a87d (commit)
  from  dec016822ce9439b40f3d9403d42ebc76ba2e0e1 (commit)

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


- Log -
commit ad9089c413bfac6a5e837d7143fe7a2c29fb
Merge: bd4ce069b4b6d3fdc182b16060c20e6fe8e8a87d 
dec016822ce9439b40f3d9403d42ebc76ba2e0e1
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 20:39:02 2008 +0100

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

commit bd4ce069b4b6d3fdc182b16060c20e6fe8e8a87d
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 20:38:14 2008 +0100

pidl: Fix samba3-cli test after Günthers formatting fixes.

---

Summary of changes:
 source/pidl/tests/samba3-cli.pl |   69 +--
 1 files changed, 44 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/pidl/tests/samba3-cli.pl b/source/pidl/tests/samba3-cli.pl
index 5086300..1b2a3c9 100755
--- a/source/pidl/tests/samba3-cli.pl
+++ b/source/pidl/tests/samba3-cli.pl
@@ -29,31 +29,40 @@ my $x = new Parse::Pidl::Samba3::ClientNDR();
 
 $fn = { NAME => "bar", ELEMENTS => [ ] };
 $x->ParseFunction("foo", $fn);
-is($x->{res}, "NTSTATUS rpccli_bar(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx)
+is($x->{res}, 
+"NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
+   TALLOC_CTX *mem_ctx)
 {
 \tstruct bar r;
 \tNTSTATUS status;
-\t
+
 \t/* In parameters */
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
 \t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t
-\tstatus = cli_do_rpc_ndr(cli, mem_ctx, PI_FOO, &ndr_table_foo, NDR_BAR, &r);
-\t
+\t}
+
+   status = cli_do_rpc_ndr(cli,
+   mem_ctx,
+   PI_FOO,
+   &ndr_table_foo,
+   NDR_BAR,
+   &r);
+
 \tif (!NT_STATUS_IS_OK(status)) {
 \t\treturn status;
 \t}
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
 \t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t
+\t}
+
 \tif (NT_STATUS_IS_ERR(status)) {
 \t\treturn status;
 \t}
-\t
+
 \t/* Return variables */
-\t
+
 \t/* Return result */
 \treturn NT_STATUS_OK;
 }
@@ -64,36 +73,46 @@ $x = new Parse::Pidl::Samba3::ClientNDR();
 
 $fn = { NAME => "bar", ELEMENTS => [ ], RETURN_TYPE => "WERROR" };
 $x->ParseFunction("foo", $fn);
-is($x->{res}, "NTSTATUS rpccli_bar(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx, WERROR *werror)
+is($x->{res}, 
+"NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
+   TALLOC_CTX *mem_ctx,
+   WERROR *werror)
 {
 \tstruct bar r;
 \tNTSTATUS status;
-\t
+
 \t/* In parameters */
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
 \t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t
-\tstatus = cli_do_rpc_ndr(cli, mem_ctx, PI_FOO, &ndr_table_foo, NDR_BAR, &r);
-\t
+\t}
+
+   status = cli_do_rpc_ndr(cli,
+   mem_ctx,
+   PI_FOO,
+   &ndr_table_foo,
+   NDR_BAR,
+   &r);
+
 \tif (!NT_STATUS_IS_OK(status)) {
 \t\treturn status;
 \t}
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
 \t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t
+\t}
+
 \tif (NT_STATUS_IS_ERR(status)) {
 \t\treturn status;
 \t}
-\t
+
 \t/* Return variables */
-\t
+
 \t/* Return result */
 \tif (werror) {
 \t\t*werror = r.out.result;
 \t}
-\t
+
 \treturn werror_to_ntstatus(r.out.result);
 }
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-327-gdec0168

[Stefan Metzmacher]

The branch, v4-0-test has been updated
   via  dec016822ce9439b40f3d9403d42ebc76ba2e0e1 (commit)
  from  817582a46aed1a3a470477c95671fa25fd9f2f67 (commit)

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


- Log -
commit dec016822ce9439b40f3d9403d42ebc76ba2e0e1
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date:   Thu Jan 10 20:06:00 2008 +0100

Revert "Set -test in the vendor version"

This needs a bit more work as it's different to samba3...

metze

This reverts commit 817582a46aed1a3a470477c95671fa25fd9f2f67.

---

Summary of changes:
 source/VERSION |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/VERSION b/source/VERSION
index 34ccb95..29ff516 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -113,5 +113,5 @@ SAMBA_VERSION_RELEASE_NICKNAME=
 #  ->  "3.0.0rc2-VendorVersion"#
 #  #
 
-SAMBA_VERSION_VENDOR_SUFFIX="test"
+SAMBA_VERSION_VENDOR_SUFFIX=
 SAMBA_VERSION_VENDOR_PATCH=


-- 
Samba Shared Repository

Re: svn commit: samba-web r1169 - in trunk/devel: .

[Stefan (metze) Metzmacher]

[EMAIL PROTECTED] schrieb:
> Author: idra
> Date: 2008-01-10 18:38:14 + (Thu, 10 Jan 2008)
> New Revision: 1169
> 
> WebSVN: 
> http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1169
> 
> Log:
> We finally moved to git for all branches.

thanks I was just about to fix this...

metze



signature.asc
Description: OpenPGP digital signature

svn commit: samba-web r1169 - in trunk/devel: .

[idra]

Author: idra
Date: 2008-01-10 18:38:14 + (Thu, 10 Jan 2008)
New Revision: 1169

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1169

Log:
We finally moved to git for all branches.


Modified:
   trunk/devel/index.html


Changeset:
Modified: trunk/devel/index.html
===
--- trunk/devel/index.html  2008-01-10 08:15:28 UTC (rev 1168)
+++ trunk/devel/index.html  2008-01-10 18:38:14 UTC (rev 1169)
@@ -13,9 +13,8 @@
 General Overview
 
 On 4 April 2004, the Samba Team converted from CVS to Subversion for
-maintaining the Samba source code, and we are now (fall 2007) switching to
-Git. The 3.0.x and 3.2.x branches have been already migrated fully to Git and
-Git is the authoritative repository for them. Samba4 will follow shortly.
+maintaining the Samba source code, and on 10 January 2008 we completed the
+switch to Git for all development barnches.
 With the transition to Git we also recovered in the main tree the CVS history.
 All older code is in the original Subversion and CVS trees; this would include
 3.0.x and 2.2.x versions of Samba, which are no longer in active development.
@@ -39,7 +38,7 @@
 
 Samba Branches
 
-Areas of Samba development are listed below according to their branches 
within the Git and Subversion source tree.  Plans for each release follow its 
listing, along with a sample check out command.
+Areas of Samba development are listed below according to their branches 
within the Git source tree.  Plans for each release follow its listing, along 
with a sample check out command.
 
 GIT
 
@@ -57,47 +56,32 @@
   
 
   v3-2-test
-  This is the current development branch for 3.2.x development.
+  This is the current branch for 3.2.x development.
 
 
   v3-2-stable
-  This is the current development branch for 3.2.x production 
releases.
+  This is the current branch for 3.2.x production releases.
 
 
   v3-0-test
-  This is the current development branch for 3.0.x development.
+  This is the current branch for 3.0.x development.
  (critical bugfix and security fixes only)
 
 
   v3-0-stable
-  This is the current development branch for 3.0.x production 
releases.
+  This is the current branch for 3.0.x production releases.
 
-  
-
-Subversion
-
-Example checkout command:
-
-svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0 samba4
-
-
-  
-SAMBA_4_0
-This is the research branch for Samba 4. 
-   Technical Previews of this code base 
are available 
-   for download.  Be aware that these snapshots are intended for testing 
purposes 
-   only and not for use in production environments.  For more information, 
see 
-   the road map document.
+
+  v4-0-test
+  This is the current branch for 4.x.x development.
 
-
-Subversion TRUNK
-NOTE: TRUNK is not use for development. See the news item
-   http://news.samba.org/developers/svn_repo_reorganized/";>SVN 
Repo 
-   Reorganzied for more info.
+
+  v4-0-stable
+  This is the current branch for 4.x.x Alpha releases.
+
+
   
 
-Further information on anonymous subversion access is available on the subversion page.  Those interested in the 
old CVS tree can check out the the CVS page.
-
 
 TODO List
 

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-326-g817582a

[Stefan Metzmacher]

The branch, v4-0-test has been updated
   via  817582a46aed1a3a470477c95671fa25fd9f2f67 (commit)
   via  464668b07aded0a299eb49b87b51bb9bf53d2c8d (commit)
  from  bcd82a9ae3cb01b3d8ed0c36999f7a1c0bbab19a (commit)

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


- Log -
commit 817582a46aed1a3a470477c95671fa25fd9f2f67
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date:   Thu Jan 10 19:36:12 2008 +0100

Set -test in the vendor version

metze

commit 464668b07aded0a299eb49b87b51bb9bf53d2c8d
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date:   Thu Oct 11 12:27:38 2007 +0200

prepare the mkversion.sh infrastructure for git branches in the build-farm

metze
(cherry-picked from 1bf4c7fb2012a81e0b4e3d601a4df42d1113f5ef)

---

Summary of changes:
 source/VERSION |4 +-
 source/build/m4/env.m4 |   17 +++-
 source/script/mkversion.sh |   94 
 3 files changed, 33 insertions(+), 82 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/VERSION b/source/VERSION
index 2f5f700..34ccb95 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -89,7 +89,7 @@ SAMBA_VERSION_RC_RELEASE=
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes   #
 #  ->  "3.0.0-SVN-build-199"   #
 
-SAMBA_VERSION_IS_SVN_SNAPSHOT=yes
+SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 
 
 # This is for specifying a release nickname#
@@ -113,5 +113,5 @@ SAMBA_VERSION_RELEASE_NICKNAME=
 #  ->  "3.0.0rc2-VendorVersion"#
 #  #
 
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="test"
 SAMBA_VERSION_VENDOR_PATCH=
diff --git a/source/build/m4/env.m4 b/source/build/m4/env.m4
index 7556f16..9510a8e 100644
--- a/source/build/m4/env.m4
+++ b/source/build/m4/env.m4
@@ -19,9 +19,20 @@ AC_SUBST(datarootdir)
 SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep 
'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
 
-SAMBA_VERSION_SVN_REVISION=`cat ${srcdir}/version.h | grep 
'SAMBA_VERSION_SVN_REVISION' | cut -d ' ' -f3-`
-if test -n "${SAMBA_VERSION_SVN_REVISION}";then
-   echo "BUILD REVISION: ${SAMBA_VERSION_SVN_REVISION}"
+SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat ${srcdir}/version.h | grep 
'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2`
+if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then
+   echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}"
+fi
+SAMBA_VERSION_GIT_COMMIT_DATE=`cat ${srcdir}/version.h | grep 
'SAMBA_VERSION_GIT_COMMIT_DATE' | cut -d ' ' -f3-`
+if test -n "${SAMBA_VERSION_GIT_COMMIT_DATE}";then
+   echo "BUILD COMMIT DATE: ${SAMBA_VERSION_GIT_COMMIT_DATE}"
+fi
+SAMBA_VERSION_GIT_COMMIT_TIME=`cat ${srcdir}/version.h | grep 
'SAMBA_VERSION_GIT_COMMIT_TIME' | cut -d ' ' -f3-`
+if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then
+   echo "BUILD COMMIT TIME: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
+
+   # just to keep the build-farm gui happy for now...
+   echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
 fi
 
 m4_include(build/m4/check_path.m4)
diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 828f67d..b6d82f8 100755
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -24,7 +24,7 @@ SAMBA_VERSION_ALPHA_RELEASE=`sed -n 
's/^SAMBA_VERSION_ALPHA_RELEASE=//p' $SOURCE
 SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' 
$SOURCE_DIR$VERSION_FILE`
 SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' 
$SOURCE_DIR$VERSION_FILE`
 
-SAMBA_VERSION_IS_SVN_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_SVN_SNAPSHOT=//p' 
$SOURCE_DIR$VERSION_FILE`
+SAMBA_VERSION_IS_GIT_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_GIT_SNAPSHOT=//p' 
$SOURCE_DIR$VERSION_FILE`
 
 SAMBA_VERSION_RELEASE_NICKNAME=`sed -n 's/^SAMBA_VERSION_RELEASE_NICKNAME=//p' 
$SOURCE_DIR$VERSION_FILE`
 
@@ -67,95 +67,35 @@ elif test -n "${SAMBA_VERSION_RC_RELEASE}";then
 fi
 
 ##
-## SVN revision number? 
+## GIT commit details
 ##
-if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
+if test x"${SAMBA_VERSION_IS_GIT_SNAPSHOT}" = x"yes";then
 _SAVE_LANG=${LANG}
-LANG=""
+LANG="C"
 HAVEVER="no"
 
-if test x"${HAVEVER}" != x"yes";then
-   HAVESVN=no
-   SVN_INFO=`svn info ${SOURCE_DIR} 2>/dev/null`
-   TMP_REVISION=`echo -e "${SVN_INFO}" | grep 'Last Changed Rev.*:' |sed 
-e 's/Last Changed Rev.*: \([0-9]*\).*/\1/'`
-   if test -n "$TMP_REVISION"; then
-   HAVESVN=yes
-   HAVEVER=yes
-   fi
-fi
-
-if test x"${HAVEVER}" != x"yes";then
-   HA

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-324-gbcd82a9

[Jelmer Vernooij]

The branch, v4-0-test has been updated
   via  bcd82a9ae3cb01b3d8ed0c36999f7a1c0bbab19a (commit)
  from  7a66d0eff6e2300cc82b4c7585f9c45afcc851a4 (commit)

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


- Log -
commit bcd82a9ae3cb01b3d8ed0c36999f7a1c0bbab19a
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 17:53:56 2008 +0100

python: Update STATUS.

---

Summary of changes:
 source/scripting/python/STATUS |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/scripting/python/STATUS b/source/scripting/python/STATUS
index c82275f..f2f1641 100644
--- a/source/scripting/python/STATUS
+++ b/source/scripting/python/STATUS
@@ -1,7 +1,6 @@
-dsdb/samdb/ldb_modules/tests/samba3sam.py
-lib/ldb/tests/python/ldap.py
-provisioning in LDAP mode
-SWAT
+dsdb/samdb/ldb_modules/tests/samba3sam.py: Fix remaining failing tests
+lib/ldb/tests/python/ldap.py: Fix remaining failing tests
+provisioning in LDAP mode(TEST_LDAP=yes PROVISION_PYTHON=yes make test)
 command-line vampire
 provisioning: combine some of the python dictionaries
 hierarchy
@@ -21,3 +20,4 @@ DCE/RPC bindings
 not important before making Python the default:
 - scripting/python/samba/upgrade.py
 - install python modules into system
+- SWAT


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-323-g7a66d0e

[Stefan Metzmacher]

The branch, v4-0-test has been updated
   via  7a66d0eff6e2300cc82b4c7585f9c45afcc851a4 (commit)
   via  8d77ea379fef5ad4b2718bc8e0620304588c9239 (commit)
   via  81fa63dfe6004d916bbe653cbb1b4cbdf5d3d97d (commit)
   via  6ac36d6a4b83b9ef794a2022c4d46ed0b69758e9 (commit)
   via  a0cf47c3359ca5dfab90c1a5831a73b89ff9f027 (commit)
   via  7ee3fd43f964d3161c075dae8de73c77de146538 (commit)
   via  c52d9e6e60e0765e4f793d64e94571b6f6c3f9c7 (commit)
  from  f9988734bb8a1d823e14b6bff5c4d55d75471f18 (commit)

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


- Log -
commit 7a66d0eff6e2300cc82b4c7585f9c45afcc851a4
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 15:36:35 2008 -0600

r26701: ldb: Build and install python modules when possible.

commit 8d77ea379fef5ad4b2718bc8e0620304588c9239
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Jan 10 15:17:26 2008 -0600

r26700: tdb: Build and install Python bindings when possible.

commit 81fa63dfe6004d916bbe653cbb1b4cbdf5d3d97d
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Wed Jan 9 11:28:53 2008 -0600

r26699: Some minor cosmetics for pidl samba3 server code.

Guenther

commit 6ac36d6a4b83b9ef794a2022c4d46ed0b69758e9
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Wed Jan 9 10:56:07 2008 -0600

r26698: Prettify samba3 client code a little more.

Guenther

commit a0cf47c3359ca5dfab90c1a5831a73b89ff9f027
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date:   Wed Jan 9 05:36:02 2008 -0600

r26697: Leak less memory into the ldb context.

(Trying to chase down memory leaks in provision)

Andrew Bartlett

commit 7ee3fd43f964d3161c075dae8de73c77de146538
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Tue Jan 8 22:56:44 2008 -0600

r26696: Some more minor pidl samba3 client cosmetics.

Guenther

commit c52d9e6e60e0765e4f793d64e94571b6f6c3f9c7
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Tue Jan 8 17:02:53 2008 -0600

r26695: Cosmetic fix for pidl generated samba3 client code.

Guenther

---

Summary of changes:
 source/dsdb/schema/schema_init.c   |   18 +-
 source/lib/ldb/Makefile.in |   28 +++--
 source/lib/ldb/configure.ac|   13 
 source/lib/tdb/Makefile.in |   24 ++--
 source/lib/tdb/configure.ac|   10 +++
 source/lib/tdb/tdb.py  |2 +-
 source/lib/tdb/tdb_wrap.c  |   74 +---
 source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |   52 
 source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm |   38 ++--
 9 files changed, 176 insertions(+), 83 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/schema/schema_init.c b/source/dsdb/schema/schema_init.c
index 3dd81fb..6a74639 100644
--- a/source/dsdb/schema/schema_init.c
+++ b/source/dsdb/schema/schema_init.c
@@ -85,24 +85,30 @@ WERROR dsdb_load_oid_mappings_ldb(struct dsdb_schema 
*schema,
struct prefixMapBlob pfm;
char *schema_info;
 
-   ndr_err = ndr_pull_struct_blob(prefixMap, schema, 
lp_iconv_convenience(global_loadparm), &pfm,
+   TALLOC_CTX *mem_ctx = talloc_new(schema);
+   W_ERROR_HAVE_NO_MEMORY(mem_ctx);
+   
+   ndr_err = ndr_pull_struct_blob(prefixMap, mem_ctx, 
lp_iconv_convenience(global_loadparm), &pfm,
   
(ndr_pull_flags_fn_t)ndr_pull_prefixMapBlob);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
NTSTATUS nt_status = ndr_map_error2ntstatus(ndr_err);
+   talloc_free(mem_ctx);
return ntstatus_to_werror(nt_status);
}
 
if (pfm.version != PREFIX_MAP_VERSION_DSDB) {
+   talloc_free(mem_ctx);
return WERR_FOOBAR;
}
 
if (schemaInfo->length != 21 && schemaInfo->data[0] == 0xFF) {
+   talloc_free(mem_ctx);
return WERR_FOOBAR;
}
 
/* append the schema info as last element */
pfm.ctr.dsdb.num_mappings++;
-   pfm.ctr.dsdb.mappings = talloc_realloc(schema, pfm.ctr.dsdb.mappings,
+   pfm.ctr.dsdb.mappings = talloc_realloc(mem_ctx, pfm.ctr.dsdb.mappings,
   struct 
drsuapi_DsReplicaOIDMapping,
   pfm.ctr.dsdb.num_mappings);
W_ERROR_HAVE_NO_MEMORY(pfm.ctr.dsdb.mappings);
@@ -116,7 +122,8 @@ WERROR dsdb_load_oid_mappings_ldb(struct dsdb_schema 
*schema,
 
/* call the drsuapi version */
status = dsdb_load_oid_mappings_drsuapi(schema, &pfm.ctr.dsdb);
-   talloc_free(pfm.ctr.dsdb.mappings);
+   talloc_free(mem_ctx);
+
W_ERROR_NOT_OK_RETURN(status);
 
return WERR_OK;

svn commit: samba r26701 - in branches/SAMBA_4_0: . source/lib/ldb

[jelmer]

Author: jelmer
Date: 2008-01-10 15:36:35 + (Thu, 10 Jan 2008)
New Revision: 26701

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26701

Log:
ldb: Build and install python modules when possible.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/ldb/configure.ac


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in   2008-01-10 15:17:26 UTC 
(rev 26700)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in   2008-01-10 15:36:35 UTC 
(rev 26701)
@@ -112,7 +112,8 @@
 $(SOLIB): $(OBJS)
$(SHLD) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) 
$(TDB_LIBS) $(LIBDL) $(LDAP_LIBS) @[EMAIL PROTECTED](SONAME)
 
-all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
+all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages 
\
+   @PYTHON_BUILD_TARGET@
 
 showflags:
@echo 'ldb will be compiled with flags:'
@@ -212,12 +213,23 @@
 
 installcheck: install test
 
-install:: all
+install:: all installdirs installheaders installlibs installbin installdoc \
+   @PYTHON_INSTALL_TARGET@
+
+installdirs:
mkdir -p $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) 
$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig 
+
+installheaders: installdirs
cp $(headers) $(DESTDIR)$(includedir)
+
+installlibs: installdirs
cp $(STATICLIB) $(SOLIB) $(DESTDIR)$(libdir)
+   cp ldb.pc $(DESTDIR)$(libdir)/pkgconfig
+
+installbin: installdirs
cp $(BINS) $(DESTDIR)$(bindir)
-   cp ldb.pc $(DESTDIR)$(libdir)/pkgconfig
+
+installdocs: installdirs
$(srcdir)/docs/installdocs.sh $(DESTDIR)$(mandir)
 
 gcov:
@@ -234,15 +246,17 @@
 ctags:
ctags `find $(srcdir) -name "*.[ch]"`
 
-%_wrap.c %.py: %.i
-   $(SWIG) -O -Wall -python -keyword $<
+.SUFFIXES: _wrap.c .i
 
+.i_wrap.c:
+   [ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -python -keyword $<
+
 # Python bindings
-build-python: lib/libldb.$(SHLIBEXT) ldb_wrap.c ldb.py
+build-python: lib/libldb.$(SHLIBEXT) ldb_wrap.c
./setup.py build
 
 install-python: build-python
-   ./setup.py install --prefix=$(prefix)
+   ./setup.py install --prefix=$(DESTDIR)$(prefix)
 
 install-swig: 
cp ldb.i `$(SWIG) -swiglib`

Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac
===
--- branches/SAMBA_4_0/source/lib/ldb/configure.ac  2008-01-10 15:17:26 UTC 
(rev 26700)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.ac  2008-01-10 15:36:35 UTC 
(rev 26701)
@@ -75,6 +75,19 @@
 AC_LIBREPLACE_SHLD_FLAGS
 AC_LIBREPLACE_MDLD
 AC_LIBREPLACE_MDLD_FLAGS
+AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
 
+AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config 
python2.4-config python-config])
+
+PYTHON_BUILD_TARGET="build-python"
+PYTHON_INSTALL_TARGET="install-python"
+AC_SUBST(PYTHON_BUILD_TARGET)
+AC_SUBST(PYTHON_INSTALL_TARGET)
+
+if test -z "$PYTHON_CONFIG"; then
+   PYTHON_BUILD_TARGET=""  
+   PYTHON_INSTALL_TARGET=""
+fi
+
 m4_include(libldb.m4)
 AC_OUTPUT(Makefile ldb.pc)

svn commit: samba r26700 - in branches/SAMBA_4_0: . source/lib/tdb

[jelmer]

Author: jelmer
Date: 2008-01-10 15:17:26 + (Thu, 10 Jan 2008)
New Revision: 26700

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26700

Log:
tdb: Build and install Python bindings when possible.

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/tdb/Makefile.in
   branches/SAMBA_4_0/source/lib/tdb/configure.ac
   branches/SAMBA_4_0/source/lib/tdb/tdb.py
   branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in
===
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2008-01-09 11:28:53 UTC 
(rev 26699)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2008-01-10 15:17:26 UTC 
(rev 26700)
@@ -36,7 +36,7 @@
 SONAME = libtdb.$(SHLIBEXT).1
 SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
 
-all: showflags dirs $(PROGS) $(SOLIB) libtdb.a
+all: showflags dirs $(PROGS) $(SOLIB) libtdb.a @PYTHON_BUILD_TARGET@
 
 showflags:
@echo 'tdb will be compiled with flags:'
@@ -55,13 +55,21 @@
 dirs:
@mkdir -p $(DIRS)
 
-install: all
+install: all installdirs installbin installheaders installlibs 
@PYTHON_INSTALL_TARGET@
+
+installdirs:
mkdir -p $(DESTDIR)$(bindir)
mkdir -p $(DESTDIR)$(includedir)
mkdir -p $(DESTDIR)$(libdir) 
mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+
+installbin: installdirs
cp $(PROGS) $(DESTDIR)$(bindir)
+
+installheaders: installdirs
cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir)
+
+installlibs: installdirs
cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir)
 
@@ -112,14 +120,16 @@
 realdistclean: distclean
rm -f configure include/config.h.in
 
-tdb_wrap.c tdb.py: tdb.i
-   $(SWIG) -O -Wall -python -keyword tdb.i
+.SUFFIXES: .i _wrap.c
 
-build-python: libtdb.$(SHLIBEXT) tdb_wrap.c tdb.py
+.i_wrap.c: 
+   $(SWIG) -O -Wall -python -keyword $<
+
+build-python: libtdb.$(SHLIBEXT) tdb_wrap.c
./setup.py build
 
-install-python:
-   ./setup.py install --prefix=$(prefix)
+installpython: build-python
+   ./setup.py install --prefix=$(DESTDIR)$(prefix)
 
 check-python: build-python
# FIXME: Should be more portable:

Modified: branches/SAMBA_4_0/source/lib/tdb/configure.ac
===
--- branches/SAMBA_4_0/source/lib/tdb/configure.ac  2008-01-09 11:28:53 UTC 
(rev 26699)
+++ branches/SAMBA_4_0/source/lib/tdb/configure.ac  2008-01-10 15:17:26 UTC 
(rev 26700)
@@ -12,4 +12,14 @@
 AC_LIBREPLACE_SHLD
 AC_LIBREPLACE_SHLD_FLAGS
 m4_include(libtdb.m4)
+AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config 
python2.4-config python-config])
+
+PYTHON_BUILD_TARGET="build-python"
+PYTHON_INSTALL_TARGET="install-python"
+AC_SUBST(PYTHON_BUILD_TARGET)
+AC_SUBST(PYTHON_INSTALL_TARGET)
+if test -z "$PYTHON_CONFIG"; then
+   PYTHON_BUILD_TARGET=""
+   PYTHON_INSTALL_TARGET=""
+fi
 AC_OUTPUT(Makefile tdb.pc)

Modified: branches/SAMBA_4_0/source/lib/tdb/tdb.py
===
--- branches/SAMBA_4_0/source/lib/tdb/tdb.py2008-01-09 11:28:53 UTC (rev 
26699)
+++ branches/SAMBA_4_0/source/lib/tdb/tdb.py2008-01-10 15:17:26 UTC (rev 
26700)
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.31
+# Version 1.3.33
 #
 # Don't modify this file, modify the SWIG interface instead.
 

Modified: branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c
===
--- branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c2008-01-09 11:28:53 UTC 
(rev 26699)
+++ branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c2008-01-10 15:17:26 UTC 
(rev 26700)
@@ -1,6 +1,6 @@
 /* 
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.33
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not 
make
@@ -17,14 +17,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ 
standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-# define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-# define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 
*/
+/* If we find a maximum version that requires this, the test wo

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1113-gd3b91e4

[Steve French]

The branch, v3-2-test has been updated
   via  d3b91e494c824a65506ba1bc1cba5bba77000530 (commit)
   via  b9d2da4d10e6e7ac2dc604565c7f2ce39d0916b5 (commit)
  from  3e3205309b75edf7d29633525adfdceb5f8856eb (commit)

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


- Log -
commit d3b91e494c824a65506ba1bc1cba5bba77000530
Merge: b9d2da4d10e6e7ac2dc604565c7f2ce39d0916b5 
3e3205309b75edf7d29633525adfdceb5f8856eb
Author: Steve French <[EMAIL PROTECTED]>
Date:   Sat Jan 5 14:51:23 2008 -0600

Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test

commit b9d2da4d10e6e7ac2dc604565c7f2ce39d0916b5
Author: Steve French <[EMAIL PROTECTED]>
Date:   Thu Jan 3 17:13:38 2008 -0600

Update mount.cifs help

Steve

---

Summary of changes:
 source/client/mount.cifs.c |8 +---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index a25ccc5..79f402a 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -39,7 +39,7 @@
 #include 
 
 #define MOUNT_CIFS_VERSION_MAJOR "1"
-#define MOUNT_CIFS_VERSION_MINOR "10"
+#define MOUNT_CIFS_VERSION_MINOR "11"
 
 #ifndef MOUNT_CIFS_VENDOR_SUFFIX
  #ifdef _SAMBA_BUILD_
@@ -136,14 +136,16 @@ static void mount_cifs_usage(void)
printf("\nLess commonly used options:");

printf("\n\tcredentials=,guest,perm,noperm,setuids,nosetuids,rw,ro,");

printf("\n\tsep=,iocharset=,suid,nosuid,exec,noexec,serverino,");
-   
printf("\n\tdirectio,mapchars,nomapchars,nolock,servernetbiosname=");
+   
printf("\n\tmapchars,nomapchars,nolock,servernetbiosname=");
+   printf("\n\tdirectio,nounix,cifsacl,sec=,sign");
printf("\n\nOptions not needed for servers supporting CIFS Unix 
extensions");
printf("\n\t(e.g. unneeded for mounts to most Samba versions):");
printf("\n\tuid=,gid=,dir_mode=,file_mode=,sfu");
printf("\n\nRarely used options:");

printf("\n\tport=,rsize=,wsize=,unc=,ip=,");

printf("\n\tdev,nodev,nouser_xattr,netbiosname=,hard,soft,intr,");
-   printf("\n\tnointr,ignorecase,noposixpaths,noacl");
+   
printf("\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=,nobrl");
+   printf("\n\tin6_addr");
printf("\n\nOptions are described in more detail in the manual page");
printf("\n\tman 8 mount.cifs\n");
printf("\nTo display the version number of the mount helper:");


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1257-gc8ae7d0

[Michael Adam]

The branch, v3-2-test has been updated
   via  c8ae7d095a2a6a7eac920a68ca7244e3a423e1b1 (commit)
   via  a8fc2ddad8d5f7c6c00cb36c74a32a02d69d1d04 (commit)
  from  395f29d8b768a56af20b37f185eccdc5f37b68d5 (commit)

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


- Log -
commit c8ae7d095a2a6a7eac920a68ca7244e3a423e1b1
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 15:49:35 2008 +0100

Remove redundant parameter fd from SMB_VFS_WRITE().

Michael

commit a8fc2ddad8d5f7c6c00cb36c74a32a02d69d1d04
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 15:33:51 2008 +0100

Remove redundant parameter fd from SMB_VFS_READ().

Michael

---

Summary of changes:
 examples/VFS/skel_opaque.c  |8 
 examples/VFS/skel_transparent.c |8 
 source/include/vfs.h|6 --
 source/include/vfs_macros.h |   12 ++--
 source/modules/vfs_cacheprime.c |2 +-
 source/modules/vfs_commit.c |3 +--
 source/modules/vfs_default.c|   22 +++---
 source/modules/vfs_full_audit.c |   12 ++--
 source/smbd/vfs.c   |   10 +-
 source/torture/cmd_vfs.c|4 ++--
 10 files changed, 44 insertions(+), 43 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 8c05479..6b1f29b 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -130,9 +130,9 @@ static int skel_close(vfs_handle_struct *handle, 
files_struct *fsp, int fd)
return vfswrap_close(NULL, fsp, fd);
 }
 
-static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, int fd, 
void *data, size_t n)
+static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n)
 {
-   return vfswrap_read(NULL, fsp, fd, data, n);
+   return vfswrap_read(NULL, fsp, data, n);
 }
 
 static ssize_t skel_pread(vfs_handle_struct *handle, struct files_struct *fsp, 
void *data, size_t n, SMB_OFF_T offset)
@@ -140,9 +140,9 @@ static ssize_t skel_pread(vfs_handle_struct *handle, struct 
files_struct *fsp, v
return vfswrap_pread(NULL, fsp, data, n, offset);
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int 
fd, const void *data, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const 
void *data, size_t n)
 {
-   return vfswrap_write(NULL, fsp, fd, data, n);
+   return vfswrap_write(NULL, fsp, data, n);
 }
 
 ssize_t skel_pwrite(vfs_handle_struct *handle, struct files_struct *fsp, const 
void *data, size_t n, SMB_OFF_T offset)
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index f15cdfd..c168b46 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -124,9 +124,9 @@ static int skel_close(vfs_handle_struct *handle, 
files_struct *fsp, int fd)
return SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
 }
 
-static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, int fd, 
void *data, size_t n)
+static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n)
 {
-   return SMB_VFS_NEXT_READ(handle, fsp, fd, data, n);
+   return SMB_VFS_NEXT_READ(handle, fsp, data, n);
 }
 
 static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n, SMB_OFF_T offset)
@@ -134,9 +134,9 @@ static ssize_t skel_pread(vfs_handle_struct *handle, 
files_struct *fsp, void *da
return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int 
fd, const void *data, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const 
void *data, size_t n)
 {
-   return SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n);
+   return SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
 }
 
 static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const 
void *data, size_t n, SMB_OFF_T offset)
diff --git a/source/include/vfs.h b/source/include/vfs.h
index 02cfb12..8aa8057 100644
--- a/source/include/vfs.h
+++ b/source/include/vfs.h
@@ -99,6 +99,8 @@
 /* Leave at 22 - not yet released. Remove parameter fd from fremovexattr. - 
obnox */
 /* Leave at 22 - not yet released. Remove parameter fd from fsetxattr. - obnox 
*/
 /* Leave at 22 - not yet released. Remove parameter fd from aio_cancel. - 
obnox */
+/* Leave at 22 - not yet released. Remove parameter fd from read. - obnox */
+/* Leave at 22 - not yet released. Remove parameter fd from write. - obnox */
 
 
 
@@ -290,9 +292,9 @@ struct vfs_ops {

int (*open)(struct vfs_handle_struct *handle, const char 
*fname, files_struct *fsp, int flags, mode_t mode);
int (*close_fn)(struct 

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1255-g395f29d

[Michael Adam]

The branch, v3-2-test has been updated
   via  395f29d8b768a56af20b37f185eccdc5f37b68d5 (commit)
   via  4ed238b1e46f7680a29ebdbfe9500d16718f9057 (commit)
   via  cbbfbd7a63fe0fc479a1b63b4552c713633dd6be (commit)
  from  7b0af7cdc97d4bbcbd73a9474871217511b92c3a (commit)

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


- Log -
commit 395f29d8b768a56af20b37f185eccdc5f37b68d5
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 14:27:52 2008 +0100

Move transfer_file and transfer_file_internal to a module of their own.

Also, don't auto-generate prototypes of the (two) exported functions
but make a start in having handwritten prototypes in dedicated header
files (not in includes.h ... :-)

Michael

commit 4ed238b1e46f7680a29ebdbfe9500d16718f9057
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 13:55:46 2008 +0100

Reformat some code I just touched.

Michael

commit cbbfbd7a63fe0fc479a1b63b4552c713633dd6be
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 13:55:16 2008 +0100

Make casts to (void *) explicit to remove compiler warnings.

Michael

---

Summary of changes:
 source/Makefile.in  |3 +-
 source/include/includes.h   |3 +
 source/include/transfer_file.h  |   32 +++
 source/lib/util.c   |   79 
 source/lib/util_transfer_file.c |  110 +++
 source/smbd/vfs.c   |3 +-
 6 files changed, 149 insertions(+), 81 deletions(-)
 create mode 100644 source/include/transfer_file.h
 create mode 100644 source/lib/util_transfer_file.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 71150df..94c3e7b 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -290,7 +290,8 @@ LIBSAMBAUTIL_OBJ = $(TALLOC_OBJ) $(LIBREPLACE_OBJ)
 LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) 
$(NSS_WRAPPER_OBJ) $(TALLOC_OBJ) \
lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \
-   lib/interfaces.o lib/rbtree.o lib/memcache.o
+   lib/interfaces.o lib/rbtree.o lib/memcache.o \
+   lib/util_transfer_file.o
 
 LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
  lib/interface.o lib/md4.o \
diff --git a/source/include/includes.h b/source/include/includes.h
index 14ef225..e9477d8 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -811,6 +811,9 @@ enum flush_reason_enum {
 #include "srvstr.h"
 #include "safe_string.h"
 
+/* prototypes from lib/util_transfer_file.c */
+#include "transfer_file.h"
+
 #ifdef __COMPAR_FN_T
 #define QSORT_CAST (__compar_fn_t)
 #endif
diff --git a/source/include/transfer_file.h b/source/include/transfer_file.h
new file mode 100644
index 000..79ad9c4
--- /dev/null
+++ b/source/include/transfer_file.h
@@ -0,0 +1,32 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Utility functions to transfer files.
+ *
+ * Copyright (C) Michael Adam 2008
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see .
+ */
+
+#ifndef __TRANSFER_FILE_H__
+#define __TRANSFER_FILE_H__
+
+ssize_t transfer_file_internal(void *in_file,
+  void *out_file,
+  size_t n,
+  ssize_t (*read_fn)(void *, void *, size_t),
+  ssize_t (*write_fn)(void *, const void *, 
size_t));
+
+SMB_OFF_T transfer_file(int infd, int outfd, SMB_OFF_T n);
+
+#endif /* __TRANSFER_FILE_H__ */
diff --git a/source/lib/util.c b/source/lib/util.c
index d635078..0653fc9 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -897,85 +897,6 @@ int set_blocking(int fd, bool set)
 #undef FLAG_TO_SET
 }
 
-/
- Transfer some data between two fd's.
-/
-
-#ifndef TRANSFER_BUF_SIZE
-#define TRANSFER_BUF_SIZE 65536
-#endif
-
-
-ssize_t transfer_file_internal(void *in_file,
-  void *out_file,
-

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1252-g7b0af7c

[Michael Adam]

The branch, v3-2-test has been updated
   via  7b0af7cdc97d4bbcbd73a9474871217511b92c3a (commit)
  from  b2e7cdc6e899ca3c16edbb6c8786ff9aa999fa6e (commit)

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


- Log -
commit 7b0af7cdc97d4bbcbd73a9474871217511b92c3a
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 14:18:46 2008 +0100

Fix a really silly typo.

Michael

---

Summary of changes:
 source/lib/util.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util.c b/source/lib/util.c
index 3509294..d635078 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -968,7 +968,7 @@ static ssize_t sys_write_fn(void *file, void *buf, size_t 
len)
 {
int *fd = (int *)file;
 
-   return sys_read(*fd, buf, len);
+   return sys_write(*fd, buf, len);
 }
 
 SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1251-gb2e7cdc

[Michael Adam]

The branch, v3-2-test has been updated
   via  b2e7cdc6e899ca3c16edbb6c8786ff9aa999fa6e (commit)
  from  ac2bb838d537ca563ad2fe770b3e1c2fe8b1d9e7 (commit)

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


- Log -
commit b2e7cdc6e899ca3c16edbb6c8786ff9aa999fa6e
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 13:30:43 2008 +0100

Correctly abstract the transfer_file mechanism with callbacks and void ptrs.

This removes the in_fsp and out_fsp global variables hack from smbd/vfs.c.

Michael

---

Summary of changes:
 source/lib/util.c |   28 +++-
 source/smbd/vfs.c |   20 +---
 2 files changed, 32 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util.c b/source/lib/util.c
index 25b2700..3509294 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -905,8 +905,12 @@ int set_blocking(int fd, bool set)
 #define TRANSFER_BUF_SIZE 65536
 #endif
 
-ssize_t transfer_file_internal(int infd, int outfd, size_t n, ssize_t 
(*read_fn)(int, void *, size_t),
-   ssize_t (*write_fn)(int, const 
void *, size_t))
+
+ssize_t transfer_file_internal(void *in_file,
+  void *out_file,
+  size_t n,
+  ssize_t (*read_fn)(void *, void *, size_t),
+  ssize_t (*write_fn)(void *, void *, size_t))
 {
char *buf;
size_t total = 0;
@@ -921,7 +925,7 @@ ssize_t transfer_file_internal(int infd, int outfd, size_t 
n, ssize_t (*read_fn)
while (total < n) {
num_to_read_thistime = MIN((n - total), TRANSFER_BUF_SIZE);
 
-   read_ret = (*read_fn)(infd, buf, num_to_read_thistime);
+   read_ret = (*read_fn)(in_file, buf, num_to_read_thistime);
if (read_ret == -1) {
DEBUG(0,("transfer_file_internal: read failure. Error = 
%s\n", strerror(errno) ));
SAFE_FREE(buf);
@@ -933,7 +937,7 @@ ssize_t transfer_file_internal(int infd, int outfd, size_t 
n, ssize_t (*read_fn)
num_written = 0;
  
while (num_written < read_ret) {
-   write_ret = (*write_fn)(outfd,buf + num_written, 
read_ret - num_written);
+   write_ret = (*write_fn)(out_file, buf + num_written, 
read_ret - num_written);
  
if (write_ret == -1) {
DEBUG(0,("transfer_file_internal: write 
failure. Error = %s\n", strerror(errno) ));
@@ -953,9 +957,23 @@ ssize_t transfer_file_internal(int infd, int outfd, size_t 
n, ssize_t (*read_fn)
return (ssize_t)total;  
 }
 
+static ssize_t sys_read_fn(void *file, void *buf, size_t len)
+{
+   int *fd = (int *)file;
+
+   return sys_read(*fd, buf, len);
+}
+
+static ssize_t sys_write_fn(void *file, void *buf, size_t len)
+{
+   int *fd = (int *)file;
+
+   return sys_read(*fd, buf, len);
+}
+
 SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n)
 {
-   return (SMB_OFF_T)transfer_file_internal(infd, outfd, (size_t)n, 
sys_read, sys_write);
+   return (SMB_OFF_T)transfer_file_internal(&infd, &outfd, (size_t)n, 
sys_read_fn, sys_write_fn);
 }
 
 /***
diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c
index bb4e77e..b6b6b1c 100644
--- a/source/smbd/vfs.c
+++ b/source/smbd/vfs.c
@@ -662,25 +662,23 @@ int vfs_fill_sparse(files_struct *fsp, SMB_OFF_T len)
  Transfer some data (n bytes) between two file_struct's.
 /
 
-static files_struct *in_fsp;
-static files_struct *out_fsp;
-
-static ssize_t read_fn(int fd, void *buf, size_t len)
+static ssize_t vfs_read_fn(void *file, void *buf, size_t len)
 {
-   return SMB_VFS_READ(in_fsp, fd, buf, len);
+   struct files_struct *fsp = (struct files_struct *)file;
+
+   return SMB_VFS_READ(fsp, fsp->fh->fd, buf, len);
 }
 
-static ssize_t write_fn(int fd, const void *buf, size_t len)
+static ssize_t vfs_write_fn(void *file, const void *buf, size_t len)
 {
-   return SMB_VFS_WRITE(out_fsp, fd, buf, len);
+   struct files_struct *fsp = (struct files_struct *)file;
+
+   return SMB_VFS_WRITE(fsp, fsp->fh->fd, buf, len);
 }
 
 SMB_OFF_T vfs_transfer_file(files_struct *in, files_struct *out, SMB_OFF_T n)
 {
-   in_fsp = in;
-   out_fsp = out;
-
-   return transfer_file_internal(in_fsp->fh->fd, out_fsp->fh->fd, n, 
read_fn, write_fn);
+   return transfer_file_internal(in, out, n, vfs_read_fn, vfs_write_fn);
 }
 
 /***


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1250-gac2bb83

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  ac2bb838d537ca563ad2fe770b3e1c2fe8b1d9e7 (commit)
   via  444e35e7df1f13fc285183da8fb41b30ad99a3fa (commit)
   via  65dd869bea351010c67f02046ae4134bdada1a4c (commit)
  from  88d6683872f4bb9c3074280f385f73c7af9de784 (commit)

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


- Log -
commit ac2bb838d537ca563ad2fe770b3e1c2fe8b1d9e7
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sun Jan 6 14:17:15 2008 +0100

use talloc_tos() in share_access_check()

commit 444e35e7df1f13fc285183da8fb41b30ad99a3fa
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sun Jan 6 16:15:45 2008 +0100

Some more talloc_tos()

commit 65dd869bea351010c67f02046ae4134bdada1a4c
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sun Jan 6 14:21:25 2008 +0100

use talloc_tos in a few more places

---

Summary of changes:
 source/lib/sharesec.c |   11 +++
 source/locking/locking.c  |   18 +-
 source/rpc_server/srv_srvsvc_nt.c |2 +-
 source/smbd/blocking.c|   10 +-
 source/smbd/close.c   |4 ++--
 source/smbd/connection.c  |2 +-
 source/smbd/open.c|8 
 source/smbd/oplock.c  |6 +++---
 source/smbd/reply.c   |8 +---
 source/smbd/trans2.c  |2 +-
 10 files changed, 34 insertions(+), 37 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/sharesec.c b/source/lib/sharesec.c
index ba025da..f6ff701 100644
--- a/source/lib/sharesec.c
+++ b/source/lib/sharesec.c
@@ -228,25 +228,20 @@ bool share_access_check(const NT_USER_TOKEN *token, const 
char *sharename,
 {
uint32 granted;
NTSTATUS status;
-   TALLOC_CTX *mem_ctx = NULL;
SEC_DESC *psd = NULL;
size_t sd_size;
bool ret = True;
 
-   if (!(mem_ctx = talloc_init("share_access_check"))) {
-   return False;
-   }
-
-   psd = get_share_security(mem_ctx, sharename, &sd_size);
+   psd = get_share_security(talloc_tos(), sharename, &sd_size);
 
if (!psd) {
-   TALLOC_FREE(mem_ctx);
return True;
}
 
ret = se_access_check(psd, token, desired_access, &granted, &status);
 
-   talloc_destroy(mem_ctx);
+   TALLOC_FREE(psd);
+
return ret;
 }
 
diff --git a/source/locking/locking.c b/source/locking/locking.c
index 2ec8cd2..113b994 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -102,7 +102,7 @@ bool is_locked(files_struct *fsp,
DEBUG(10,("is_locked: optimisation - level II oplock on 
file %s\n", fsp->fsp_name ));
ret = False;
} else {
-   struct byte_range_lock *br_lck = 
brl_get_locks_readonly(NULL, fsp);
+   struct byte_range_lock *br_lck = 
brl_get_locks_readonly(talloc_tos(), fsp);
if (!br_lck) {
return False;
}
@@ -116,7 +116,7 @@ bool is_locked(files_struct *fsp,
TALLOC_FREE(br_lck);
}
} else {
-   struct byte_range_lock *br_lck = brl_get_locks_readonly(NULL, 
fsp);
+   struct byte_range_lock *br_lck = 
brl_get_locks_readonly(talloc_tos(), fsp);
if (!br_lck) {
return False;
}
@@ -160,7 +160,7 @@ NTSTATUS query_lock(files_struct *fsp,
return NT_STATUS_OK;
}
 
-   br_lck = brl_get_locks_readonly(NULL, fsp);
+   br_lck = brl_get_locks_readonly(talloc_tos(), fsp);
if (!br_lck) {
return NT_STATUS_NO_MEMORY;
}
@@ -210,7 +210,7 @@ struct byte_range_lock *do_lock(struct messaging_context 
*msg_ctx,
lock_flav_name(lock_flav), lock_type_name(lock_type),
(double)offset, (double)count, fsp->fnum, fsp->fsp_name ));
 
-   br_lck = brl_get_locks(NULL, fsp);
+   br_lck = brl_get_locks(talloc_tos(), fsp);
if (!br_lck) {
*perr = NT_STATUS_NO_MEMORY;
return NULL;
@@ -269,7 +269,7 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
DEBUG(10,("do_unlock: unlock start=%.0f len=%.0f requested for fnum %d 
file %s\n",
  (double)offset, (double)count, fsp->fnum, fsp->fsp_name ));
 
-   br_lck = brl_get_locks(NULL, fsp);
+   br_lck = brl_get_locks(talloc_tos(), fsp);
if (!br_lck) {
return NT_STATUS_NO_MEMORY;
}
@@ -323,7 +323,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
DEBUG(10,("do_lock_cancel: cancel start=%.0f len=%.0f requested for 
fnum %d file %s\n",
  (double)offset, (double)count, fsp->fnum, fsp->fsp_name ));
 

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1247-g88d6683

[Günther Deschner]

The branch, v3-2-test has been updated
   via  88d6683872f4bb9c3074280f385f73c7af9de784 (commit)
  from  ee905a085fff5410d02c3e5fa2664e989de4afd4 (commit)

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


- Log -
commit 88d6683872f4bb9c3074280f385f73c7af9de784
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Thu Jan 10 11:13:23 2008 +0100

Remove unused string.

Guenther

---

Summary of changes:
 examples/libsmbclient/Makefile |4 ++--
 source/utils/net_ads.c |3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/libsmbclient/Makefile b/examples/libsmbclient/Makefile
index be383ae..6500707 100644
--- a/examples/libsmbclient/Makefile
+++ b/examples/libsmbclient/Makefile
@@ -5,7 +5,7 @@ SAMBA_INCL = ../../source/include
 EXTLIB_INCL = -I/usr/include/gtk-1.2 \
  -I/usr/include/glib-1.2 \
  -I/usr/lib/glib/include
-
+EXTLIB_INCL = `gtk-config --cflags`
 
 DEFS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 CFLAGS = -O0 -g -I$(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
@@ -13,7 +13,7 @@ CFLAGS = -O0 -g -I$(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
 LDFLAGS = -L/usr/local/samba/lib \
  -lldap -lkrb5 -lgssapi_krb5
 #LIBSMBCLIENT = /usr/local/samba/lib/libsmbclient.so
-LIBSMBCLIENT = ../../source/bin/libsmbclient.a -ldl -lresolv
+LIBSMBCLIENT = -lsmbclient -ldl -lresolv
 
 TESTS= testsmbc \
testacl \
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 310af82..80f6ba9 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -1446,7 +1446,6 @@ int net_ads_join(int argc, const char **argv)
ADS_STRUCT *ads = NULL;
ADS_STATUS status;
NTSTATUS nt_status;
-   char *machine_account = NULL;
char *short_domain_name = NULL;
char *tmp_password, *password;
TALLOC_CTX *ctx = NULL;
@@ -1684,7 +1683,6 @@ int net_ads_join(int argc, const char **argv)
 
d_printf("Joined '%s' to realm '%s'\n", global_myname(), 
ads->server.realm);
 
-   SAFE_FREE(machine_account);
TALLOC_FREE( ctx );
ads_destroy(&ads);
 
@@ -1694,7 +1692,6 @@ fail:
/* issue an overall failure message at the end. */
d_printf("Failed to join domain: %s\n", 
get_friendly_nt_error_msg(nt_status));
 
-   SAFE_FREE(machine_account);
TALLOC_FREE( ctx );
 ads_destroy(&ads);
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1246-gee905a0

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  ee905a085fff5410d02c3e5fa2664e989de4afd4 (commit)
   via  0272b46515b4c4515d5cad8e86fab61d8e91e29e (commit)
   via  d89e42f1d2faa018c584025296d6be8195cbcf20 (commit)
  from  af07adaf4293899fcbded666289ffa7479ca0501 (commit)

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


- Log -
commit ee905a085fff5410d02c3e5fa2664e989de4afd4
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 10 11:35:40 2008 +0100

Fix a c++ warning

commit 0272b46515b4c4515d5cad8e86fab61d8e91e29e
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 10 11:35:17 2008 +0100

talloc_free_children can only reset pool if it's empty

commit d89e42f1d2faa018c584025296d6be8195cbcf20
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 10 11:34:07 2008 +0100

Mark talloc_pool memory for valgrind

---

Summary of changes:
 source/lib/talloc/talloc.c |   25 -
 1 files changed, 20 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/talloc/talloc.c b/source/lib/talloc/talloc.c
index 178bbb9..9dcd8a2 100644
--- a/source/lib/talloc/talloc.c
+++ b/source/lib/talloc/talloc.c
@@ -245,6 +245,7 @@ static struct talloc_chunk *talloc_alloc_pool(struct 
talloc_chunk *parent,
struct talloc_chunk *pool_ctx = NULL;
size_t space_left;
struct talloc_chunk *result;
+   size_t chunk_size;
 
if (parent == NULL) {
return NULL;
@@ -267,15 +268,19 @@ static struct talloc_chunk *talloc_alloc_pool(struct 
talloc_chunk *parent,
/*
 * Align size to 16 bytes
 */
-   size = ((size + 15) & ~15);
+   chunk_size = ((size + 15) & ~15);
 
-   if (space_left < size) {
+   if (space_left < chunk_size) {
return NULL;
}
 
result = (struct talloc_chunk *)pool_ctx->pool;
 
-   pool_ctx->pool = (void *)((char *)result + size);
+#if defined(DEVELOPER) && defined(VALGRIND_MAKE_MEM_UNDEFINED)
+   VALGRIND_MAKE_MEM_UNDEFINED(result, size);
+#endif
+
+   pool_ctx->pool = (void *)((char *)result + chunk_size);
 
result->flags = TALLOC_MAGIC | TALLOC_FLAG_POOLMEM;
result->pool = pool_ctx;
@@ -358,6 +363,10 @@ void *talloc_pool(const void *context, size_t size)
 
*talloc_pool_objectcount(tc) = 1;
 
+#if defined(DEVELOPER) && defined(VALGRIND_MAKE_MEM_NOACCESS)
+   VALGRIND_MAKE_MEM_NOACCESS(tc->pool, size);
+#endif
+
return result;
 }
 
@@ -857,8 +866,13 @@ void talloc_free_children(void *ptr)
}
}
 
-   if (tc->flags & TALLOC_FLAG_POOL) {
+   if ((tc->flags & TALLOC_FLAG_POOL)
+   && (*talloc_pool_objectcount(tc) == 1)) {
tc->pool = ((char *)tc + TC_HDR_SIZE + TALLOC_POOL_HDR_SIZE);
+#if defined(DEVELOPER) && defined(VALGRIND_MAKE_MEM_NOACCESS)
+   VALGRIND_MAKE_MEM_NOACCESS(
+   tc->pool, tc->size - TALLOC_POOL_HDR_SIZE);
+#endif
}
 }
 
@@ -954,7 +968,8 @@ void *_talloc_realloc(const void *context, void *ptr, 
size_t size, const char *n
if (tc->flags & TALLOC_FLAG_POOLMEM) {
 
new_ptr = talloc_alloc_pool(tc, size + TC_HDR_SIZE);
-   *talloc_pool_objectcount(tc->pool) -= 1;
+   *talloc_pool_objectcount((struct talloc_chunk *)
+(tc->pool)) -= 1;
 
if (new_ptr == NULL) {
new_ptr = malloc(TC_HDR_SIZE+size);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1243-gaf07ada

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  af07adaf4293899fcbded666289ffa7479ca0501 (commit)
  from  be6fe381168321ae62e079cd977cbef675c532d4 (commit)

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


- Log -
commit af07adaf4293899fcbded666289ffa7479ca0501
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 10 10:55:20 2008 +0100

Fix suspicious Makefile line

If @WINBIND_KRB5_LOCATOR@ is not defined, this leads to a line with just one
tab in.

---

Summary of changes:
 source/Makefile.in |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index a3a7e56..71150df 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1046,8 +1046,8 @@ replacetort : SHOWFLAGS bin/[EMAIL PROTECTED]@
 timelimit : SHOWFLAGS bin/[EMAIL PROTECTED]@
 
 nsswitch : SHOWFLAGS bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ 
@WINBIND_NSS@ \
-   @WINBIND_WINS_NSS@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
-   @WINBIND_KRB5_LOCATOR@
+   @WINBIND_WINS_NSS@ @WINBIND_KRB5_LOCATOR@ \
+   bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@
 
 wins : SHOWFLAGS @WINBIND_WINS_NSS@
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1242-gbe6fe38

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  be6fe381168321ae62e079cd977cbef675c532d4 (commit)
  from  329b924cba8225002ca40db26c45b31d141a0925 (commit)

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


- Log -
commit be6fe381168321ae62e079cd977cbef675c532d4
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 10 09:53:51 2008 +0100

Form a proper hierarchy in talloc_stack

This way talloc_stackframe() can benefit from a pool put on the stack 
further
up. No need to remove talloc_stackframe().

---

Summary of changes:
 source/lib/talloc_stack.c |   13 ++---
 1 files changed, 10 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/talloc_stack.c b/source/lib/talloc_stack.c
index 08ef228..2722fb9 100644
--- a/source/lib/talloc_stack.c
+++ b/source/lib/talloc_stack.c
@@ -66,7 +66,7 @@ static int talloc_pop(TALLOC_CTX *frame)
 
 static TALLOC_CTX *talloc_stackframe_internal(size_t poolsize)
 {
-   TALLOC_CTX **tmp, *top;
+   TALLOC_CTX **tmp, *top, *parent;
 
if (talloc_stack_arraysize < talloc_stacksize + 1) {
tmp = TALLOC_REALLOC_ARRAY(NULL, talloc_stack, TALLOC_CTX *,
@@ -78,10 +78,17 @@ static TALLOC_CTX *talloc_stackframe_internal(size_t 
poolsize)
talloc_stack_arraysize = talloc_stacksize + 1;
 }
 
+   if (talloc_stacksize == 0) {
+   parent = talloc_stack;
+   }
+   else {
+   parent = talloc_stack[talloc_stacksize-1];
+   }
+
if (poolsize) {
-   top = talloc_pool(talloc_stack, poolsize);
+   top = talloc_pool(parent, poolsize);
} else {
-   top = talloc_new(talloc_stack);
+   top = talloc_new(parent);
}
 
if (top == NULL) {


-- 
Samba Shared Repository

svn commit: samba-docs r1224 - in trunk: manpages-3 xslt

[kseeger]

Author: kseeger
Date: 2008-01-10 08:39:53 + (Thu, 10 Jan 2008)
New Revision: 1224

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1224

Log:
-Use '&stdarg.[server|client].debug' instead of '&stdarg.debug';
-Remove the debug section in smbclient manpage (replaced by 
'&stdarg.client.debug'
-Add '&stdarg.[server|client].debug' where debug section was included with 
'&popt.common.samba' before the changes in samba.entities

Karolin
Modified:
   trunk/manpages-3/net.8.xml
   trunk/manpages-3/nmbd.8.xml
   trunk/manpages-3/nmblookup.1.xml
   trunk/manpages-3/ntlm_auth.1.xml
   trunk/manpages-3/pdbedit.8.xml
   trunk/manpages-3/rpcclient.1.xml
   trunk/manpages-3/smbcacls.1.xml
   trunk/manpages-3/smbclient.1.xml
   trunk/manpages-3/smbcquotas.1.xml
   trunk/manpages-3/smbd.8.xml
   trunk/manpages-3/smbsh.1.xml
   trunk/manpages-3/smbstatus.1.xml
   trunk/manpages-3/smbtree.1.xml
   trunk/manpages-3/swat.8.xml
   trunk/manpages-3/vfstest.1.xml
   trunk/manpages-3/winbindd.8.xml
   trunk/xslt/man.xsl


Changeset:
Modified: trunk/manpages-3/net.8.xml
===
--- trunk/manpages-3/net.8.xml  2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/net.8.xml  2008-01-10 08:39:53 UTC (rev 1224)
@@ -122,7 +122,7 @@


 
-   &stdarg.debug;
+   &stdarg.server.debug;

 
 

Modified: trunk/manpages-3/nmbd.8.xml
===
--- trunk/manpages-3/nmbd.8.xml 2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/nmbd.8.xml 2008-01-10 08:39:53 UTC (rev 1224)
@@ -145,6 +145,7 @@
5 man page for details on the 
contents of this file.

 
+   &stdarg.server.debug;
&popt.common.samba;



Modified: trunk/manpages-3/nmblookup.1.xml
===
--- trunk/manpages-3/nmblookup.1.xml2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/nmblookup.1.xml2008-01-10 08:39:53 UTC (rev 1224)
@@ -130,7 +130,7 @@
query a WINS server.


-   
+   &stdarg.server.debug;   
&popt.common.samba;
 


Modified: trunk/manpages-3/ntlm_auth.1.xml
===
--- trunk/manpages-3/ntlm_auth.1.xml2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/ntlm_auth.1.xml2008-01-10 08:39:53 UTC (rev 1224)
@@ -340,6 +340,7 @@


 
+ &stdarg.server.debug;
  &popt.common.samba;
  &stdarg.help;


Modified: trunk/manpages-3/pdbedit.8.xml
===
--- trunk/manpages-3/pdbedit.8.xml  2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/pdbedit.8.xml  2008-01-10 08:39:53 UTC (rev 1224)
@@ -410,6 +410,7 @@

 
&stdarg.help;
+   &stdarg.server.debug;
&popt.common.samba;
 


Modified: trunk/manpages-3/rpcclient.1.xml
===
--- trunk/manpages-3/rpcclient.1.xml2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/rpcclient.1.xml2008-01-10 08:39:53 UTC (rev 1224)
@@ -84,6 +84,7 @@
above. 

 
+   &stdarg.server.debug;
&popt.common.samba;
&popt.common.credentials;   
&popt.common.connection;

Modified: trunk/manpages-3/smbcacls.1.xml
===
--- trunk/manpages-3/smbcacls.1.xml 2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/smbcacls.1.xml 2008-01-10 08:39:53 UTC (rev 1224)
@@ -143,6 +143,7 @@


&stdarg.help;
+   &stdarg.server.debug;
&popt.common.samba;

 

Modified: trunk/manpages-3/smbclient.1.xml
===
--- trunk/manpages-3/smbclient.1.xml2008-01-09 12:51:35 UTC (rev 1223)
+++ trunk/manpages-3/smbclient.1.xml2008-01-10 08:39:53 UTC (rev 1224)
@@ -323,58 +323,8 @@



-   
-   -V
-   Prints the program version number.
-   
-   
-
-   
-   -s 
-   The file specified contains the
-   configuration details required by the server.  The
-   information in this file includes server-specific
-   information such as what printcap file to use, as well
-   as descriptions of all the services that the server is
-   to provide. See &smb.conf; for more 

svn commit: samba-web r1168 - in trunk/DTD: .

[kseeger]

Author: kseeger
Date: 2008-01-10 08:15:28 + (Thu, 10 Jan 2008)
New Revision: 1168

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1168

Log:
Remove the two new entities popt.common.samba.server and 
popt.common.samba.client. I did not work to split the debug section into two 
pieces because of the varlistentry end tags. Second try...

Karolin
Modified:
   trunk/DTD/samba.entities


Changeset:
Modified: trunk/DTD/samba.entities
===
--- trunk/DTD/samba.entities2008-01-10 07:46:10 UTC (rev 1167)
+++ trunk/DTD/samba.entities2008-01-10 08:15:28 UTC (rev 1168)
@@ -164,17 +164,35 @@
 
 level is an integer 
 from 0 to 10. The default value if this parameter is 
-not specified is 0.'>
+not specified is 0.
 
+The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day-to-day running - it generates a small amount of 
+information about operations carried out.
+
+Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.
+
+Note that specifying this parameter here will 
+override the log level parameter
+in the &smb.conf; file.
+
+'>
+
 
 -d|--debuglevel=level
 
 level is an integer 
 from 0 to 10. The default value if this parameter is 
-not specified is 1.'>
+not specified is 1.
 
-The higher this value, the more detail will be 
 logged to the log files about the activities of the 
 server. At level 0, only critical errors and serious 
@@ -229,16 +247,6 @@
 &stdarg.log-basename;
 '>
 
-
-
-
-
 
 -R