lp:samba

Branch merges

1 branch proposed for merging into this one.

Related source package recipes

3 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

61713. By Ralph Boehme <email address hidden> on 2019-12-12

lib/replace: work around an API conflict between ncurses and XFS xattr API

Compile error:

  [4530/4693] Compiling source3/utils/regedit_list.c
  In file included from ../../source3/utils/regedit_list.h:24,
                   from ../../source3/utils/regedit_list.c:20:
  /usr/include/curses.h:611:28: error: conflicting types for ‘attr_get’
    611 | extern NCURSES_EXPORT(int) attr_get (attr_t *, NCURSES_PAIRS_T *, void *); /* generated */
        | ^~~~~~~~
  compilation terminated due to -Wfatal-errors.

Both ncurses and XFS xattr API provide a get_attr() function. As a workaround
avoid including <sys|attr/attributes.h> if <attr|sys/xattr.h> is present.

Signed-off-by: Ralph Boehme <email address hidden>
Reviewed-by: Jeremy Allison <email address hidden>

Autobuild-User(master): Jeremy Allison <email address hidden>
Autobuild-Date(master): Thu Dec 12 20:22:51 UTC 2019 on sn-devel-184

61712. By Andrew Bartlett on 2019-12-12

libndr: Return enum ndr_err_code from ndr_{pull,push}_steal_switch_value()

This breaks the ABI so we merge this into the unreleased libndr-1.0.0.

The advantage of the new functions is there (except for print, which
is unchanged) is an error raised when the token is not found, so
we can be confident in the changes to the token behaviour.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

Autobuild-User(master): Andrew Bartlett <email address hidden>
Autobuild-Date(master): Thu Dec 12 03:56:23 UTC 2019 on sn-devel-184

61711. By Andrew Bartlett on 2019-12-12

librpc/ndr: Remove ndr_{push,pull}_get_switch_value()

By removing this we know we do not need to worry about this list
growing without bounds. We merge this into the recently created but
not yet released ABI 1.0.0

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

61710. By Andrew Bartlett on 2019-12-12

librpc: Remove last callers of ndr_push_get_switch_value()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

61709. By Andrew Bartlett on 2019-12-12

librpc: Remove last callers of ndr_pull_get_switch_value()

By removing this we know we do not need to worry about this list
growing without bounds.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

61708. By Andrew Bartlett on 2019-12-12

librpc: Do not follow a NULL pointer when calculating the size of a union

Found by Douglas Bagnall using Hongfuzz and the new fuzz_ndr_X
fuzzer.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

61707. By Andrew Bartlett on 2019-12-12

pidl: Mismatch between set and get of relative base pointers

The set was within the switch, the get was before the switch.

The difference is shown when there is an empty default element.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

61706. By Andrew Bartlett on 2019-12-12

librpc: Do not follow a NULL pointer when calculating the size of a structure

Found by Douglas Bagnall using Hongfuzz and the new fuzz_ndr_X
fuzzer.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

61705. By Andrew Bartlett on 2019-12-12

pidl: Mismatch between set and get of relative base pointers

The set was within the switch, the get was before the switch.

The difference is shown when there is an empty default element.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>

61704. By Andrew Bartlett on 2019-12-12

pidl: Add and use ndr_print_steal_switch_value(), removing ndr_print_get_switch_value()

This avoids really long token lists for switch values
that will not be needed past this point.

The function name is changed to clarify what exactly is being
done here, and the old function is removed to ensure it is
not being used anywhere else.

Merge the removal of ndr_print_get_switch_value into
just-tagged librpc/ABI/ndr-1.0.0.sigs as this
has not been put into any release yet.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13876

Signed-off-by: Andrew Bartlett <email address hidden>
Reviewed-by: Gary Lockyer <email address hidden>