svn commit: samba r21954 - in branches: SAMBA_3_0/source/passdb
SAMBA_3_0_25/source/passdb
jra at samba.org
jra at samba.org
Fri Mar 23 22:11:27 GMT 2007
Author: jra
Date: 2007-03-23 22:11:26 +0000 (Fri, 23 Mar 2007)
New Revision: 21954
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21954
Log:
Someone misused a '!' instead of a '~' for a binary NOT
command. Jerry, Simo, please check.
Jeremy.
Modified:
branches/SAMBA_3_0/source/passdb/passdb.c
branches/SAMBA_3_0_25/source/passdb/passdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/passdb.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/passdb.c 2007-03-23 21:50:44 UTC (rev 21953)
+++ branches/SAMBA_3_0/source/passdb/passdb.c 2007-03-23 22:11:26 UTC (rev 21954)
@@ -718,7 +718,7 @@
}
/* the 'other' acb bits not being changed here */
- other_acb = (pdb_get_acct_ctrl(sam_pass) & (!(ACB_WSTRUST|ACB_DOMTRUST|ACB_SVRTRUST|ACB_NORMAL)));
+ other_acb = (pdb_get_acct_ctrl(sam_pass) & (~(ACB_WSTRUST|ACB_DOMTRUST|ACB_SVRTRUST|ACB_NORMAL)));
if (local_flags & LOCAL_TRUST_ACCOUNT) {
if (!pdb_set_acct_ctrl(sam_pass, ACB_WSTRUST | other_acb, PDB_CHANGED) ) {
slprintf(err_str, err_str_len - 1, "Failed to set 'trusted workstation account' flags for user %s.\n", user_name);
Modified: branches/SAMBA_3_0_25/source/passdb/passdb.c
===================================================================
--- branches/SAMBA_3_0_25/source/passdb/passdb.c 2007-03-23 21:50:44 UTC (rev 21953)
+++ branches/SAMBA_3_0_25/source/passdb/passdb.c 2007-03-23 22:11:26 UTC (rev 21954)
@@ -702,7 +702,7 @@
}
/* the 'other' acb bits not being changed here */
- other_acb = (pdb_get_acct_ctrl(sam_pass) & (!(ACB_WSTRUST|ACB_DOMTRUST|ACB_SVRTRUST|ACB_NORMAL)));
+ other_acb = (pdb_get_acct_ctrl(sam_pass) & (~(ACB_WSTRUST|ACB_DOMTRUST|ACB_SVRTRUST|ACB_NORMAL)));
if (local_flags & LOCAL_TRUST_ACCOUNT) {
if (!pdb_set_acct_ctrl(sam_pass, ACB_WSTRUST | other_acb, PDB_CHANGED) ) {
slprintf(err_str, err_str_len - 1, "Failed to set 'trusted workstation account' flags for user %s.\n", user_name);
More information about the samba-cvs
mailing list