Build status as of Sun Apr 11 06:00:02 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-04-10 00:00:17.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-04-11 00:00:20.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Sat Apr 10 06:00:02 2010 +Build status as of Sun Apr 11 06:00:02 2010 Build counts: Tree Total Broken Panic @@ -13,7 +13,7 @@ samba-docs 0 0 0 samba-web0 0 0 samba_3_current 27 25 1 -samba_3_master 27 27 2 +samba_3_master 27 27 1 samba_3_next 27 24 1 samba_4_0_test 29 29 1 samba_4_0_waf 27 27 2
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b91484a... s3: Cosmetics -- I could not spot where chal was
initialized
from 2c193fe... s4:auth Remove event context from anonymous_session()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b91484a1a075c2913ebb50ee034f36580387bfa8
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 11:14:24 2010 +0200
s3: Cosmetics -- I could not spot where chal was initialized
---
Summary of changes:
source3/winbindd/winbindd_pam.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index e151b1a..d5650d9 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1218,8 +1218,8 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(struct
winbindd_domain *domain,
/* do password magic */
-
generate_random_buffer(chal, 8);
+
if (lp_client_ntlmv2_auth()) {
DATA_BLOB server_chal;
DATA_BLOB names_blob;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 52ab3ca... s4:torture - dbspeed test
via 753698e... s4:torture - dbspeed test
via cc32e7a... s4:torture - dbspeed test
from b91484a... s3: Cosmetics -- I could not spot where chal was
initialized
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 52ab3ca5e697bc638a20a338b857521ee69949a7
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sun Apr 11 11:22:41 2010 +0200
s4:torture - dbspeed test
Calculate the leaks on base of the tmp_ctx not the torture context.
commit 753698e070ce5b9efbe5889a6a7434115520223d
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sun Apr 11 11:21:19 2010 +0200
s4:torture - dbspeed test
Unify error handling.
commit cc32e7aff2e071e0b1985097bb8526ce36160391
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sun Apr 11 11:13:31 2010 +0200
s4:torture - dbspeed test
Add more talloc_frees where needed or useful.
---
Summary of changes:
source4/torture/local/dbspeed.c | 38 +++---
1 files changed, 23 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 236a52b..38dd01c 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -142,10 +142,12 @@ static bool ldb_add_record(struct ldb_context *ldb,
unsigned rid)
msg-dn = ldb_dn_new_fmt(msg, ldb,
SID=S-1-5-21-53173311-3623041448-2049097239-%u, rid);
if (msg-dn == NULL) {
+ talloc_free(msg);
return false;
}
if (ldb_msg_add_fmt(msg, UID, %u, rid) != 0) {
+ talloc_free(msg);
return false;
}
@@ -179,15 +181,21 @@ static bool test_ldb_speed(struct torture_context
*torture, const void *_data)
ldb = ldb_wrap_connect(tmp_ctx, torture-ev, torture-lp_ctx,
tdb://test.ldb,
NULL, NULL, LDB_FLG_NOSYNC);
if (!ldb) {
- unlink(./test.ldb);
- talloc_free(tmp_ctx);
- torture_fail(torture, Failed to open test.ldb);
+ torture_result(torture, TORTURE_FAIL, Failed to open
test.ldb);
+ goto failed;
}
/* add an index */
ldif = ldb_ldif_read_string(ldb, init_ldif);
- if (ldif == NULL) goto failed;
- if (ldb_add(ldb, ldif-msg) != LDB_SUCCESS) goto failed;
+ if (ldif == NULL) {
+ torture_result(torture, TORTURE_FAIL, Didn't get LDIF
data!\n);
+ goto failed;
+ }
+ if (ldb_add(ldb, ldif-msg) != LDB_SUCCESS) {
+ torture_result(torture, TORTURE_FAIL, Couldn't apply LDIF
data!\n);
+ talloc_free(ldif);
+ goto failed;
+ }
talloc_free(ldif);
torture_comment(torture, Adding %d SID records\n, torture_entries);
@@ -199,7 +207,7 @@ static bool test_ldb_speed(struct torture_context *torture,
const void *_data)
}
}
- if (talloc_total_blocks(torture) 100) {
+ if (talloc_total_blocks(tmp_ctx) 100) {
torture_result(torture, TORTURE_FAIL, memory leak in ldb
add\n);
goto failed;
}
@@ -215,20 +223,21 @@ static bool test_ldb_speed(struct torture_context
*torture, const void *_data)
i = random() % torture_entries;
dn = ldb_dn_new_fmt(tmp_ctx, ldb,
SID=S-1-5-21-53173311-3623041448-2049097239-%u, i);
if (ldb_search(ldb, tmp_ctx, res, dn, LDB_SCOPE_BASE, NULL,
NULL) != LDB_SUCCESS || res-count != 1) {
- torture_fail(torture, talloc_asprintf(torture, Failed
to find SID %d, i));
+ torture_result(torture, TORTURE_FAIL, Failed to find
SID %d, i);
+ goto failed;
}
talloc_free(res);
talloc_free(dn);
if (ldb_search(ldb, tmp_ctx, res, NULL, LDB_SCOPE_SUBTREE,
NULL, (UID=%u), i) != LDB_SUCCESS || res-count != 1) {
- torture_fail(torture, talloc_asprintf(torture, Failed
to find UID %d, i));
+ torture_result(torture, TORTURE_FAIL, Failed to find
UID %d, i);
+ goto failed;
}
talloc_free(res);
}
- if (talloc_total_blocks(torture) 100) {
- unlink(./test.ldb);
- talloc_free(tmp_ctx);
- torture_fail(torture, memory leak in ldb search);
+ if (talloc_total_blocks(tmp_ctx) 100) {
+ torture_result(torture, TORTURE_FAIL, memory leak in ldb
search\n);
+ goto failed;
}
ldb_speed =
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c7dfe73... s4:torture - dbspeed test - add newlines as we have
them in the other failure messages
from 52ab3ca... s4:torture - dbspeed test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c7dfe736a88549f5793521609aca68ca85545c1b
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sun Apr 11 11:33:45 2010 +0200
s4:torture - dbspeed test - add newlines as we have them in the other
failure messages
---
Summary of changes:
source4/torture/local/dbspeed.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 38dd01c..77e0174 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -223,13 +223,13 @@ static bool test_ldb_speed(struct torture_context
*torture, const void *_data)
i = random() % torture_entries;
dn = ldb_dn_new_fmt(tmp_ctx, ldb,
SID=S-1-5-21-53173311-3623041448-2049097239-%u, i);
if (ldb_search(ldb, tmp_ctx, res, dn, LDB_SCOPE_BASE, NULL,
NULL) != LDB_SUCCESS || res-count != 1) {
- torture_result(torture, TORTURE_FAIL, Failed to find
SID %d, i);
+ torture_result(torture, TORTURE_FAIL, Failed to find
SID %d!\n, i);
goto failed;
}
talloc_free(res);
talloc_free(dn);
if (ldb_search(ldb, tmp_ctx, res, NULL, LDB_SCOPE_SUBTREE,
NULL, (UID=%u), i) != LDB_SUCCESS || res-count != 1) {
- torture_result(torture, TORTURE_FAIL, Failed to find
UID %d, i);
+ torture_result(torture, TORTURE_FAIL, Failed to find
UID %d!\n, i);
goto failed;
}
talloc_free(res);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 568ca24... s4:samdb_server_site_dn - free unused DNs in the right way from c7dfe73... s4:torture - dbspeed test - add newlines as we have them in the other failure messages http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 568ca2433d0d2292047979abbfcb03543bb27a67 Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Sun Apr 11 12:56:50 2010 +0200 s4:samdb_server_site_dn - free unused DNs in the right way --- Summary of changes: source4/dsdb/common/util.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index b469b06..c6870da 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -1469,16 +1469,16 @@ struct ldb_dn *samdb_server_site_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx struct ldb_dn *server_site_dn; /* TODO: there must be a saner way to do this!! */ - server_dn = samdb_server_dn(ldb, mem_ctx); if (!server_dn) return NULL; servers_dn = ldb_dn_get_parent(mem_ctx, server_dn); + talloc_free(server_dn); if (!servers_dn) return NULL; server_site_dn = ldb_dn_get_parent(mem_ctx, servers_dn); + talloc_free(servers_dn); - talloc_free(server_dn); return server_site_dn; } -- Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated
Hi Matthias, On Sun, 2010-04-11 at 04:34 -0500, Matthias Dieter Wallnöfer wrote: The branch, master has been updated via c7dfe73... s4:torture - dbspeed test - add newlines as we have them in the other failure messages from 52ab3ca... s4:torture - dbspeed test http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c7dfe736a88549f5793521609aca68ca85545c1b Author: Matthias Dieter Wallnfer mwallnoe...@yahoo.de Date: Sun Apr 11 11:33:45 2010 +0200 s4:torture - dbspeed test - add newlines as we have them in the other failure messages torture_result() calls should generally *not* have any newlines, torture_result() adds one itself. Cheers, Jelmer signature.asc Description: This is a digitally signed message part
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b0d65f8... s3: Use talloc_stackframe() in user_in_group
via 9655f63... s3: Use talloc_stackframe() in user_in_group_sid
via 9cf448a... s3: Use talloc_stackframe() in create_token_from_username
via 3c169c0... s3: Fix a memleak in user_in_group_sid
via a2d1e5e... s3: Remove the make_auth_methods routine
via bc61958... s3: Fix a typo
via c5c40f2... s3: Make auth_context its own talloc parent
via e35a2f8... s3: Fix some nonempty lines
from 568ca24... s4:samdb_server_site_dn - free unused DNs in the right
way
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b0d65f827e2314e907b5fd4768c55ae4c816e8da
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 12:53:00 2010 +0200
s3: Use talloc_stackframe() in user_in_group
commit 9655f63642e9ad3b8b25fcd2beb8bc49fdb9d4e5
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 12:47:28 2010 +0200
s3: Use talloc_stackframe() in user_in_group_sid
commit 9cf448a30efc73392f267547ef48b7ab19790900
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 12:47:13 2010 +0200
s3: Use talloc_stackframe() in create_token_from_username
commit 3c169c0475bc4f69c81b93a66884cc3cd9ba19dc
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 12:44:01 2010 +0200
s3: Fix a memleak in user_in_group_sid
commit a2d1e5e0f77220f912cacb821a928c5e5a952e47
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 12:37:48 2010 +0200
s3: Remove the make_auth_methods routine
This was just TALLOC_ZERO_P
commit bc619586f210dad5ed01859e21b5f657a34052bf
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 12:24:07 2010 +0200
s3: Fix a typo
commit c5c40f26482696aca9ee67d170e827f450d59a8b
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 12:20:24 2010 +0200
s3: Make auth_context its own talloc parent
Remove mem_ctx from struct auth_context
commit e35a2f89b27b49f57d73c2461e0cecd2bbd46fa8
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 11:50:55 2010 +0200
s3: Fix some nonempty lines
---
Summary of changes:
source3/auth/auth.c | 18 -
source3/auth/auth_builtin.c | 49 +-
source3/auth/auth_domain.c| 42 +++-
source3/auth/auth_netlogond.c | 10 +--
source3/auth/auth_ntlmssp.c |2 +-
source3/auth/auth_sam.c | 20 +++
source3/auth/auth_script.c| 20 +--
source3/auth/auth_server.c| 27
source3/auth/auth_unix.c | 23 ++
source3/auth/auth_util.c | 52 +++-
source3/auth/auth_wbc.c | 11 +---
source3/auth/auth_winbind.c | 20 +--
source3/include/auth.h|1 -
13 files changed, 149 insertions(+), 146 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index ce8722a..317fe30 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -106,7 +106,7 @@ static void get_ntlm_challenge(struct auth_context
*auth_context,
}
challenge = auth_method-get_chal(auth_context,
auth_method-private_data,
- auth_context-mem_ctx);
+ auth_context);
if (!challenge.length) {
DEBUG(3, (auth_get_challenge: getting challenge from
authentication method %s FAILED.\n,
auth_method-name));
@@ -122,7 +122,7 @@ static void get_ntlm_challenge(struct auth_context
*auth_context,
uchar tmp[8];
generate_random_buffer(tmp, sizeof(tmp));
- auth_context-challenge =
data_blob_talloc(auth_context-mem_ctx,
+ auth_context-challenge = data_blob_talloc(auth_context,
tmp, sizeof(tmp));
challenge_set_by = random;
@@ -331,7 +331,7 @@ static void free_auth_context(struct auth_context
**auth_context)
TALLOC_FREE(auth_method-private_data);
}
- talloc_destroy((*auth_context)-mem_ctx);
+ talloc_destroy(*auth_context);
*auth_context = NULL;
}
}
@@ -342,19 +342,13 @@ static void free_auth_context(struct auth_context
**auth_context)
static NTSTATUS make_auth_context(struct auth_context **auth_context)
{
- TALLOC_CTX *mem_ctx;
-
- mem_ctx = talloc_init(authentication context);
-
- *auth_context = TALLOC_P(mem_ctx, struct auth_context);
+ *auth_context = TALLOC_ZERO_P(talloc_autofree_context(),
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 59d6889... s3: Use sizeof(chal) instead of a constant
from b0d65f8... s3: Use talloc_stackframe() in user_in_group
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 59d68899c40ef368ab57fa734f95bcfb475bb46e
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 15:26:23 2010 +0200
s3: Use sizeof(chal) instead of a constant
---
Summary of changes:
source3/winbindd/winbindd_pam.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index d5650d9..1faa5c9 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1218,7 +1218,7 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(struct
winbindd_domain *domain,
/* do password magic */
- generate_random_buffer(chal, 8);
+ generate_random_buffer(chal, sizeof(chal));
if (lp_client_ntlmv2_auth()) {
DATA_BLOB server_chal;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0ee1985... [Bug 7345] Incomplete description of function return values in libsmbclient.h from 59d6889... s3: Use sizeof(chal) instead of a constant http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0ee1985b05bd1a650f712a6d458b20c31eae8734 Author: Derrell Lipman derr...@dworkin.(none) Date: Sun Apr 11 11:37:00 2010 -0400 [Bug 7345] Incomplete description of function return values in libsmbclient.h - Fixed documentation on smbc_fstat(), smbc_statvfs(), and smbc_fstatvfs(): All were missing return value upon success - Fixed documentation on smbc_read: Documented return value upon EOF Derrell --- Summary of changes: source3/include/libsmbclient.h | 22 ++ 1 files changed, 14 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h index dd6f93e..978f657 100644 --- a/source3/include/libsmbclient.h +++ b/source3/include/libsmbclient.h @@ -1267,13 +1267,15 @@ int smbc_creat(const char *furl, mode_t mode); * * @param bufsize Size of buf in bytes * - * @return Number of bytes read, 0 on error with errno set: + * @return Number of bytes read; + * 0 upon EOF; + * 0 on error, with errno set: * - EISDIR fd refers to a directory * - EBADF fd is not a valid file descriptor or - * is not open for reading. + *is not open for reading. * - EINVAL fd is attached to an object which is - * unsuitable for reading, or no buffer passed or - * smbc_init not called. + *unsuitable for reading, or no buffer passed or + * smbc_init not called. * * @see smbc_open(), smbc_write() * @@ -1618,7 +1620,8 @@ int smbc_stat(const char *url, struct stat *st); * @param stpointer to a buffer that will be filled with * standard Unix struct stat information. * - * @return EBADF filedes is bad. + * @return 0 on success, 0 on error with errno set: + * - EBADF filedes is bad. * - EACCES Permission denied. * - EBADF fd is not a valid file descriptor * - EINVAL Problems occurred in the underlying routines @@ -1639,7 +1642,8 @@ int smbc_fstat(int fd, struct stat *st); * @param stpointer to a buffer that will be filled with * standard Unix struct statvfs information. * - * @return EBADF filedes is bad. + * @return 0 on success, 0 on error with errno set: + * - EBADF filedes is bad. * - EACCES Permission denied. * - EBADF fd is not a valid file descriptor * - EINVAL Problems occurred in the underlying routines @@ -1662,7 +1666,8 @@ smbc_statvfs(char *url, * @param stpointer to a buffer that will be filled with * standard Unix struct statvfs information. * - * @return EBADF filedes is bad. + * @return 0 on success, 0 on error with errno set: + * - EBADF filedes is bad. * - EACCES Permission denied. * - EBADF fd is not a valid file descriptor * - EINVAL Problems occurred in the underlying routines @@ -1684,7 +1689,8 @@ smbc_fstatvfs(int fd, * * @param size size to truncate the file to * - * @return EBADF filedes is bad. + * @return 0 on success, 0 on error with errno set: + * - EBADF filedes is bad. * - EACCES Permission denied. * - EBADF fd is not a valid file descriptor * - EINVAL Problems occurred in the underlying routines -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b65c8d0... s4: Fix more test results to not conflict with subunit commands. via 5d0694f... subunit: Cope with lowercase test results in tap2subunit. via 3a34b5f... subunit: Remove more test output that could be interpreted by subunit. via 7da94cc... subunit: Support formatting compatible with upstream subunit, for consistency. via d0ab744... selftest: Accept 'testing:' to introduce new tests. from 0ee1985... [Bug 7345] Incomplete description of function return values in libsmbclient.h http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b65c8d05059466f8e8b2196c99469105afd128e8 Author: Jelmer Vernooij jel...@samba.org Date: Sun Apr 11 20:56:48 2010 +0200 s4: Fix more test results to not conflict with subunit commands. commit 5d0694f9941e22f92c9c641b8fb3a7ce376ee5cd Author: Jelmer Vernooij jel...@samba.org Date: Sun Apr 11 20:56:02 2010 +0200 subunit: Cope with lowercase test results in tap2subunit. Also submitted upstream. commit 3a34b5f35ec0a666ff8f731577bd2fdfa67e9dcb Author: Jelmer Vernooij jel...@samba.org Date: Sun Apr 11 16:55:48 2010 +0200 subunit: Remove more test output that could be interpreted by subunit. commit 7da94cc4a664521be279b019e9f32121cd410193 Author: Jelmer Vernooij jel...@samba.org Date: Sun Apr 11 01:39:06 2010 +0200 subunit: Support formatting compatible with upstream subunit, for consistency. Upstream subunit makes a : after commands optional, so I've fixed any places where we might trigger commands accidently. I've filed a bug about this in subunit. commit d0ab7440acf57f698290c2ba64650c6144bc8545 Author: Jelmer Vernooij jel...@samba.org Date: Sun Apr 11 00:08:16 2010 +0200 selftest: Accept 'testing:' to introduce new tests. --- Summary of changes: lib/subunit/python/subunit/__init__.py |6 +- .../python/subunit/tests/test_tap2subunit.py | 15 +++- lib/tdb/tools/tdbtorture.c |2 +- selftest/subunithelper.py | 32 --- source4/dsdb/kcc/kcc_topology.c|2 +- .../samdb/ldb_modules/tests/possibleinferiors.py |2 +- source4/lib/ldb/tests/test-generic.sh |2 +- source4/lib/ldb/tools/ldbtest.c|2 +- source4/torture/basic/base.c | 74 source4/torture/basic/denytest.c |4 +- source4/torture/basic/misc.c |2 +- source4/torture/basic/unlink.c |2 +- source4/torture/libnet/libnet_share.c |2 +- source4/torture/libnetapi/libnetapi_group.c| 18 ++-- source4/torture/libnetapi/libnetapi_user.c | 18 ++-- source4/torture/locktest.c |2 +- source4/torture/locktest2.c|2 +- source4/torture/raw/acls.c | 14 ++-- source4/torture/raw/chkpath.c | 10 +- source4/torture/raw/close.c|8 +- source4/torture/raw/composite.c| 13 ++-- source4/torture/raw/lock.c | 26 +++--- source4/torture/raw/lookuprate.c |2 +- source4/torture/raw/mkdir.c| 14 ++-- source4/torture/raw/mux.c |4 +- source4/torture/raw/notify.c | 92 ++-- source4/torture/raw/search.c |2 +- source4/torture/raw/setfileinfo.c | 26 +++--- source4/torture/rpc/alter_context.c|6 +- source4/torture/rpc/drsuapi.c | 16 ++-- source4/torture/rpc/drsuapi_cracknames.c | 12 ++-- source4/torture/rpc/dsgetinfo.c|2 +- source4/torture/rpc/dssync.c |2 +- source4/torture/rpc/lsa.c |2 +- source4/torture/rpc/netlogon.c |2 +- source4/torture/rpc/samba3rpc.c|4 +- source4/torture/rpc/samlogon.c |2 +- source4/torture/rpc/samr.c | 34 source4/torture/rpc/samr_accessmask.c | 30 +++--- source4/torture/rpc/spoolss.c |2 +- source4/torture/rpc/srvsvc.c | 36 source4/torture/rpc/wkssvc.c | 58 ++-- source4/torture/smb2/acls.c| 10 +- source4/torture/smb2/create.c | 18 ++-- source4/torture/smb2/dir.c |2 +- source4/torture/smb2/notify.c | 78
Re: [SCM] Samba Shared Repository - branch master updated
Okay, okay - will remove them again. But I have to state that each torture output call seems to have a different policy regarding newlines at the end or not: e.g. torture_comment(tctx, Test sec_desc level\n) - here it's needed. Is there an easy rule when yes, when no? It would be nice to see only one method to don't have to worry about this. Greets, Matthias Jelmer Vernooij wrote: Hi Matthias, On Sun, 2010-04-11 at 04:34 -0500, Matthias Dieter Wallnöfer wrote: The branch, master has been updated via c7dfe73... s4:torture - dbspeed test - add newlines as we have them in the other failure messages from 52ab3ca... s4:torture - dbspeed test http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c7dfe736a88549f5793521609aca68ca85545c1b Author: Matthias Dieter Wallnfermwallnoe...@yahoo.de Date: Sun Apr 11 11:33:45 2010 +0200 s4:torture - dbspeed test - add newlines as we have them in the other failure messages torture_result() calls should generally *not* have any newlines, torture_result() adds one itself. Cheers, Jelmer
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1d3b00b... s4:dbspeed torture - improve also the TDB code part
via 1fd6d9c... s4:dbspeed torture - remove unneeded newlines on
torture_result
from b65c8d0... s4: Fix more test results to not conflict with subunit
commands.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1d3b00bfd7ddfa983a68ecf4b0033729a42e9baa
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sun Apr 11 21:44:20 2010 +0200
s4:dbspeed torture - improve also the TDB code part
Always use the label failed on failures, always close the database context
(child of tmp_ctx) when deleting database file.
commit 1fd6d9cd661692e6b0ac950127a0d5b80945bfad
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sun Apr 11 21:37:23 2010 +0200
s4:dbspeed torture - remove unneeded newlines on torture_result
According to Jelmer's post on the technical list.
---
Summary of changes:
source4/torture/local/dbspeed.c | 33 -
1 files changed, 16 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 77e0174..1541d0e 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -36,6 +36,7 @@ static bool tdb_add_record(struct tdb_wrap *tdbw, const char
*fmt1,
{
TDB_DATA key, data;
int ret;
+
key.dptr = (uint8_t *)talloc_asprintf(tdbw, fmt1, i);
key.dsize = strlen((char *)key.dptr)+1;
data.dptr = (uint8_t *)talloc_asprintf(tdbw, fmt2, i+1);
@@ -66,9 +67,8 @@ static bool test_tdb_speed(struct torture_context *torture,
const void *_data)
tdbw = tdb_wrap_open(tmp_ctx, test.tdb,
1, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
if (!tdbw) {
- unlink(test.tdb);
- talloc_free(tmp_ctx);
- torture_fail(torture, Failed to open test.tdb);
+ torture_result(torture, TORTURE_FAIL, Failed to open
test.tdb);
+ goto failed;
}
torture_comment(torture, Adding %d SID records\n, torture_entries);
@@ -77,13 +77,13 @@ static bool test_tdb_speed(struct torture_context *torture,
const void *_data)
if (!tdb_add_record(tdbw,
S-1-5-21-53173311-3623041448-2049097239-%u,
UID %u, i)) {
- torture_result(torture, TORTURE_FAIL, Failed to add
SID %d\n, i);
+ torture_result(torture, TORTURE_FAIL, Failed to add
SID %d!, i);
goto failed;
}
if (!tdb_add_record(tdbw,
UID %u,
S-1-5-21-53173311-3623041448-2049097239-%u, i)) {
- torture_result(torture, TORTURE_FAIL, Failed to add
UID %d\n, i);
+ torture_result(torture, TORTURE_FAIL, Failed to add
UID %d!, i);
goto failed;
}
}
@@ -100,7 +100,7 @@ static bool test_tdb_speed(struct torture_context *torture,
const void *_data)
data = tdb_fetch(tdbw-tdb, key);
talloc_free(key.dptr);
if (data.dptr == NULL) {
- torture_result(torture, TORTURE_FAIL, Failed to fetch
SID %d\n, i);
+ torture_result(torture, TORTURE_FAIL, Failed to find
SID %d!, i);
goto failed;
}
free(data.dptr);
@@ -109,7 +109,7 @@ static bool test_tdb_speed(struct torture_context *torture,
const void *_data)
data = tdb_fetch(tdbw-tdb, key);
talloc_free(key.dptr);
if (data.dptr == NULL) {
- torture_result(torture, TORTURE_FAIL, Failed to fetch
UID %d\n, i);
+ torture_result(torture, TORTURE_FAIL, Failed to find
UID %d!, i);
goto failed;
}
free(data.dptr);
@@ -118,14 +118,13 @@ static bool test_tdb_speed(struct torture_context
*torture, const void *_data)
tdb_speed = count/timeval_elapsed(tv);
torture_comment(torture, tdb speed %.2f ops/sec\n, tdb_speed);
-
- unlink(test.tdb);
talloc_free(tmp_ctx);
+ unlink(test.tdb);
return true;
failed:
- unlink(test.tdb);
talloc_free(tmp_ctx);
+ unlink(test.tdb);
return false;
}
@@ -188,11 +187,11 @@ static bool test_ldb_speed(struct torture_context
*torture, const void *_data)
/* add an index */
ldif = ldb_ldif_read_string(ldb, init_ldif);
if (ldif == NULL) {
- torture_result(torture,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e1630ec... idl: Use C-style comments, because cpp on some platforms
doesn't accept // comments.
from 1d3b00b... s4:dbspeed torture - improve also the TDB code part
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e1630ecb11ac09025456debeb3dc6afaccdb955b
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Apr 11 22:16:48 2010 +0200
idl: Use C-style comments, because cpp on some platforms doesn't accept
// comments.
---
Summary of changes:
librpc/idl/wmi.idl | 42 +-
1 files changed, 21 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/wmi.idl b/librpc/idl/wmi.idl
index 1f7b5ca..3ae5a45 100644
--- a/librpc/idl/wmi.idl
+++ b/librpc/idl/wmi.idl
@@ -279,17 +279,17 @@ coclass WbemClassObject
{
WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE = 0x1,
WBEM_FLAVOR_FLAG_PROPAGATE_TO_DERIVED_CLASS = 0x2,
-//WBEM_FLAVOR_MASK_PROPAGATION = 0x0F,
+/*WBEM_FLAVOR_MASK_PROPAGATION = 0x0F, */
WBEM_FLAVOR_NOT_OVERRIDABLE = 0x10,
-//WBEM_FLAVOR_MASK_PERMISSIONS = 0x10,
+/*WBEM_FLAVOR_MASK_PERMISSIONS = 0x10, */
WBEM_FLAVOR_ORIGIN_PROPAGATED = 0x20,
WBEM_FLAVOR_ORIGIN_SYSTEM = 0x40,
-//WBEM_FLAVOR_MASK_ORIGIN = 0x60,
+/*WBEM_FLAVOR_MASK_ORIGIN = 0x60, */
WBEM_FLAVOR_AMENDED = 0x80
-//WBEM_FLAVOR_MASK_AMENDED = 0x80
+/*WBEM_FLAVOR_MASK_AMENDED = 0x80 */
} WBEM_FLAVOR_TYPE;
@@ -299,7 +299,7 @@ coclass WbemClassObject
WCF_INSTANCE = 2,
WCF_CLASS = 4,
WCF_CLASS_PART_INTERNAL = 8
- // WCF_CLASS_PART_SHARED = 0x104
+ /* WCF_CLASS_PART_SHARED = 0x104 */
} WCO_FLAGS;
typedef [public,nopull,nopush] struct
@@ -420,7 +420,7 @@ coclass WbemClassObject
WERROR CreateInstanceEnum(
-[in] BSTR strFilter, // allow more things than a class name
+[in] BSTR strFilter, /* allow more things than a class name */
[in] long lFlags,
[in,unique] IWbemContext* pCtx,
[out] IEnumWbemClassObject** ppEnum
@@ -525,36 +525,36 @@ coclass WbemClassObject
WERROR Clone([out] IWbemContext** ppNewCopy);
WERROR GetNames(
-//[in] long lFlags,
-//[out] SAFEARRAY (BSTR)* pNames
+/*[in] long lFlags, */
+/*[out] SAFEARRAY (BSTR)* pNames */
);
WERROR BeginEnumeration([in] long lFlags);
WERROR Next(
-//[in] long lFlags,
-//[out] BSTR* pstrName,
-//[out] VARIANT* pValue
+/*[in] long lFlags, */
+/*[out] BSTR* pstrName, */
+/*[out] VARIANT* pValue */
);
WERROR EndEnumeration();
WERROR SetValue(
-//[in, string] LPCWSTR wszName,
-//[in] long lFlags
-//[in] VARIANT* pValue
+/*[in, string] LPCWSTR wszName, */
+/*[in] long lFlags */
+/*[in] VARIANT* pValue */
);
WERROR GetValue(
-//[in, string] LPCWSTR wszName,
-//[in] long lFlags,
-//[out] VARIANT* pValue
+/*[in, string] LPCWSTR wszName, */
+/*[in] long lFlags, */
+/*[out] VARIANT* pValue */
);
WERROR DeleteValue(
-//[in, string] LPCWSTR wszName,
-//[in] long lFlags
+/*[in, string] LPCWSTR wszName, */
+/*[in] long lFlags */
);
WERROR DeleteAll();
@@ -613,7 +613,7 @@ coclass WbemClassObject
} WTYPES;
typedef [relative_base] struct {
- // [relative] WBEMDATA4 *data; /* 0x9 */
+ /* [relative] WBEMDATA4 *data; */ /* 0x9 */
uint32 data_size;
uint8 wtype;
} WBEMDATA4;
@@ -669,7 +669,7 @@ coclass WbemClassObject
[
object,
- // restricted,
+ /* restricted, */
uuid(44aca675-e8fc-11d0-a07c-00c04fb68820)
] interface IWbemCallResult : IUnknown
{
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated
On Sun, 2010-04-11 at 21:34 +0200, Matthias Dieter Wallnöfer wrote: Okay, okay - will remove them again. But I have to state that each torture output call seems to have a different policy regarding newlines at the end or not: e.g. torture_comment(tctx, Test sec_desc level\n) - here it's needed. Is there an easy rule when yes, when no? It would be nice to see only one method to don't have to worry about this. torture_fail, torture_result, etc. all receive a string with a description why the particular result occurred. Generally this description is only one sentence or less. torture_comment() can be used for whatever comments you like and generally just outputs directly to stdout. It can be used for incremental output (including backspace characters) or multiple lines. Cheers, Jelmer Jelmer Vernooij wrote: Hi Matthias, On Sun, 2010-04-11 at 04:34 -0500, Matthias Dieter Wallnöfer wrote: The branch, master has been updated via c7dfe73... s4:torture - dbspeed test - add newlines as we have them in the other failure messages from 52ab3ca... s4:torture - dbspeed test http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c7dfe736a88549f5793521609aca68ca85545c1b Author: Matthias Dieter Wallnfermwallnoe...@yahoo.de Date: Sun Apr 11 11:33:45 2010 +0200 s4:torture - dbspeed test - add newlines as we have them in the other failure messages torture_result() calls should generally *not* have any newlines, torture_result() adds one itself. Cheers, Jelmer signature.asc Description: This is a digitally signed message part
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via da7294a... nsswitch/wbinfo: Fix the S4 header check from e1630ec... idl: Use C-style comments, because cpp on some platforms doesn't accept // comments. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit da7294ae0d1c9cdeb1c945f3eb51d2376e7dabf6 Author: Kai Blin k...@samba.org Date: Sun Apr 11 22:38:38 2010 +0200 nsswitch/wbinfo: Fix the S4 header check --- Summary of changes: nsswitch/wbinfo.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index 347a96e..cbd4f1d 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -26,7 +26,7 @@ #include libwbclient/wbclient.h #include lib/popt/popt.h #include ../libcli/auth/libcli_auth.h -#if !(_SAMBA_VERSION_) 4 +#if (_SAMBA_BUILD_) = 4 #include lib/cmdline/popt_common.h #endif -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4d84dab... libcli/auth: Fix an uninitialized variable
from da7294a... nsswitch/wbinfo: Fix the S4 header check
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4d84dab21d1b13bbfe3d8f90c88e41ad3c524bb5
Author: Volker Lendecke v...@samba.org
Date: Sun Apr 11 22:56:09 2010 +0200
libcli/auth: Fix an uninitialized variable
value.dptr was used uninitialized in the goto done;
---
Summary of changes:
libcli/auth/schannel_state_tdb.c |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c
index c1557e8..3f6618c 100644
--- a/libcli/auth/schannel_state_tdb.c
+++ b/libcli/auth/schannel_state_tdb.c
@@ -184,8 +184,7 @@ NTSTATUS schannel_fetch_session_key_tdb(struct tdb_wrap
*tdb_sc,
SECRETS_SCHANNEL_STATE, name_upper);
TALLOC_FREE(name_upper);
if (!keystr) {
- status = NT_STATUS_NO_MEMORY;
- goto done;
+ return NT_STATUS_NO_MEMORY;
}
value = tdb_fetch_bystring(tdb_sc-tdb, keystr);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8e95db9... s3: Move serverinfo_to_SamInfoX to auth/server_info.c via b8829e7... s3: Move [make|free]_user_info to auth/user_info.c via 1890987... s3: Move make_server_info_sam to auth/server_info_sam.c via 2b1a50c... s3: Move sanitize_username to lib/util_str.c via 80708b7... s3: Move make_server_info to auth/server_info.c via 5792ccc... s3: Move check_sam_security to auth/check_sam.c via 04f9e33... s3: Make check_sam_security public via a0c175e... s3: Replace auth_context by challenge in need_to_increment_bad_pw_count args via 19c0086... s3: Replace auth_context by challenge in sam_password_ok args via 7ba21a3... s3: Move user_in_group() and create_token_from_username() to token_utils.c from 4d84dab... libcli/auth: Fix an uninitialized variable http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8e95db9eea8bfd6ec12a894d0d46705a3c414e4e Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 15:25:55 2010 +0200 s3: Move serverinfo_to_SamInfoX to auth/server_info.c commit b8829e74fd0386931c1a5845337efff25fec72c2 Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 15:25:06 2010 +0200 s3: Move [make|free]_user_info to auth/user_info.c commit 18909879cc100b958d74c78ff9f84e9ba3318340 Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 22:41:59 2010 +0200 s3: Move make_server_info_sam to auth/server_info_sam.c commit 2b1a50c2e537f690acd8eff1d0cf3102104144d3 Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 22:38:33 2010 +0200 s3: Move sanitize_username to lib/util_str.c commit 80708b75f815d455c7cc00fc4cccfb6af91e9d85 Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 22:37:08 2010 +0200 s3: Move make_server_info to auth/server_info.c commit 5792ccc7c85276edd86050b18b755e05cda7e1f1 Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 22:32:36 2010 +0200 s3: Move check_sam_security to auth/check_sam.c commit 04f9e33de140235d387a254403909063b8c30f9e Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 22:26:46 2010 +0200 s3: Make check_sam_security public commit a0c175eca9d296e8434acbdb1a87241d64d86f7b Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 22:23:08 2010 +0200 s3: Replace auth_context by challenge in need_to_increment_bad_pw_count args commit 19c00865537ff298e6306de4e81d376d3f068237 Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 14:07:12 2010 +0200 s3: Replace auth_context by challenge in sam_password_ok args commit 7ba21a339c591f546085fcd8cfbf77c25dcfe11e Author: Volker Lendecke v...@samba.org Date: Sun Apr 11 13:48:55 2010 +0200 s3: Move user_in_group() and create_token_from_username() to token_utils.c Goal is to be able to call check_sam_security from winbind --- Summary of changes: source3/Makefile.in |5 +- source3/auth/auth_sam.c | 506 +--- source3/auth/auth_util.c | 584 - source3/auth/check_samsec.c | 512 source3/auth/server_info.c| 342 ++ source3/auth/server_info_sam.c| 151 ++ source3/auth/token_util.c | 315 source3/auth/user_info.c | 131 + source3/include/proto.h | 23 ++ source3/lib/util_str.c|8 + source3/rpc_server/srv_pipe_hnd.c | 287 -- 11 files changed, 1502 insertions(+), 1362 deletions(-) create mode 100644 source3/auth/check_samsec.c create mode 100644 source3/auth/server_info.c create mode 100644 source3/auth/server_info_sam.c create mode 100644 source3/auth/user_info.c Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 55f3d40..4de937a 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -755,7 +755,7 @@ DCUTIL_OBJ = libsmb/namequery_dc.o libsmb/trustdom_cache.o libsmb/trusts_util.o AUTH_BUILTIN_OBJ = auth/auth_builtin.o AUTH_DOMAIN_OBJ = auth/auth_domain.o -AUTH_SAM_OBJ = auth/auth_sam.o +AUTH_SAM_OBJ = auth/auth_sam.o auth/check_samsec.o AUTH_SERVER_OBJ = auth/auth_server.o AUTH_UNIX_OBJ = auth/auth_unix.o AUTH_WINBIND_OBJ = auth/auth_winbind.o @@ -764,6 +764,9 @@ AUTH_SCRIPT_OBJ = auth/auth_script.o AUTH_NETLOGOND_OBJ = auth/auth_netlogond.o AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \ + auth/server_info.o \ + auth/server_info_sam.o \ + auth/user_info.o \ auth/auth_compat.o auth/auth_ntlmssp.o \ $(PLAINTEXT_AUTH_OBJ) $(SLCACHE_OBJ) $(DCUTIL_OBJ) diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c index cf121d1..4220b7a 100644 ---
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2179c6a... s4: fix a typo
via a62d041... s4/libnet: handle errors returned for DsAddEntry_v3
properly
via cb0ad42... s4/libnet: Add few new lines in the debug log so it is
readable again
via 9f92d58... s4/libnet: Dump DRSUAPI_DIRERR_OK as unexpected
from 8e95db9... s3: Move serverinfo_to_SamInfoX to auth/server_info.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2179c6a8f843d9db5860b6c91d154d288f28d741
Author: Kamen Mazdrashki kame...@samba.org
Date: Sun Apr 11 18:43:56 2010 +0300
s4: fix a typo
commit a62d0419dee3d3fe8618baa71aa882c5bed54072
Author: Kamen Mazdrashki kame...@samba.org
Date: Sun Apr 11 17:27:30 2010 +0300
s4/libnet: handle errors returned for DsAddEntry_v3 properly
It turns out ms-docs are little bit misleading - in case of
no error, r-out.ctr-ctr3.err_data is not NULL, but
error information (r-out.ctr-ctr3.err_data-v1.info) is NULL!
commit cb0ad42a3d9d837cfc06f65baa6d8fa2d28a3ec9
Author: Kamen Mazdrashki kame...@samba.org
Date: Sun Apr 11 17:24:32 2010 +0300
s4/libnet: Add few new lines in the debug log so it is readable again
commit 9f92d586ca537ed093a1d68eacf94315da68a8ad
Author: Kamen Mazdrashki kame...@samba.org
Date: Sun Apr 11 17:04:21 2010 +0300
s4/libnet: Dump DRSUAPI_DIRERR_OK as unexpected
Actually DRSUAPI_DIRERR_OK is not valid error to be returned.
I introduce it in the IDL so that I can use it in enum.
So it should be dumped as Unexpected error code
---
Summary of changes:
source4/libnet/libnet_become_dc.c | 40 ++--
source4/param/provision.c |2 +-
2 files changed, 21 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libnet/libnet_become_dc.c
b/source4/libnet/libnet_become_dc.c
index 1c0bfbc..486416e 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -2285,11 +2285,12 @@ static void becomeDC_drsuapi1_add_entry_recv(struct
tevent_req *subreq)
}
if (*r-out.level_out == 3) {
+ WERROR status;
union drsuapi_DsAddEntry_ErrData *err_data =
r-out.ctr-ctr3.err_data;
/* check for errors */
- if (err_data) {
- WERROR status;
+ status = err_data ? err_data-v1.status : WERR_OK;
+ if (!W_ERROR_IS_OK(status)) {
struct drsuapi_DsAddEntryErrorInfo_Attr_V1 *attr_err;
struct drsuapi_DsAddEntry_AttrErrListItem_V1
*attr_err_li;
struct drsuapi_DsAddEntryErrorInfo_Name_V1 *name_err;
@@ -2301,32 +2302,30 @@ static void becomeDC_drsuapi1_add_entry_recv(struct
tevent_req *subreq)
return;
}
- status = err_data-v1.status;
-
DEBUG(0,(DsAddEntry (R3) failed:
-Errors: dir_err = %d, status = %s;,
+Errors: dir_err = %d, status = %s;\n,
err_data-v1.dir_err,
win_errstr(err_data-v1.status)));
if (!err_data-v1.info) {
+ DEBUG(0, (DsAddEntry (R3): no error info
returned!\n,
+ err_data-v1.info));
composite_error(c, werror_to_ntstatus(status));
return;
}
/* dump more detailed error */
switch (err_data-v1.dir_err) {
- case DRSUAPI_DIRERR_OK: /* mute compiler warnings */
- break;
case DRSUAPI_DIRERR_ATTRIBUTE:
/* Dump attribute errors */
attr_err = err_data-v1.info-attr_err;
- DEBUGADD(0,( Attribute Error: object = %s,
count = %d;,
+ DEBUGADD(0,( Attribute Error: object = %s,
count = %d;\n,
attr_err-id-dn,
attr_err-count));
attr_err_li = attr_err-first;
for (; attr_err_li; attr_err_li =
attr_err_li-next) {
struct drsuapi_DsAddEntry_AttrErr_V1
*err = attr_err_li-err_data;
- DEBUGADD(0,( Error: err = %s, problem
= 0x%08X, attid = 0x%08X;,
+ DEBUGADD(0,( Error: err = %s, problem
= 0x%08X, attid = 0x%08X;\n,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f8e527b... build: added --minimum-library-version configure option
from 2179c6a... s4: fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f8e527b088ab19aab5a36a70a45a1032ad338d45
Author: Andrew Tridgell tri...@samba.org
Date: Mon Apr 12 09:49:56 2010 +1000
build: added --minimum-library-version configure option
this allows the packager to override the default choice of system
library version
---
Summary of changes:
buildtools/wafsamba/samba_bundled.py | 19 +++
buildtools/wafsamba/wscript |4
2 files changed, 23 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index bab4143..f87ff80 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -54,6 +54,22 @@ def BUNDLED_EXTENSION_DEFAULT(opt, extension, noextenion=''):
Options.Handler.BUNDLED_EXTENSION_DEFAULT = BUNDLED_EXTENSION_DEFAULT
+def minimum_library_version(conf, libname, default):
+'''allow override of mininum system library version'''
+
+minlist = Options.options.MINIMUM_LIBRARY_VERSION
+if not minlist:
+return default
+
+for m in minlist.split(','):
+a = m.split(':')
+if len(a) != 2:
+Logs.error(Bad syntax for --minimum-library-version of %s % m)
+sys.exit(1)
+if a[0] == libname:
+return a[1]
+return default
+
@runonce
@conf
@@ -84,6 +100,8 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
conf.env[found] = False
return False
+minversion = minimum_library_version(conf, libname, minversion)
+
# try pkgconfig first
if conf.check_cfg(package=libname,
args='%s = %s --cflags --libs' % (libname,
minversion),
@@ -107,3 +125,4 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
Logs.error('ERROR: System library %s of version %s not found, and
bundling disabled' % (libname, minversion))
sys.exit(1)
return False
+
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 1ae6b97..2e42139 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -30,6 +30,10 @@ def set_options(opt):
help=(command separated list of libraries to build
directly into binaries [%s] % builtin_defauilt),
action=store, dest='BUILTIN_LIBRARIES',
default=builtin_defauilt)
+opt.add_option('--minimum-library-version',
+ help=(list of minimum system library versions
(LIBNAME1:version,LIBNAME2:version)),
+ action=store, dest='MINIMUM_LIBRARY_VERSION', default='')
+
opt.add_option('--with-modulesdir',
help=(modules directory [PREFIX/modules]),
action=store, dest='MODULESDIR',
default='${PREFIX}/modules')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 47c4e88... s4-net: Add definition of outf.
from f8e527b... build: added --minimum-library-version configure option
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 47c4e883d6fd833a7ca5d37f289908299f9f0c15
Author: Jelmer Vernooij jel...@samba.org
Date: Mon Apr 12 02:55:27 2010 +0200
s4-net: Add definition of outf.
---
Summary of changes:
source4/scripting/python/samba/netcmd/__init__.py |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/netcmd/__init__.py
b/source4/scripting/python/samba/netcmd/__init__.py
index 3dcf019..3deaec3 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -54,6 +54,8 @@ class Command(object):
synopsis = property(_get_synopsis)
+outf = sys.stdout
+
takes_args = []
takes_options = []
takes_optiongroups = {}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 98942c8... build: use a common autogen-waf.sh for all builds
via 9ffd6c0... build: cope with symlinks between build components in
waf dist
from 47c4e88... s4-net: Add definition of outf.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 98942c8d840745d72f0ef19636752128236a9bbd
Author: Andrew Tridgell tri...@samba.org
Date: Mon Apr 12 11:12:22 2010 +1000
build: use a common autogen-waf.sh for all builds
the symlink will get updated with the right target when waf dist is
used in each directory
commit 9ffd6c0ec339aa6e70543cfecfb2bab93705e603
Author: Andrew Tridgell tri...@samba.org
Date: Mon Apr 12 11:09:44 2010 +1000
build: cope with symlinks between build components in waf dist
This will allow us to have autogen-waf.sh be a symlink to
../buildtools/scripts/autogen-waf.sh in each library.
That will prevent people from updating only the script in source4/,
and forgetting to udpate the scripts in the other libs, as happened
with commit f3f82496
---
Summary of changes:
{source4 = buildtools/scripts}/autogen-waf.sh |0
buildtools/wafsamba/samba_dist.py | 52 +++-
lib/replace/autogen-waf.sh | 23 +--
lib/talloc/autogen-waf.sh | 23 +--
lib/tdb/autogen-waf.sh | 23 +--
lib/tevent/autogen-waf.sh | 23 +--
source4/autogen-waf.sh | 28 +
source4/lib/ldb/autogen-waf.sh | 23 +--
8 files changed, 56 insertions(+), 139 deletions(-)
copy {source4 = buildtools/scripts}/autogen-waf.sh (100%)
mode change 100755 = 12 lib/replace/autogen-waf.sh
mode change 100755 = 12 lib/talloc/autogen-waf.sh
mode change 100755 = 12 lib/tdb/autogen-waf.sh
mode change 100755 = 12 lib/tevent/autogen-waf.sh
mode change 100755 = 12 source4/autogen-waf.sh
mode change 100755 = 12 source4/lib/ldb/autogen-waf.sh
Changeset truncated at 500 lines:
diff --git a/source4/autogen-waf.sh b/buildtools/scripts/autogen-waf.sh
similarity index 100%
copy from source4/autogen-waf.sh
copy to buildtools/scripts/autogen-waf.sh
diff --git a/buildtools/wafsamba/samba_dist.py
b/buildtools/wafsamba/samba_dist.py
index aea45c5..0586550 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -6,8 +6,56 @@ from samba_utils import *
dist_dirs = None
-def add_tarfile(tar, fname, abspath):
+def add_symlink(tar, fname, abspath, basedir):
+'''handle symlinks to directories that may move during packaging'''
+if not os.path.islink(abspath):
+return False
+tinfo = tar.gettarinfo(name=abspath, arcname=fname)
+tgt = os.readlink(abspath)
+
+if dist_dirs:
+# we need to find the target relative to the main directory
+# this is here to cope with symlinks into the buildtools
+# directory from within the standalone libraries in Samba. For example,
+# a symlink to ../../builtools/scripts/autogen-waf.sh needs
+# to be rewritten as a symlink to buildtools/scripts/autogen-waf.sh
+# when the tarball for talloc is built
+
+# the filename without the appname-version
+rel_fname = '/'.join(fname.split('/')[1:])
+
+# join this with the symlink target
+tgt_full = os.path.join(os.path.dirname(rel_fname), tgt)
+
+# join with the base directory
+tgt_base = os.path.normpath(os.path.join(basedir, tgt_full))
+
+# see if this is inside one of our dist_dirs
+for dir in dist_dirs.split():
+if dir.find(':') != -1:
+destdir=dir.split(':')[1]
+dir=dir.split(':')[0]
+else:
+destdir = '.'
+if dir == basedir:
+# internal links don't get rewritten
+continue
+if dir == tgt_base[0:len(dir)] and tgt_base[len(dir)] == '/':
+new_tgt = destdir + tgt_base[len(dir):]
+tinfo.linkname = new_tgt
+break
+
+tinfo.uid = 0
+tinfo.gid = 0
+tinfo.uname = 'root'
+tinfo.gname = 'root'
+tar.addfile(tinfo)
+return True
+
+def add_tarfile(tar, fname, abspath, basedir):
'''add a file to the tarball'''
+if add_symlink(tar, fname, abspath, basedir):
+return
try:
tinfo = tar.gettarinfo(name=abspath, arcname=fname)
except OSError:
@@ -61,7 +109,7 @@ def dist(appname='',version=''):
if destdir != '.':
f = destdir + '/' + f
fname = dist_base + '/' + f
-add_tarfile(tar, fname, abspath)
+add_tarfile(tar, fname, abspath, dir)
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a9e4aba... s4/libnet: Allocate mem in supplied mem_ctx
via 82b8bbd... s4/py_net: Source code formatting fix
from 98942c8... build: use a common autogen-waf.sh for all builds
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a9e4abaa6e72425017953f95e2f22cc4af6d7455
Author: Kamen Mazdrashki kame...@samba.org
Date: Mon Apr 12 03:45:12 2010 +0300
s4/libnet: Allocate mem in supplied mem_ctx
In this case, 'libnet_Vampire *r' may not be a pointer to
a talloced memory.
commit 82b8bbdfac3a9bf7daded97173d205764f14670a
Author: Kamen Mazdrashki kame...@samba.org
Date: Mon Apr 12 03:33:33 2010 +0300
s4/py_net: Source code formatting fix
---
Summary of changes:
source4/libnet/libnet_vampire.c |4 ++--
source4/libnet/py_net.c | 33 +
2 files changed, 19 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index a276828..8d2393f 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -760,8 +760,8 @@ NTSTATUS libnet_Vampire(struct libnet_context *ctx,
TALLOC_CTX *mem_ctx,
return status;
}
- r-out.domain_name = talloc_steal(r, join-out.domain_name);
- r-out.domain_sid = dom_sid_dup(r, join-out.domain_sid);
+ r-out.domain_name = talloc_steal(mem_ctx, join-out.domain_name);
+ r-out.domain_sid = dom_sid_dup(mem_ctx, join-out.domain_sid);
/* commit the transaction now we know the secrets were written
* out properly
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index f2fc771..ec41ca3 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -271,40 +271,41 @@ static PyObject *py_net_vampire(py_net_Object *self,
PyObject *args, PyObject *k
const char *kwnames[] = { domain, target_dir, NULL };
NTSTATUS status;
TALLOC_CTX *mem_ctx;
-PyObject *ret;
+ PyObject *ret;
struct libnet_Vampire r;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, s|s,
discard_const_p(char *, kwnames),
-
r.in.domain_name, r.in.targetdir))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, s|s,
discard_const_p(char *, kwnames),
+r.in.domain_name, r.in.targetdir)) {
return NULL;
+ }
r.in.netbios_name = lp_netbios_name(self-libnet_ctx-lp_ctx);
r.out.error_string = NULL;
-mem_ctx = talloc_new(NULL);
-if (mem_ctx == NULL) {
-PyErr_NoMemory();
-return NULL;
-}
+ mem_ctx = talloc_new(NULL);
+ if (mem_ctx == NULL) {
+ PyErr_NoMemory();
+ return NULL;
+ }
status = libnet_Vampire(self-libnet_ctx, mem_ctx, r);
if (!NT_STATUS_IS_OK(status)) {
-PyErr_SetString(PyExc_RuntimeError,
-r.out.error_string ? r.out.error_string : nt_errstr(status));
-talloc_free(mem_ctx);
+ PyErr_SetString(PyExc_RuntimeError,
+ r.out.error_string ? r.out.error_string :
nt_errstr(status));
+ talloc_free(mem_ctx);
return NULL;
}
-ret = Py_BuildValue((sO), r.out.domain_name,
py_dom_sid_FromSid(r.out.domain_sid));
+ ret = Py_BuildValue((sO), r.out.domain_name,
py_dom_sid_FromSid(r.out.domain_sid));
-talloc_free(mem_ctx);
+ talloc_free(mem_ctx);
-return ret;
+ return ret;
}
static const char py_net_vampire_doc[] = vampire(domain, target_dir=None)\n
-Vampire a domain.;
+Vampire a domain.;
static PyMethodDef net_obj_methods[] = {
{join, (PyCFunction)py_net_join, METH_VARARGS|METH_KEYWORDS,
py_net_join_doc},
@@ -313,7 +314,7 @@ static PyMethodDef net_obj_methods[] = {
{time, (PyCFunction)py_net_time, METH_VARARGS|METH_KEYWORDS,
py_net_time_doc},
{create_user, (PyCFunction)py_net_user_create,
METH_VARARGS|METH_KEYWORDS, py_net_create_user_doc},
{delete_user, (PyCFunction)py_net_user_delete,
METH_VARARGS|METH_KEYWORDS, py_net_delete_user_doc},
-{vampire, (PyCFunction)py_net_vampire, METH_VARARGS|METH_KEYWORDS,
py_net_vampire_doc},
+ {vampire, (PyCFunction)py_net_vampire, METH_VARARGS|METH_KEYWORDS,
py_net_vampire_doc},
{ NULL }
};
--
Samba Shared Repository
