summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* s3:locking: Introduce share_mode_forallVolker Lendecke2014-10-312-28/+68
| | | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
* s3:locking: Rename share_mode_forall->share_entry_forallVolker Lendecke2014-10-314-9/+9
| | | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
* libcli: Make sure status is initialized.Andreas Schneider2014-10-311-1/+1
| | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* torture: Make sure server_type isn't used uninitialized.Andreas Schneider2014-10-311-1/+1
| | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* s3-libsmb: Make sure the stat structure is initialized.Andreas Schneider2014-10-311-1/+1
| | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* s3-rpcclient: Make sure current_nt_hash is initialized.Andreas Schneider2014-10-311-1/+3
| | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* ctdb-includes: Reorder includes.h more logicallyMartin Schwenke2014-10-311-7/+8
| | | | | | | | | | | | For now replace.h needs to be before tdb.h, since tdb.h needs stdbool.h. This is fixed upstream but not yet in various packaged versions. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Fri Oct 31 03:46:40 CET 2014 on sn-devel-104
* ctdb-includes: Remove unused idtree.hMartin Schwenke2014-10-311-11/+0
| | | | | Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-includes: Clean up includes.hMartin Schwenke2014-10-311-21/+0
| | | | | | | | | | Remove unused #defines. CTDB doesn't use these. _PUBLIC_ is defined in replace.h anyway. Remove unnecessary #includes. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* build: fix check for subunit file when selftest prefix is givenMichael Adam2014-10-301-2/+3
| | | | | | | | Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Thu Oct 30 22:45:45 CET 2014 on sn-devel-104
* script: fix display of ten slowest tests if < 10 tests are run.Michael Adam2014-10-301-1/+1
| | | | | | | | | | | | | | | | | Note: $#array is the biggest index in an array in perl. @array evaluated in scalar context is the number of elements. Hence scalar(@array) = 1 + $#array Or equivalently: 0 + @array = 1 + $#array ... :-) Apart from this off-by-one error, the "unless" clause to trigger the capping of the number of tests listed was wrong. Hence if less then 10 tests were run, a number of blank lines were appended. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
* script/show_testsuite_time: error out if number argument is not a decimal numberMichael Adam2014-10-301-0/+3
| | | | | Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
* s3:loadparm: fix a comment typoMichael Adam2014-10-301-1/+1
| | | | | Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Ralph Böhme <slow@samba.org>
* selftest: only use Options.options.SELFTEST_PREFIX if it's not the defaultStefan Metzmacher2014-10-301-3/+6
| | | | | | | | | | | | | The --with-selftest-prefix option is typically specified as argument to './configure' ! Overwriting it for 'waf testonly' should only happen with an explicit 'waf testonly --with-selftest-prefix=/some/path'. This fixes a regression introduced by commit edc1cedf932de2bc068da9a5db844ac4c48f4324 (selftest: Actually honor --with-selftest-prefix). Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* selftest: Fake the hostname.Andreas Schneider2014-10-301-0/+5
| | | | | | | | | | This fixes the GetPrinterDataEx(DNSMachineName) test on some machines. Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Thu Oct 30 11:35:15 CET 2014 on sn-devel-104
* Don't drop any error codes just because we think there cannot be any errors ↵root2014-10-301-0/+3
| | | | | | | | | | we didn't think of if the user asked for a level 10 log. Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Oct 30 09:14:51 CET 2014 on sn-devel-104
* spoolss: remove unused fill_job_info3()David Disseldorp2014-10-301-21/+0
| | | | | | | | | This logic has been moved into the previous EnumJobs(level=3) caller. The info3 structure only contains two fields that are used, so it doesn't make sense to have a separate helper for it. Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* spoolss: fix jobid in level 3 EnumJobs responseDavid Disseldorp2014-10-301-23/+33
| | | | | | | | | | | | Until now, these responses have incorrectly carried the printing backend job identifier (sysjob), rather than the one allocated and returned by Samba on job submission. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10905 Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com> Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* spoolss: fix jobid in level 2 GetJob and EnumJobs responsesDavid Disseldorp2014-10-301-14/+36
| | | | | | | | | | | | Until now, these responses have incorrectly carried the printing backend job identifier (sysjob), rather than the one allocated and returned by Samba on job submission. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10905 Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com> Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* spoolss: fix jobid in level 1 GetJob and EnumJobs responsesDavid Disseldorp2014-10-301-12/+36
| | | | | | | | | | | | Until now, these responses have incorrectly carried the printing backend job identifier (sysjob), rather than the one allocated and returned by Samba on job submission. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10905 Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com> Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* spoolss: fix GetJob jobid lookupsDavid Disseldorp2014-10-301-5/+32
| | | | | | | | | | | | Clients issue GetJob requests using the jobid assigned by the spoolss server. The corresponding printing backend (sysjob) identifier needs to be resolved to locate the correct print queue entry. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10905 Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com> Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* printing: add jobid_to_sysjob helper functionDavid Disseldorp2014-10-302-18/+53
| | | | | | | | | | | | Samba needs to deal with two types of print job identifiers, those allocated by the printing backend (sysjob ids), and those allocated by Samba's spoolss server (jobids). This change adds a helper function to map spoolss jobids to sysjob ids, to go alongside the corresponding sysjob to jobid mapping function. Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* dns: Fix a compile warning by casting explicitlyKai Blin2014-10-302-5/+5
| | | | | Signed-off-by: Kai Blin <kai@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* dbwrap: Avoid "includes.h" in dbwrap_cache.cVolker Lendecke2014-10-301-3/+4
| | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* dbwrap: Add some required #includes to dbwrap.hVolker Lendecke2014-10-301-0/+3
| | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* lib: loadparm.h uses TALLOC_CTXVolker Lendecke2014-10-301-0/+1
| | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* dbwrap: Avoid an unnecessary #includeVolker Lendecke2014-10-301-5/+1
| | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* torture/spoolss: cleanup print_job_enum test jobsDavid Disseldorp2014-10-291-0/+10
| | | | | | | | | | | | Purge print queue on startup to ensure that the test is not affected by jobs queued for prior tests. Also, empty the queue at the end of the test to play nice with others. Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Wed Oct 29 14:31:52 CET 2014 on sn-devel-104
* s3-nmbd: Fix netbios name truncation.Jeremy Allison2014-10-291-8/+68
| | | | | | | | | Try and cope with truncation more intelligently. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10896 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
* autobuild: check whether ctdbd has been installed in the samba-ctdb targetMichael Adam2014-10-281-0/+1
| | | | | | | | | | An intermediate test until we have full runtime-tests. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Tue Oct 28 08:05:40 CET 2014 on sn-devel-104
* build: adapt comments for the clustering choiceMichael Adam2014-10-281-3/+1
| | | | | Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* build: further simplify --with-cluster-support case in configureMichael Adam2014-10-281-16/+1
| | | | | | | | includes were only built for the ctdb checks and they are now gone because we are building against included ctdb. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* autobuild: adapt samba-ctdb target does not need a separate ctdb build any moreMichael Adam2014-10-281-6/+1
| | | | | Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb: Rename CTDB_VERSION to CTDB_PROTOCOLAmitay Isaacs2014-10-288-21/+19
| | | | | | | CTDB_VERSION really is the ctdb protocol version. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
* build: Simplify check for building with ctdbAmitay Isaacs2014-10-282-22/+6
| | | | | Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
* build: Remove configure checks for ctdb headersAmitay Isaacs2014-10-284-106/+2
| | | | | Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
* ctdb: Rename ctdb socket variable from CTDB_PATH to CTDB_SOCKETAmitay Isaacs2014-10-285-7/+7
| | | | | Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
* build: Remove configure option --with-ctdb-dirAmitay Isaacs2014-10-281-8/+1
| | | | | Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
* build: Remove checks for ctdb featuresAmitay Isaacs2014-10-284-209/+0
| | | | | | | | Since we are always building with integrated CTDB, there is no need for these checks. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
* build: Remove configure option --enable-old-ctdbAmitay Isaacs2014-10-281-18/+6
| | | | | | | | CTDB source is now part of Samba tree and to enable clustering smbd should be built against included CTDB. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
* ctdb-logging: Add logging via UDP logging using RFC5424Martin Schwenke2014-10-284-4/+82
| | | | | | | | Some implementations may not understand RC3164 format messages on the UDP socket, so add support for RFC5424 message format. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Add logging via UDP to 127.0.0.1:514 to syslog backendMartin Schwenke2014-10-285-8/+98
| | | | | | | | | This has most of the advantages of the old logd with none of the complexity of the extra process. There are several good syslog implementations that can listen on the UDP port. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Add non-blocking Unix domain logging to syslog backendMartin Schwenke2014-10-284-8/+193
| | | | | | | Format messages as per RFC3164. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: New option CTDB_LOGGING, remove CTDB_LOGFILE, CTDB_SYSLOGMartin Schwenke2014-10-2815-75/+177
| | | | | | | | | | | | Remove --logfile and --syslog daemon options and replace with --logging. Modularise and clean up logging initialisation code. The initialisation API includes an app_name argument that is currently unused - this will be used in extensions to the syslog backend. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Replace logd code with a basic syslog(3) implementationMartin Schwenke2014-10-284-224/+10
| | | | | | | | | | | | | | It is much simpler for most cases to have a syslog backend that doesn't need a separate CTDB-specific logging daemon. This loses the lossy, non-blocking mode provided by logd. However, a corresponding feature with a completely different implemention (not requiring an extra daemon) will be re-added into the syslog backend. In an ideal world the new implementation would be added first but unfortunately that is hard to do because the logd code is hooked in at more than one place. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Simplify file logging timestamping with timeval_str_buf()Martin Schwenke2014-10-281-9/+7
| | | | | | | If nothing else, this is slightly more portable. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Separate out syslog and file logging backendsMartin Schwenke2014-10-287-294/+387
| | | | | | | | | This makes the code cleaner and allows the syslog backend to be easily modified without affecting other code. Also do some extra clean-up, including whitespace fixups. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Rework debug level parsingMartin Schwenke2014-10-285-49/+59
| | | | | | | | | | | | | Put declarations into ctdb_logging.h, factor out some common code, clean up #includes. Remove the check so see if the 1st character of the debug level is '-'. This is wrong, since it is trying to check for a negative numeric debug level (which is no longer supported) and would need to be handled in the else anyway. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Remove ctdb element from struct ctdb_log_stateMartin Schwenke2014-10-282-7/+3
| | | | | | | | This is set but otherwise not used. This allows the 1st argument to ctdb_set_logfile() to be generalised to a TALLOC_CTX. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-logging: Remove log member from struct ctdb_contextMartin Schwenke2014-10-282-13/+11
| | | | | | | | | This is only used by logging code and there is already a file-level variable for this. struct ctdb_context already contains too many things. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>