[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Thu Aug 23 10:23:02 MDT 2012


The branch, master has been updated
       via  cbecd15 s3: fix compile warning on openindiana
       via  b4252f8 crypto/aes_ccm_128: fix compile warning on openindiana
       via  cbcfd85 s3/registry: fix compile warning on openindiana
      from  e14bf39 s4-selftest: Always set vfs objects in selftest smb.conf

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cbecd1595c9ed4f0eb8eb76b60ae28eea6a395f4
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Aug 23 15:57:47 2012 +0200

    s3: fix compile warning on openindiana
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Thu Aug 23 18:22:13 CEST 2012 on sn-devel-104

commit b4252f8fa6b48ac7aabeff5b7e801973533cfee4
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Aug 23 15:56:57 2012 +0200

    crypto/aes_ccm_128: fix compile warning on openindiana

commit cbcfd85f415f4e035009133f8a382288aafbcbd7
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Aug 23 15:55:40 2012 +0200

    s3/registry: fix compile warning on openindiana

-----------------------------------------------------------------------

Summary of changes:
 lib/crypto/aes_ccm_128.c              |    2 +-
 source3/passdb/lookup_sid.c           |   10 +++++-----
 source3/registry/reg_parse_internal.c |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/crypto/aes_ccm_128.c b/lib/crypto/aes_ccm_128.c
index ac8e01f..94b9803 100644
--- a/lib/crypto/aes_ccm_128.c
+++ b/lib/crypto/aes_ccm_128.c
@@ -70,7 +70,7 @@ void aes_ccm_128_init(struct aes_ccm_128_context *ctx,
 	 */
 	if (a_total >= UINT32_MAX) {
 		RSSVAL(ctx->B_i, 0, 0xFFFF);
-		RSBVAL(ctx->B_i, 2, a_total);
+		RSBVAL(ctx->B_i, 2, (uint64_t)a_total);
 		ctx->B_i_ofs = 10;
 	} else if (a_total >= 0xFF00) {
 		RSSVAL(ctx->B_i, 0, 0xFFFE);
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 26ce41c..530fa6b 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1314,17 +1314,17 @@ bool sids_to_unixids(const struct dom_sid *sids, uint32_t num_sids,
 	for (i=0; i<num_sids; i++) {
 		if (ids[i].type == ID_TYPE_NOT_SPECIFIED) {
 			switch (wbc_ids[num_not_cached].type) {
-			case ID_TYPE_UID:
-				ids[i].type = WBC_ID_TYPE_UID;
+			case WBC_ID_TYPE_UID:
+				ids[i].type = ID_TYPE_UID;
 				ids[i].id = wbc_ids[num_not_cached].id.uid;
 				break;
-			case ID_TYPE_GID:
-				ids[i].type = WBC_ID_TYPE_GID;
+			case WBC_ID_TYPE_GID:
+				ids[i].type = ID_TYPE_GID;
 				ids[i].id = wbc_ids[num_not_cached].id.gid;
 				break;
 			default:
 				/* The types match, and wbcUnixId -> id is a union anyway */
-				ids[i].type = wbc_ids[num_not_cached].type;
+				ids[i].type = (enum id_type)wbc_ids[num_not_cached].type;
 				ids[i].id = wbc_ids[num_not_cached].id.gid;
 				break;
 			}
diff --git a/source3/registry/reg_parse_internal.c b/source3/registry/reg_parse_internal.c
index 26f4ffe..1a5b112 100644
--- a/source3/registry/reg_parse_internal.c
+++ b/source3/registry/reg_parse_internal.c
@@ -300,7 +300,7 @@ static const struct {
 	const char* const name;
 	charset_t ctype;
 	int  len;
-	char seq[4];
+	uint8_t seq[4];
 } BOM[] = {
 	{"UTF-8",    CH_UTF8,    3, {0xEF, 0xBB, 0xBF}},
 	{"UTF-32LE", CH_INVALID, 4, {0xFF, 0xFE, 0x00, 0x00}},


-- 
Samba Shared Repository


More information about the samba-cvs mailing list