summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* VERSION: Disable git snapshots for the 4.3.6 release.samba-4.3.6Karolin Seeger2016-02-241-1/+1
| | | | Signed-off-by: Karolin Seeger <kseeger@samba.org>
* WHATSNEW: Add release notes for Samba 4.3.6.Karolin Seeger2016-02-241-2/+85
| | | | | | | | CVE-2015-7560 Getting and setting Windows ACLs on symlinks can change permissions on link target. CVE-2016-0771: Read of uninitialized memory DNS TXT handling Signed-off-by: Karolin Seeger <kseeger@samba.org>
* CVE-2016-0771: tests/dns: Remove dependencies on env variablesGarming Sam2016-02-241-44/+24
| | | | | | | | | | | Now that it is invoked as a normal script, there should be less of them. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: change samba.tests.dns from being a unittestGarming Sam2016-02-242-9/+40
| | | | | | | | | | | This makes it easier to invoke, particularly against Windows. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests: rename test getopt to get_optGarming Sam2016-02-242-1/+1
| | | | | | | | | | | | This avoids any conflicts in this directory with the original toplevel getopt. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: RPC => DNS roundtrip testGarming Sam2016-02-242-13/+190
| | | | | | | | | | | | | | Make sure that TXT entries stored via RPC come out the same in DNS. This has one caveat in that adding over RPC in Windows eats slashes, and so fails there. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: dnsserver: don't force UTF-8 for TXTGarming Sam2016-02-241-1/+1
| | | | | | | | | | | | While using a charset is not entirely logical, it allows testing of non UTF-8 data (like inserting 0xFF into the TXT string). BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: modify tests to check via RPCGarming Sam2016-02-241-106/+160
| | | | | | | | | | | This checks that TXT records added over DNS, look the same over RPC. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: Add some more test cases for TXT recordsGarming Sam2016-02-241-39/+71
| | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: Correct error code for formerly unrun testGarming Sam2016-02-241-1/+1
| | | | | | | | | | | Both Samba and Windows returned NXRRSET BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: restore formerly segfaulting testGarming Sam2016-02-241-26/+25
| | | | | | | | | | | | | This was on the client side, due the a strlen(NULL) on the previously DOS-encoded TXT field. With a new IDL structure, this segfault no longer exists. Note that both Samba and Windows return NXRRSET instead of FORMERR. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: Add a comment regarding odd Windows behaviourGarming Sam2016-02-241-0/+1
| | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: FORMERR can simply timeout against WindowsGarming Sam2016-02-241-10/+53
| | | | | | | | | | | | | | Two requests with identical parameters which are poorly formatted, can non-deterministically return FORMERR or simply fail to give a response. Setting the timeout to a number allows Windows to succeed. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: prepare script for further testingGarming Sam2016-02-241-6/+6
| | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: tests/dns: Modify dns tests to match new IDLGarming Sam2016-02-241-18/+20
| | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: dns.idl: make use of dnsp_hinfoStefan Metzmacher2016-02-241-8/+1
| | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: s4:dns_server: fix idl for dns_txt_recordStefan Metzmacher2016-02-245-39/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | From RFC 1035: 3.3.14. TXT RDATA format +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ / TXT-DATA / +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ where: TXT-DATA One or more <character-string>s. TXT RRs are used to hold descriptive text. The semantics of the text depends on the domain where it is found. Each record contains an array of strings instead of just one string. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: librpc: add ndr_dnsp_string_list_copy() helper functionStefan Metzmacher2016-02-242-0/+28
| | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: librpc: add RPC_NDR_DNSSERVER to dcerpc-samba libraryStefan Metzmacher2016-02-241-14/+4
| | | | | | | | | | | | RPC_NDR_DNSSERVER is the client interface NDR_DNSP contains just marshalling helpers. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2016-0771: s4:librpc: python_dns and python_dcerpc_dnsp doesn't require ↵Stefan Metzmacher2016-02-243-5/+5
| | | | | | | | | | | client bindings BUG: https://bugzilla.samba.org/show_bug.cgi?id=11686 BUG: https://bugzilla.samba.org/show_bug.cgi?id=11128 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* CVE-2015-7560: s3: torture3: Add new POSIX-SYMLINK-EA test.Jeremy Allison2016-02-243-1/+180
| | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: torture3: Add new POSIX-SYMLINK-ACL test.Jeremy Allison2016-02-243-1/+200
| | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: libsmb: Add SMB1-only POSIX cli_posix_setacl() functions. ↵Jeremy Allison2016-02-242-0/+111
| | | | | | | | | Needed for tests. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: libsmb: Rename cli_posix_getfaclXX() functions to ↵Jeremy Allison2016-02-243-19/+19
| | | | | | | | | cli_posix_getacl() as they operate on pathnames. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Refuse to set EA's on a symlink.Jeremy Allison2016-02-241-0/+5
| | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Silently return no EA's available on a symlink.Jeremy Allison2016-02-241-0/+9
| | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Set return values early, allows removal of code ↵Jeremy Allison2016-02-241-8/+5
| | | | | | | | | duplication. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Refuse to get a POSIX ACL on a symlink.Jeremy Allison2016-02-241-0/+7
| | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Refuse to set a POSIX ACL on a symlink.Jeremy Allison2016-02-241-0/+6
| | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Refuse to set an ACL from a POSIX file handle on a ↵Jeremy Allison2016-02-241-0/+6
| | | | | | | | | symlink. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Refuse to get an ACL from a POSIX file handle on a ↵Jeremy Allison2016-02-241-0/+7
| | | | | | | | | symlink. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* CVE-2015-7560: s3: smbd: Add refuse_symlink() function that can be used to ↵Jeremy Allison2016-02-241-0/+28
| | | | | | | | | prevent operations on a symlink. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* VERSION: Bump version up to 4.3.6...Karolin Seeger2016-02-241-2/+2
| | | | | | | and re-enable git snapshots. Signed-off-by: Karolin Seeger <kseeger@samba.org> (cherry picked from commit 150d1f6bde7140665185167310e685c4228e1b2d)
* VERSION: Disable git snapshots for the 4.3.5 release.samba-4.3.5Karolin Seeger2016-02-221-1/+1
| | | | Signed-off-by: Karolin Seeger <kseeger@samba.org>
* WHATSNEW: Add release notes for Samba 4.3.5.Karolin Seeger2016-02-221-2/+89
| | | | Signed-off-by: Karolin Seeger <kseeger@samba.org>
* ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped ..."Martin Schwenke2016-02-162-11/+0
| | | | | | | | | | | | | | | | | | | | | This is unnecessary in Samba >= 4.0 because winbindd monitors IP address itself and no longer needs to be told when they are dropped. The smbcontrol commands can hang if a node has recovery mode active because smbcontrol is unable to connect to the registry. Therefore, the smbcontrol commands should be removed. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11719 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Ralph Boehme <slow@samba.org> Autobuild-User(master): Ralph Böhme <slow@samba.org> Autobuild-Date(master): Wed Feb 10 14:08:17 CET 2016 on sn-devel-144 (cherry picked from commit 519564bb35a0f840bc4d7c8c5a92441c97b49791) Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-3-test): Tue Feb 16 12:13:06 CET 2016 on sn-devel-104
* lib/tsocket: workaround sockets not supporting FIONREADRalph Boehme2016-02-161-1/+61
| | | | | | | | | | | | | | | | | | | | Netlink sockets don't support querying pending bytes with ioctl(fd, FIONREAD, ...) and would return EOPNOTSUPP, so use recvmsg() with MSG_PEEK|MSG_TRUNC as a fallback. The MSG_TRUNC flag to recvmsg() is Linux only, but netlink is as well, so we're safe for now. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11714 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net> Autobuild-User(master): Ralph Böhme <slow@samba.org> Autobuild-Date(master): Wed Feb 10 10:30:24 CET 2016 on sn-devel-144 (cherry picked from commit 574313a1e11d521ba3f7232ff0b4186b49658199)
* param: Fix str_list_v3 to accept ; againVolker Lendecke2016-02-151-1/+17
| | | | | | | | | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Thu Feb 11 19:19:55 CET 2016 on sn-devel-144 https://bugzilla.samba.org/show_bug.cgi?id=11732 Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-3-test): Mon Feb 15 14:36:43 CET 2016 on sn-devel-104
* loadparm: Fix memory leak issue.Hemanth Thummala2016-02-151-1/+1
| | | | | | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11708 Signed-off-by: Hemanth Thummala <hemanth.thummala@nutanix.com> Reviewed-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Thu Feb 4 12:39:14 CET 2016 on sn-devel-144 (cherry picked from commit 8247d93701ed838190fe74044a63a56d63d37bf5)
* s3: smbd: posix_acls: Fix check for setting u:g:o entry on a filesystem with ↵Jeremy Allison2016-02-151-1/+38
| | | | | | | | | | | | | | | | | | | | | | no ACL support. Since 4.0.x we add 2 additional ACE entries, one SMB_ACL_USER and SMB_ACL_GROUP to match the existing SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ entries. The two additional entries break the simple "must have 3 entries" check done inside convert_canon_ace_to_posix_perms(). Replace this with a more complete test. Problem and initial fix provided by <tcleamy@ucdavis.edu> BUG: https://bugzilla.samba.org/show_bug.cgi?id=10489 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> Autobuild-User(master): Uri Simchoni <uri@samba.org> Autobuild-Date(master): Thu Feb 11 11:14:53 CET 2016 on sn-devel-144 (cherry picked from commit 5172bf0c5b0672c1479c2ad776460956aa469bca)
* s3:smbd:open: Skip redundant call to file_set_dosmode when creating a new file.Jose A. Rivera2016-02-151-2/+2
| | | | | | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11727 Signed-off-by: Jose A. Rivera <jarrpa@samba.org> Pair-programmed-with: Ira Cooper <ira@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Fri Feb 5 04:37:43 CET 2016 on sn-devel-144 (cherry picked from commit aec07b8b60ff9589a3c84eef6adeca464e6c01f6)
* docs-xml: fix typo in smbspool_krb5_wrapper manpage.Günther Deschner2016-02-091-1/+1
| | | | | | | | | | | Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> (cherry picked from commit 109164ed63ee76c4088f5df7ffb66740cac629c1) Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-3-test): Tue Feb 9 12:03:49 CET 2016 on sn-devel-104
* docs: Add smbspool_krb5_wrapper manpageAndreas Schneider2016-02-092-0/+65
| | | | | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11690 Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Karolin Seeger <kseeger@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Wed Feb 3 21:25:54 CET 2016 on sn-devel-144 (cherry picked from commit 4c54901102440ba9cbd96b349e95e3127415614a)
* python:tests/core: add tests for arcfour_encrypt() and string_to_byte_array()Stefan Metzmacher2016-02-051-0/+16
| | | | | | | | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=11699 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Wed Feb 3 11:42:29 CET 2016 on sn-devel-144 (cherry picked from commit 915185aa585a622d338698f847171972d1a15a21) Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-3-test): Fri Feb 5 13:10:00 CET 2016 on sn-devel-104
* s4:scripting/devel: make use of the generic arcfour_encrypt() and ↵Stefan Metzmacher2016-02-051-15/+3
| | | | | | | | | | string_to_byte_array() functions BUG: https://bugzilla.samba.org/show_bug.cgi?id=11699 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> (cherry picked from commit 8841b1e641e1b950c2f36b26db982473b73b9d3b)
* python:samba/netcmd/domain: make use of the generic arcfour_encrypt() and ↵Stefan Metzmacher2016-02-051-18/+5
| | | | | | | | | | string_to_byte_array() functions BUG: https://bugzilla.samba.org/show_bug.cgi?id=11699 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> (cherry picked from commit 452234b7bcdee2e0e3df6e0500ff798062bc5b9e)
* python:samba/join.py: make use of the generic arcfour_encrypt() and ↵Stefan Metzmacher2016-02-051-16/+3
| | | | | | | | | | string_to_byte_array() functions BUG: https://bugzilla.samba.org/show_bug.cgi?id=11699 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> (cherry picked from commit d5423feb4b3d388d2de8e1745a8f1138b42b64f5)
* python:samba: add a generic arcfour_encrypt() helper functionStefan Metzmacher2016-02-051-0/+16
| | | | | | | | | | | This works with Crypto.Cipher.ARC4 (from python*-crypto) and fallback to M2Crypto.RC4.RC4 (from [python*-]m2crypto). BUG: https://bugzilla.samba.org/show_bug.cgi?id=11699 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> (cherry picked from commit 078a7ae71081c24991bb34c818cc2c763eefad99)
* python:samba: add a generic string_to_byte_array() helper functionStefan Metzmacher2016-02-051-0/+8
| | | | | | | | | | We should avoid implementing this again and again. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11699 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> (cherry picked from commit 65127d16744763d0865ca9ce4d039866785e3fc7)
* ctdb-common: Use documented names for protocol family in socket()Amitay Isaacs2016-02-046-12/+12
| | | | | | | | | | | | | Instead of using PF_*, use AF_*. https://bugzilla.samba.org/show_bug.cgi?id=11705 Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Volker Lendecke <vl@samba.org> (cherry picked from commit 9f94620a308a3b17c1886c2c4807b34b8d5edacb) Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-3-test): Thu Feb 4 14:29:13 CET 2016 on sn-devel-104