summaryrefslogtreecommitdiff
path: root/source4
Commit message (Collapse)AuthorAgeFilesLines
* s4:ntvfs/pyposix_eadb: fix initposix_eadb() prototypeStefan Metzmacher2015-06-121-1/+1
| | | | | Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* s4:libcli/raw: make sure smbcli_transport_connect_send/recv correctly ↵Stefan Metzmacher2015-06-121-17/+42
| | | | | | | | | | | | | | cleanup on error We need to make sure that we remove any pending writev_send or read_smb_send request before closing the socket fd. As a side effect we always close the socket fd if we don't return success for any any reason. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11316 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* KCC: docstring for test_all_reps_from()Douglas Bagnall2015-06-121-0/+13
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: samba_kcc uses forced_local_dsa in import_ldifDouglas Bagnall2015-06-121-1/+2
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: test stub for KCC objectDouglas Bagnall2015-06-121-0/+12
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: write dot files in a deterministic, user specified placeDouglas Bagnall2015-06-121-8/+9
| | | | | | | | | | | We were using randomised tempfile names in /tmp, initially to avoid overwriting previous runs so as to track progress. Now we hardly ever care about the old versions, and a user-specified name will be handy for testing. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: switch samba_kcc over to samba.kcc moduleDouglas Bagnall2015-06-121-3121/+19
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: shift samba.ldif_utils to samba.kcc.ldif_import_exportDouglas Bagnall2015-06-121-6/+6
| | | | | | | | | These functions are really only of use for KCC, and they only import and export rather than be general utils. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: split kcc_utils into samba.kcc.{kcc_utils,graph}Douglas Bagnall2015-06-121-4/+5
| | | | | | | | | | | | | | | graph.py has the intersite graph stuff. kcc_utils does intrasite, namespace, &cetera. The wildcard imports are tidied up, so samba_kcc imports unix2nttime directly rather than letting it fall out of kcc_utils. Intersite graph functions samba/kcc/__init__.py are also shifted into graph.py. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: split and shift samba.graph_utils -> samba.kcc.{graph_utils,debug}Douglas Bagnall2015-06-121-1/+4
| | | | | | | | | | The debug module contains debug functions and colours. Graph_utils keeps the DOT file generation and graph verification code. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* s4-torture: call clusapi_CreateResEnum for all cluster resources.Günther Deschner2015-06-021-34/+48
| | | | | | | | | | Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Jun 2 05:16:00 CEST 2015 on sn-devel-104
* KCC: improve docstring for KCC.load_samdb()Douglas Bagnall2015-05-301-0/+6
| | | | | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sat May 30 23:55:22 CEST 2015 on sn-devel-104
* KCC: improve docstring for KCC.list_dsas()Douglas Bagnall2015-05-301-0/+10
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: slightly improve docstring for KCC.create_connection()Douglas Bagnall2015-05-301-2/+3
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.is_bridgehead_failed()Douglas Bagnall2015-05-301-1/+4
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: Slightly improve docstring for KCC.get_all_bridgeheads()Douglas Bagnall2015-05-301-3/+4
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: Slightly improve docstring for KCC.get_bridgehead()Douglas Bagnall2015-05-301-2/+4
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.load_all_partitions()Douglas Bagnall2015-05-301-3/+3
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.add_transports()Douglas Bagnall2015-05-301-0/+14
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.setup_graph()Douglas Bagnall2015-05-301-5/+11
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.translate_ntdsconn()Douglas Bagnall2015-05-301-2/+8
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.modify_repsFrom()Douglas Bagnall2015-05-301-8/+9
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.is_stale_link_connection()Douglas Bagnall2015-05-301-5/+9
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.merge_failed_links()Douglas Bagnall2015-05-301-3/+7
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring and comment for kcc.remove_unneeded_ntdsconn()Douglas Bagnall2015-05-301-3/+8
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.load_my_dsa()Douglas Bagnall2015-05-301-1/+2
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.load_my_site()Douglas Bagnall2015-05-301-3/+3
| | | | | | | | Separating :return: from :raise: Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.load_mysite()Douglas Bagnall2015-05-301-2/+2
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring and comments for KCC.load_site()Douglas Bagnall2015-05-301-4/+9
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.load_all_sitelinks()Douglas Bagnall2015-05-301-1/+2
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for KCC.load_all_transports()Douglas Bagnall2015-05-301-1/+2
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: docstring for the KCC classDouglas Bagnall2015-05-301-0/+6
| | | | | | | | The params describe the __init__ method arguments. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve docstring for is_smtp_replication_available()Douglas Bagnall2015-05-301-3/+6
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: docstring for sort_dsa_by_gc_and_guidDouglas Bagnall2015-05-301-0/+9
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: Docstring for sort_replica_by_dsa_guidDouglas Bagnall2015-05-301-0/+8
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: ldif_utils: ldif_to_samdb doesn't need creds; begin selftestDouglas Bagnall2015-05-301-1/+1
| | | | | | | | | | The tests are based on the testdata/ldif-utils-test-multisite.ldif which describes a multisite windows network. It was constructed by Garming Sam. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* kcc: translate over other DSA for repsFrom graphGarming Sam2015-05-301-0/+9
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* kcc: prevent non-determinism when running translationGarming Sam2015-05-301-7/+20
| | | | | | | | | RODC connections could appear first some runs while not always. This would mean that repsFrom could accidentally be deleted. Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: rename 'repsFrom_%s_all' graphs --> 'all-repsFrom_%s' for better sort orderDouglas Bagnall2015-05-291-1/+1
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: more debugging changesDouglas Bagnall2015-05-291-3/+4
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: (doc) explain intrasite max edge count a bit betterDouglas Bagnall2015-05-291-0/+8
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: pep8/flake8 fixes for samba_kccDouglas Bagnall2015-05-291-10/+12
| | | | | | | | | Also note a couple of unused variables. I am not removing them yet in case their intended use turns up. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: improve directed_double_ring graph checkDouglas Bagnall2015-05-291-1/+1
| | | | | | | | | | | | | | | The previous test assumed there would be only a double directed ring but in fact there could be other edges. In large graphs there are certain to be more edges. Now we want to be sure there is a complete ring apart from any other connections. This is called the Hamiltonian path problem and takes exponential time in general, so now our test is that it looks *quite* a lot like a complete ring. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: --test-all-reps-from uses same random seed for all DSAsDouglas Bagnall2015-05-291-2/+5
| | | | | | | | | Otherwise some of the links end up different for each KCC run. That is expected and proper, but it is confusing. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: RODCs are their own bridgeheadsDouglas Bagnall2015-05-291-0/+2
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: ignore non-IP transports more thoroughlyDouglas Bagnall2015-05-291-0/+4
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: don't create duplicate DSA objectsDouglas Bagnall2015-05-291-5/+4
| | | | | | | | load_site() returns the canonical site even if it didn't make it Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: Add more debugging and fix a commentDouglas Bagnall2015-05-291-2/+6
| | | | | | | | It seems I lost my train of thought in that comment. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: use 75% fewer lines to assign a Boolean to a variableDouglas Bagnall2015-05-291-4/+1
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* KCC: A woeful warning comment about the state of our codeDouglas Bagnall2015-05-291-0/+2
| | | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>