The branch, master has been updated
via 37609ba build: Avoid printing the ABI signature normalisation
during the default build
via be5bf2c When listing group members allow fallback to cn attribute
when samAccountName is not available
via d74c5a3 build:ignore solaris _GLOBAL_OFFSET_TABLE_ in duplicate
symbol checker
from 6132cf2 s3:auth/server_info: the primary rid should be in the
groups rid array (bug #8798)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 37609ba6b89394648cb8d4555b9f6f8c2dd88ef7
Author: Andrew Bartlett <[email protected]>
Date: Thu May 10 15:07:32 2012 +1000
build: Avoid printing the ABI signature normalisation during the default
build
This appears to have been accidentily left in
acd63fdb86769ff4328ccb6a4096181e65e4d30f
Andrew Bartlett
Autobuild-User: Andrew Bartlett <[email protected]>
Autobuild-Date: Thu May 10 09:00:20 CEST 2012 on sn-devel-104
commit be5bf2c991ce5ec2c5b2c19832430e26150d7d84
Author: Lukasz Zalewski <[email protected]>
Date: Wed May 9 14:24:01 2012 +0100
When listing group members allow fallback to cn attribute when
samAccountName is not available
commit d74c5a3dc4ff81eadf220b4554401e786e93dab5
Author: Andrew Bartlett <[email protected]>
Date: Mon Apr 23 11:37:39 2012 +1000
build:ignore solaris _GLOBAL_OFFSET_TABLE_ in duplicate symbol checker
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_abi.py | 2 +-
buildtools/wafsamba/symbols.py | 2 ++
source4/scripting/python/samba/netcmd/group.py | 7 +++++--
3 files changed, 8 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 76c2d8b..c51e08c 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -57,7 +57,7 @@ def parse_sigs(sigs, abi_match):
break
if not matched:
continue
- print "%s -> %s" % (sa[1], normalise_signature(sa[1]))
+ Logs.debug("%s -> %s" % (sa[1], normalise_signature(sa[1])))
ret[sa[0]] = normalise_signature(sa[1])
return ret
diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 8775735..c4b5599 100644
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -592,6 +592,8 @@ def symbols_dupcheck_binary(bld, binname, fail_on_error):
symmap = {}
for libpath in symlist:
for sym in symlist[libpath]['PUBLIC']:
+ if sym == '_GLOBAL_OFFSET_TABLE_':
+ continue
if not sym in symmap:
symmap[sym] = set()
symmap[sym].add(libpath)
diff --git a/source4/scripting/python/samba/netcmd/group.py
b/source4/scripting/python/samba/netcmd/group.py
index 265170d..0f4a744 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/source4/scripting/python/samba/netcmd/group.py
@@ -346,13 +346,16 @@ samba-tool group listmembers \"Domain Users\" -H
ldap://samba.samdom.example.com
search_filter = "(|(primaryGroupID=%s)(memberOf=%s))" % (rid,
group_dn)
res = samdb.search(samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE,
expression=(search_filter),
- attrs=["samAccountName"])
+ attrs=["samAccountName", "cn"])
if (len(res) == 0):
return
for msg in res:
- self.outf.write("%s\n" % msg.get("samAccountName", idx=0))
+ member_name = msg.get("samAccountName", idx=0)
+ if member_name is None:
+ member_name = msg.get("cn", idx=0)
+ self.outf.write("%s\n" % member_name)
except Exception, e:
raise CommandError('Failed to list members of "%s" group ' %
groupname, e)
--
Samba Shared Repository
