The branch, master has been updated
via 8f3f38e ldb: fix a typo in the comment for ldb_req_is_untrusted()
via 06e1fca libnet: Fix a typo in dbsync error message.
via 7a42936 libnet: Fix copy and paste error in dbsync error message.
via f3d5d14 torture: Fix copy and paste error in debug message.
via 1b170c2 torture: Fix copy and paste error.
via aa7f406 s3-reg: Fix copy and paste error in debug message.
from 234f936 s3:popt_common: Fix password processing.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8f3f38ece4981d0047024019c6fc8dfde3fffed0
Author: Michael Adam <ob...@samba.org>
Date: Wed Nov 28 21:55:47 2012 +0100
ldb: fix a typo in the comment for ldb_req_is_untrusted()
Signed-off-by: Michael Adam <ob...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Fri Nov 30 15:44:46 CET 2012 on sn-devel-104
commit 06e1fca044718ed2d61ef9fe394845514dd5a652
Author: Michael Adam <ob...@samba.org>
Date: Fri Nov 30 12:31:55 2012 +0100
libnet: Fix a typo in dbsync error message.
Signed-off-by: Michael Adam <ob...@samba.org>
commit 7a429367a99fe4d77c8347f21e7b3247281191eb
Author: Andreas Schneider <a...@samba.org>
Date: Fri Nov 30 11:01:47 2012 +0100
libnet: Fix copy and paste error in dbsync error message.
commit f3d5d14906e588d44fa255fb9206b825215946ec
Author: Andreas Schneider <a...@samba.org>
Date: Fri Nov 30 10:59:06 2012 +0100
torture: Fix copy and paste error in debug message.
Found by Coverity.
commit 1b170c29bc9239e2077e70c929e7426f5b19104d
Author: Andreas Schneider <a...@samba.org>
Date: Fri Nov 30 10:57:39 2012 +0100
torture: Fix copy and paste error.
Found by Coverity.
commit aa7f4063177118b8dd37b30f40c5543fdd5f5ec0
Author: Andreas Schneider <a...@samba.org>
Date: Fri Nov 30 10:53:55 2012 +0100
s3-reg: Fix copy and paste error in debug message.
Found by coverity.
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/common/ldb.c | 2 +-
source3/registry/regfio.c | 4 ++--
source4/libnet/libnet_samsync.c | 2 +-
source4/torture/rpc/drsuapi_cracknames.c | 2 +-
source4/torture/smb2/ioctl.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/common/ldb.c b/lib/ldb/common/ldb.c
index 49eccb9..7a997f7 100644
--- a/lib/ldb/common/ldb.c
+++ b/lib/ldb/common/ldb.c
@@ -1980,7 +1980,7 @@ uint32_t ldb_req_get_custom_flags(struct ldb_request *req)
/**
- return true is a request is untrusted
+ * return true if a request is untrusted
*/
bool ldb_req_is_untrusted(struct ldb_request *req)
{
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index bde1863..fe80094 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -1067,8 +1067,8 @@ static bool hbin_prs_key( REGF_FILE *file, REGF_HBIN
*hbin, REGF_NK_REC *nk )
if ( !hbin_contains_offset( hbin, nk->sk_off ) ) {
sub_hbin = lookup_hbin_block( file, nk->sk_off );
if ( !sub_hbin ) {
- DEBUG(0,("hbin_prs_key: Failed to find HBIN
block containing sk_offset [0x%x]\n",
- nk->subkeys_off));
+ DEBUG(0,("hbin_prs_key: Failed to find HBIN
block containing sk_off [0x%x]\n",
+ nk->sk_off));
return False;
}
}
diff --git a/source4/libnet/libnet_samsync.c b/source4/libnet/libnet_samsync.c
index 7c999db..9629b9f 100644
--- a/source4/libnet/libnet_samsync.c
+++ b/source4/libnet/libnet_samsync.c
@@ -270,7 +270,7 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context
*ctx, TALLOC_CTX *mem_ctx
} while (NT_STATUS_EQUAL(dbsync_nt_status,
STATUS_MORE_ENTRIES));
if (!NT_STATUS_IS_OK(dbsync_nt_status)) {
- r->out.error_string = talloc_asprintf(mem_ctx,
"libnet_SamSync_netlogon failed: unexpected inconsistancy. Should not get error
%s here", nt_errstr(nt_status));
+ r->out.error_string = talloc_asprintf(mem_ctx,
"libnet_SamSync_netlogon failed: unexpected inconsistency. Should not get error
%s here", nt_errstr(dbsync_nt_status));
talloc_free(samsync_ctx);
return dbsync_nt_status;
}
diff --git a/source4/torture/rpc/drsuapi_cracknames.c
b/source4/torture/rpc/drsuapi_cracknames.c
index 80db95c..8d1ab6f 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -354,7 +354,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
if (strcmp(realm_canonical_ex,
talloc_asprintf(mem_ctx, "%s\n", dns_domain))!= 0) {
err_msg = talloc_asprintf(mem_ctx, "local Round trip on
canonical ex name failed: %s != %s!",
- realm_canonical,
+ realm_canonical_ex,
talloc_asprintf(mem_ctx, "%s\n",
dns_domain));
torture_fail(tctx, err_msg);
};
diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c
index ad300c0..5897162 100644
--- a/source4/torture/smb2/ioctl.c
+++ b/source4/torture/smb2/ioctl.c
@@ -182,7 +182,7 @@ static bool test_setup_copy_chunk(struct torture_context
*torture,
torture_assert_ntstatus_ok(torture, status, "create write");
if (dest_size > 0) {
- for (i = 0; i <= src_size - 8; i += 8) {
+ for (i = 0; i <= dest_size - 8; i += 8) {
SBVAL(buf, i, patt_hash(i));
}
status = smb2_util_write(tree, *dest_h, buf, 0, dest_size);
--
Samba Shared Repository
