svn commit: samba r14442 - in branches/SAMBA_4_0/source/dsdb/common: .

metze at samba.org metze at samba.org
Wed Mar 15 11:56:58 GMT 2006


Author: metze
Date: 2006-03-15 11:56:58 +0000 (Wed, 15 Mar 2006)
New Revision: 14442

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

Log:
the ACB_ flags are 32 bit...

metze
Modified:
   branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c	2006-03-15 11:40:43 UTC (rev 14441)
+++ branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c	2006-03-15 11:56:58 UTC (rev 14442)
@@ -30,7 +30,7 @@
 /* mapping between ADS userAccountControl and SAMR acct_flags */
 static const struct {
 	uint32_t uf;
-	uint16_t acb;
+	uint32_t acb;
 } acct_flags_map[] = {
 	{ UF_ACCOUNTDISABLE, ACB_DISABLED },
 	{ UF_HOMEDIR_REQUIRED, ACB_HOMDIRREQ },
@@ -45,7 +45,7 @@
 	{ UF_LOCKOUT, ACB_AUTOLOCK }
 };
 
-uint32_t samdb_acb2uf(uint16_t acb)
+uint32_t samdb_acb2uf(uint32_t acb)
 {
 	uint32_t i, ret = 0;
 	for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
@@ -59,10 +59,10 @@
 /*
 translated the UserFlags (userAccountControl) to ACB_CTRL Flags
 */
-uint16_t samdb_uf2acb(uint32_t uf)
+uint32_t samdb_uf2acb(uint32_t uf)
 {
 	uint32_t i;
-	uint16_t ret = 0;
+	uint32_t ret = 0;
 	for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
 		if (acct_flags_map[i].uf & uf) {
 			ret |= acct_flags_map[i].acb;



More information about the samba-cvs mailing list