Reduce duplicate symbols, merge server_id
abartlet at samba.org
Mon May 2 06:42:41 MDT 2011
In my merge-test branch I have some changes to bring down the duplicate
symbol count in the top level build.
Ronnie, in particular I would like your comment on:
s3-server_id Add id2 to server_id to match Samba4
Here I've changed server_id to include an id2 additional component that
Samba4 uses in it's single and prefork process modal for internal task
within a pid. This changes the server_id structure, which will as I
understand it mean that a future Samba 3.6 will not talk to a future
Samba 4.0 in a ctdb cluster, but otherwise it should be harmless. Are
there any other impacts on CTDB I should be aware of?
I've not chosen simply to reuse the .unique_id element as that was added
for a very good reason, and I think that check element should be
maintained in a project-wide server_id.
The reason I've done this now is that the ndr pull/push functions for
server_id.idl and the notify.idl were causing duplicate symbols, and
because I hope to have a common interprocess messaging system in future,
and a common server_id would be the basis for that.
I've also couple of other Samba3 functions in common:
and renamed or removed:
The list of duplicates is now just 30 (down from 51):
Each duplicate symbol is a potential segfault, particularly if the
prototypes or behaviours are different. I hope to sort out the
remainder of these symbols shortly.
The merges so far have almost entirely been to copy the source3
implementation of a function into Samba4, and to then copy it to the top
level. Given the minor and one-off nature of the affected code, I
haven't put any talloc_stackframe() or talloc_tos() calls into the top
level code until we resolve as a team how we consistently wish to deal
I'm still working to ensure the interfaces code does exactly what we
want, but I hope to work with tridge to have this reviewed soon.
Andrew Bartlett http://samba.org/~abartlet/
Authentication Developer, Samba Team http://samba.org
More information about the samba-technical