svn commit: samba r4532 - in branches/SAMBA_4_0/source: dsdb/samdb librpc/idl torture/rpc

[metze at samba.org]

Author: metze
Date: 2005-01-05 15:24:20 +0000 (Wed, 05 Jan 2005)
New Revision: 4532

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4532

Log:
- rename bitmap -> bits

the next commit is support for typedef bitmap {...}; in pidl

metze

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
   branches/SAMBA_4_0/source/librpc/idl/samr.idl
   branches/SAMBA_4_0/source/torture/rpc/samr.c
   branches/SAMBA_4_0/source/torture/rpc/samsync.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2005-01-05 10:21:08 UTC (rev 4531)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2005-01-05 15:24:20 UTC (rev 4532)
@@ -556,14 +556,14 @@
 	const int units_per_week = 168;
 	const struct ldb_val *val = ldb_msg_find_ldb_val(msg, attr);
 	ZERO_STRUCT(hours);
-	hours.bitmap = talloc_array_p(mem_ctx, uint8, units_per_week);
-	if (!hours.bitmap) {
+	hours.bits = talloc_array_p(mem_ctx, uint8, units_per_week);
+	if (!hours.bits) {
 		return hours;
 	}
 	hours.units_per_week = units_per_week;
-	memset(hours.bitmap, 0xFF, units_per_week);
+	memset(hours.bits, 0xFF, units_per_week);
 	if (val) {
-		memcpy(hours.bitmap, val->data, MIN(val->length, units_per_week));
+		memcpy(hours.bits, val->data, MIN(val->length, units_per_week));
 	}
 	return hours;
 }
@@ -888,7 +888,7 @@
 	struct ldb_wrap *sam_ctx = ctx;
 	struct ldb_val val;
 	val.length = hours->units_per_week / 8;
-	val.data = hours->bitmap;
+	val.data = hours->bits;
 	return ldb_msg_add_value(sam_ctx->ldb, msg, attr_name, &val);
 }
 

Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl	2005-01-05 10:21:08 UTC (rev 4531)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl	2005-01-05 15:24:20 UTC (rev 4532)
@@ -568,7 +568,7 @@
 	/* this is also used in samr and netlogon */
 	typedef [public, flag(NDR_PAHEX)] struct {
 		uint16 units_per_week;
-		[size_is(1260), length_is(units_per_week/8)] uint8 *bitmap;
+		[size_is(1260), length_is(units_per_week/8)] uint8 *bits;
 	} samr_LogonHours;
 
 	typedef struct {

Modified: branches/SAMBA_4_0/source/torture/rpc/samr.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samr.c	2005-01-05 10:21:08 UTC (rev 4531)
+++ branches/SAMBA_4_0/source/torture/rpc/samr.c	2005-01-05 15:24:20 UTC (rev 4532)
@@ -245,11 +245,11 @@
 		s2.in.level = lvl1; \
 		u = *q.out.info; \
 		if (lvl1 == 21) { \
-			uint8_t *bitmap = u.info21.logon_hours.bitmap; \
+			uint8_t *bits = u.info21.logon_hours.bits; \
 			ZERO_STRUCT(u.info21); \
 			if (fpval == SAMR_FIELD_LOGON_HOURS) { \
 				u.info21.logon_hours.units_per_week = 168; \
-				u.info21.logon_hours.bitmap = bitmap; \
+				u.info21.logon_hours.bits = bits; \
 			} \
 			u.info21.fields_present = fpval; \
 		} \
@@ -324,10 +324,10 @@
 	TEST_USERINFO_INT(21, code_page, 21, code_page, __LINE__, 
 			  SAMR_FIELD_CODE_PAGE);
 
-	TEST_USERINFO_INT(4, logon_hours.bitmap[3],  3, logon_hours.bitmap[3], 1, 0);
-	TEST_USERINFO_INT(4, logon_hours.bitmap[3],  5, logon_hours.bitmap[3], 2, 0);
-	TEST_USERINFO_INT(4, logon_hours.bitmap[3], 21, logon_hours.bitmap[3], 3, 0);
-	TEST_USERINFO_INT(21, logon_hours.bitmap[3], 21, logon_hours.bitmap[3], 4, 
+	TEST_USERINFO_INT(4, logon_hours.bits[3],  3, logon_hours.bits[3], 1, 0);
+	TEST_USERINFO_INT(4, logon_hours.bits[3],  5, logon_hours.bits[3], 2, 0);
+	TEST_USERINFO_INT(4, logon_hours.bits[3], 21, logon_hours.bits[3], 3, 0);
+	TEST_USERINFO_INT(21, logon_hours.bits[3], 21, logon_hours.bits[3], 4, 
 			  SAMR_FIELD_LOGON_HOURS);
 
 	TEST_USERINFO_INT_EXP(16, acct_flags, 5, acct_flags, 

Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samsync.c	2005-01-05 10:21:08 UTC (rev 4531)
+++ branches/SAMBA_4_0/source/torture/rpc/samsync.c	2005-01-05 15:24:20 UTC (rev 4532)
@@ -453,7 +453,7 @@
 	TEST_INT_EQUAL(q.out.info->info21.logon_hours.units_per_week, 
 		       user->logon_hours.units_per_week);
 	if (ret) {
-		if (memcmp(q.out.info->info21.logon_hours.bitmap, user->logon_hours.bitmap, 
+		if (memcmp(q.out.info->info21.logon_hours.bits, user->logon_hours.bits, 
 			   q.out.info->info21.logon_hours.units_per_week/8) != 0) {
 			printf("Logon hours mismatch\n");
 			ret = False;