The branch, master has been updated
via 8bf3112 s4:idmap: break account_type check lines for readability in
idmap_sid_to_xid()
from 9c7015e idl: Add DNS HINFO record support
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8bf311288be718d6dd87b5a79550f2282c7396d5
Author: Michael Adam <[email protected]>
Date: Wed Apr 24 15:49:46 2013 +0200
s4:idmap: break account_type check lines for readability in
idmap_sid_to_xid()
Also makes code obey README.Coding, regarding line-length.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Mon May 27 00:05:19 CEST 2013 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source4/winbind/idmap.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c
index 3773c1d..54fea18 100644
--- a/source4/winbind/idmap.c
+++ b/source4/winbind/idmap.c
@@ -453,7 +453,10 @@ static NTSTATUS idmap_sid_to_xid(struct idmap_context
*idmap_ctx,
goto failed;
} else if (ret == LDB_SUCCESS) {
uint32_t account_type = ldb_msg_find_attr_as_uint(sam_msg,
"sAMaccountType", 0);
- if ((account_type == ATYPE_ACCOUNT) || (account_type ==
ATYPE_WORKSTATION_TRUST ) || (account_type == ATYPE_INTERDOMAIN_TRUST )) {
+ if ((account_type == ATYPE_ACCOUNT) ||
+ (account_type == ATYPE_WORKSTATION_TRUST ) ||
+ (account_type == ATYPE_INTERDOMAIN_TRUST ))
+ {
const struct ldb_val *v = ldb_msg_find_ldb_val(sam_msg,
"uidNumber");
if (v) {
unixid->type = ID_TYPE_UID;
@@ -462,7 +465,9 @@ static NTSTATUS idmap_sid_to_xid(struct idmap_context
*idmap_ctx,
return NT_STATUS_OK;
}
- } else if ((account_type == ATYPE_SECURITY_GLOBAL_GROUP) ||
(account_type == ATYPE_SECURITY_LOCAL_GROUP)) {
+ } else if ((account_type == ATYPE_SECURITY_GLOBAL_GROUP) ||
+ (account_type == ATYPE_SECURITY_LOCAL_GROUP))
+ {
const struct ldb_val *v = ldb_msg_find_ldb_val(sam_msg,
"gidNumber");
if (v) {
unixid->type = ID_TYPE_GID;
--
Samba Shared Repository
