[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Aug 31 21:11:02 MDT 2012
The branch, master has been updated
via 4d7dad1 s4-dsdb: Remove unused variables
via 8557c69 s4-kdc: Improve grammer and clarity of password change failure messages.
via f0a9180 s3: Fix warnings in aio_fork.c
via 2ffe690 s3: Remove a shadowing variable declaration
via 01ade93 s4-dsdb: Remove unused tmp_ctx leaked onto long-term ldb_context
from c256566 s4 dns: Store TKEYs in a ringbuffer
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4d7dad13158fe6d998d7f63ed0f4ac7935a29bf8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 1 11:36:36 2012 +1000
s4-dsdb: Remove unused variables
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Sat Sep 1 05:10:47 CEST 2012 on sn-devel-104
commit 8557c692f613847d190891b6d79498f4e8fb9096
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 1 11:34:33 2012 +1000
s4-kdc: Improve grammer and clarity of password change failure messages.
This can still be improved further, but avoid mentioning reasons that
clearly do not apply in this case.
Andrew Bartlett
commit f0a9180ae9dd565e4772ba9027ade0edfe1fc8d8
Author: Volker Lendecke <vl at samba.org>
Date: Fri Aug 31 14:45:08 2012 +0200
s3: Fix warnings in aio_fork.c
commit 2ffe69082e23675a96e59eea0954a6b17530e82c
Author: Volker Lendecke <vl at samba.org>
Date: Fri Aug 31 14:17:49 2012 +0200
s3: Remove a shadowing variable declaration
commit 01ade93c7c0c2f2e992f5295976bbfc20429023a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 1 11:29:46 2012 +1000
s4-dsdb: Remove unused tmp_ctx leaked onto long-term ldb_context
This was found based on a log provided by Ricky Nance
<ricky.nance at weaubleau.k12.mo.us>. Thanks Ricky!
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_aio_fork.c | 6 ++++--
source3/passdb/lookup_sid.c | 2 --
source4/dsdb/common/util.c | 5 -----
source4/kdc/kpasswdd.c | 7 +++----
4 files changed, 7 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 2ec3d3d..3db336f 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -590,9 +590,10 @@ static struct tevent_req *aio_fork_pread_send(struct vfs_handle_struct *handle,
ssize_t written;
int err;
struct aio_fork_config *config;
+
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct aio_fork_config,
- return -1);
+ return NULL);
req = tevent_req_create(mem_ctx, &state, struct aio_fork_pread_state);
if (req == NULL) {
@@ -821,9 +822,10 @@ static struct tevent_req *aio_fork_fsync_send(
ssize_t written;
int err;
struct aio_fork_config *config;
+
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct aio_fork_config,
- return -1);
+ return NULL);
req = tevent_req_create(mem_ctx, &state, struct aio_fork_fsync_state);
if (req == NULL) {
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 530fa6b..76a454c 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1096,8 +1096,6 @@ static bool legacy_sid_to_unixid(const struct dom_sid *psid, struct unixid *id)
if ((sid_check_is_in_builtin(psid) ||
sid_check_is_in_wellknown_domain(psid))) {
- bool ret;
-
map = talloc_zero(NULL, GROUP_MAP);
if (!map) {
return false;
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 5d73df2..086f2a5 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -1618,12 +1618,10 @@ int samdb_reference_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct ldb_
int samdb_dn_is_our_ntdsa(struct ldb_context *ldb, struct ldb_dn *dn, bool *is_ntdsa)
{
NTSTATUS status;
- TALLOC_CTX *tmp_ctx = talloc_new(ldb);
struct GUID dn_guid;
const struct GUID *our_ntds_guid;
status = dsdb_get_extended_dn_guid(dn, &dn_guid, "GUID");
if (!NT_STATUS_IS_OK(status)) {
- talloc_free(tmp_ctx);
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -1645,10 +1643,7 @@ int samdb_reference_dn_is_our_ntdsa(struct ldb_context *ldb, struct ldb_dn *base
{
int ret;
struct ldb_dn *referenced_dn;
- NTSTATUS status;
TALLOC_CTX *tmp_ctx = talloc_new(ldb);
- struct GUID referenced_guid;
- const struct GUID *our_ntds_guid;
if (tmp_ctx == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index c05ea82..5558794 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -112,19 +112,18 @@ static bool kpasswd_make_pwchange_reply(struct kdc_server *kdc,
const char *reject_string;
switch (reject_reason) {
case SAM_PWD_CHANGE_PASSWORD_TOO_SHORT:
- reject_string = talloc_asprintf(mem_ctx, "Password too short, password must be at least %d characters long",
+ reject_string = talloc_asprintf(mem_ctx, "Password too short, password must be at least %d characters long.",
dominfo->min_password_length);
break;
case SAM_PWD_CHANGE_NOT_COMPLEX:
reject_string = "Password does not meet complexity requirements";
break;
case SAM_PWD_CHANGE_PWD_IN_HISTORY:
- reject_string = talloc_asprintf(mem_ctx, "Password is already in password history, cannot match any of your %d passwords",
+ reject_string = talloc_asprintf(mem_ctx, "Password is already in password history. New password must not match any of your %d previous passwords.",
dominfo->password_history_length);
break;
default:
- reject_string = talloc_asprintf(mem_ctx, "Password must be at least %d characters long, and cannot match any of your %d previous passwords",
- dominfo->min_password_length, dominfo->password_history_length);
+ reject_string = "Password change rejected, password changes may not be permitted on this account, or the minimum password age may not have elapsed.";
break;
}
return kpasswdd_make_error_reply(kdc, mem_ctx,
--
Samba Shared Repository
More information about the samba-cvs
mailing list