The branch, master has been updated via b05f0db... s4-smbtorture: fix typo in RPC-SAMR-PASSWORDS-LOCKOUT test. via b170ebe... s3-eventlog: fix elog_tdbname(), we were always lower-casing entire lockdir path... from 3bc18d9... s3-selftest: run RPC-EVENTLOG against s3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b05f0db957633454ad01598d084d883b8a3631fe Author: Günther Deschner <g...@samba.org> Date: Wed Mar 17 18:03:29 2010 +0100 s4-smbtorture: fix typo in RPC-SAMR-PASSWORDS-LOCKOUT test. Guenther commit b170ebe08b78c5240266578a19dae424802cda0e Author: Günther Deschner <g...@samba.org> Date: Wed Mar 17 23:16:53 2010 +0100 s3-eventlog: fix elog_tdbname(), we were always lower-casing entire lockdir path... Found by RPC-EVENTLOG torture test. Guenther ----------------------------------------------------------------------- Summary of changes: source3/lib/eventlog/eventlog.c | 24 +++++++++++++++++++----- source4/torture/rpc/samr.c | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c index 1c0dba9..dc14214 100644 --- a/source3/lib/eventlog/eventlog.c +++ b/source3/lib/eventlog/eventlog.c @@ -65,14 +65,28 @@ TDB_CONTEXT *elog_init_tdb( char *tdbfilename ) char *elog_tdbname(TALLOC_CTX *ctx, const char *name ) { - char *path = talloc_asprintf(ctx, "%s/%s.tdb", - state_path("eventlog"), - name); + char *path; + char *file; + char *tdbname; + + path = talloc_strdup(ctx, state_path("eventlog")); if (!path) { return NULL; } - strlower_m(path); - return path; + + file = talloc_asprintf_strlower_m(path, "%s.tdb", name); + if (!file) { + talloc_free(path); + return NULL; + } + + tdbname = talloc_asprintf(path, "%s/%s", state_path("eventlog"), file); + if (!tdbname) { + talloc_free(path); + return NULL; + } + + return tdbname; } diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 9e2c846..4f21d5a 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -3894,7 +3894,7 @@ static bool test_Password_lockout(struct dcerpc_pipe *p, info.info1 = *info1; - torture_comment(tctx, "setting password history lenght.\n"); + torture_comment(tctx, "setting password history length.\n"); info.info1.password_history_length = password_history_length; torture_assert(tctx, -- Samba Shared Repository