summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-11-17wafsamba: add samba_perl.py with SAMBA_CHECK_PERL() higher level check.Michael Adam2-0/+63
This checks for the perl binary, sets PERL and PERL_SPECIFIED as well es the PERL_ARCH_INSTALL_DIR and PERL_LIB_INSTALL_DIR. We want to avoid installing the perl modules outside the prefix. I.e. generally,the perl modules should be installed under "$prefix/share/perl5". This improves the fixes for bug #10472. The new strategy for automatically setting the paths is this: - if the prefix equals perl's vendorprefix, then - PERL_LIB_INSTALL_DIR is set to perl's vendorlib dir - PERL_ARCH_INSTALL_DIR is set to perl's vendorarch dir - otherwise: - PERL_LIB_INSTALL_DIR is set to ${DATADIR}/perl5 (usually ${PREFIX}/share/perl5) - PERL_ARCH_INSTALL_DIR is set to ${LIBDIR}/perl5 (usually ${PREFIX}/lib/perl5) BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 75c3e240e0703be8c86596e689e466b4dee5e85e)
2014-11-17dynconfig: implement PERL_ARCH_INSTALL_DIRMichael Adam1-0/+5
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 6ad678166c85f0eb90b76ccf842d1aa8dcb6b41a)
2014-11-17dynconfig: implement PERL_LIB_INSTALL_DIR.Michael Adam1-0/+5
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit e5d54c5841c003d55960458da29635b3656884df)
2014-11-17lib/ldb/wscript: pass dep_vars=['LDB_VERSION'] to SAMBA_GENERATOR()Stefan Metzmacher1-2/+1
bld.add_manual_dependency() only works for files not for environment variables. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit bb9a939e78d54a4b09f38d1f7cec1544239fef34)
2014-11-17docs-xml/wscript_build: pass dep_vars=bld.dynconfig_varnames() to ↵Stefan Metzmacher1-1/+1
SAMBA_GENERATOR() This avoids the use of always=True. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit de0443ac7690923fa1731560fa51a551711f37fe)
2014-11-17dynconfig/wscript: add dynconfig_varnames()Stefan Metzmacher1-0/+10
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 32ddd5b6559ad22b2ca84262c396dc889d661bab)
2014-11-17wafsamba: let SAMBA_BLDOPTIONS() use dep_vars=['defines'] instead of always=TrueStefan Metzmacher1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit a41a9ad0749755d612df81bb77384b4f479e1af2)
2014-11-17wafsamba: fix dependencies on environment variables for python_fixupStefan Metzmacher1-4/+1
We now checksum the sourcecode of copy_and_fix_python_path() and the env variables used by this function. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 7316653a82fea3dfe1ac8aa89003ce15836a11b9)
2014-11-17wafsamba: allow an optional dep_vars list to be passed to SAMBA_GENERATOR()Stefan Metzmacher1-1/+1
This can be used to checksum variables used in the rule function. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 04bb8ff7e6a3908b952d4d95edc2c7411611ac33)
2014-11-17wafsamba: fix dependency for SAMBA_GENERATOR() when passing vars!=NoneStefan Metzmacher1-4/+5
vars can only be a dictionary as that's the only thing bld.EXPAND_VARIABLES() accepts. We need to checksum the whole vars dictionary into the dependencies. We set task.env.SAMBA_GENERATOR_VARS = vars and add SAMBA_GENERATOR_VARS to the dep_vars. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit da8c76354549a64181cffc36e1c0bb0c6c4f87d3)
2014-11-17wafsamba: fix dependency calculation for SAMBA_GENERATOR()Stefan Metzmacher1-1/+2
We need to checksum the rule as string command of the sourcecode of the python function. This is stored in the 'ruledeps' envariable on the waf Task. See exec_rule() in wafadmin/TaskGen.py. dep_vars = getattr(self, 'dep_vars', ['ruledeps']) if dep_vars: tsk.dep_vars = dep_vars if isinstance(self.rule, str): tsk.env.ruledeps = self.rule else: # only works if the function is in a global module such as a waf tool tsk.env.ruledeps = Utils.h_fun(self.rule) If there's no 'dep_vars' it defaults to ['ruledeps']. As we pass our own 'dep_vars' we need to explicitly add 'ruledeps'. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit ee8fbbd41741e958e0ab6d7b9ab465d664abac60)
2014-11-17wafsamba: improve wording in a commentMichael Adam1-1/+1
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 210d7de34f953c308e5fa3db9506796ef2b21688)
2014-11-17wafsamba: remove unused variable from copy_and_fix_python_pathMichael Adam1-2/+0
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit ca06fac2c87d4abe884d2b6e3c1022266b06e287)
2014-11-17docs: Always declare rule to build parameters.all.xml and do it firstAndrew Bartlett2-13/+15
This ensures this file and the rule to generate it can always be found. Andrew Bartlett Change-Id: I76d9f4470e2678fc2df4e3a13642737128938f3a Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 2c86758b04515998c690f293fada2cc43116d764)
2014-11-17docs: define and include entities for the docsGarming Sam3-14/+46
This allows for dynamic default settings to be generated. Change-Id: If8b93d233fb941bc7e3073ccf4b5ec0b0a231bd9 Pair-programmed-with: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 57ba012c10fb21f261a3ab9136be05a694278df9)
2014-11-17docs: remove the file prefix from included path namesGarming Sam1-1/+1
This allows the inbuilt python xml modules to perform the include. Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 1d68b5b0bb3158cabcd371ab5c24392bcb0a32bd)
2014-11-17docs: update XInclude year to conform with current standardGarming Sam1-1/+1
This allows the inbuilt python XML parser to handle these includes. Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 02379369ef7968f297b8678c9743679b4775662e)
2014-11-17pdb_tdb: Fix a TALLOC/SAFE_FREE mixupVolker Lendecke1-1/+1
Signed-off-by: Volker Lendecke <vl@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=10932 invalid free in pdb_tdb
2014-11-17s3-keytab: fix keytab array NULL termination.Matt Rogers1-2/+1
Signed-off-by: Matt Rogers <mrogers@redhat.com> Reviewed-by: Guenther Deschner <gd@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 0de6799996955fbf8e19ace8c4b7b61f5a262cb5) BUG: https://bugzilla.samba.org/show_bug.cgi?id=10933 net ads join -k can segfault with existing keytab entries
2014-11-17spoolss: remove unused fill_job_info3()David Disseldorp1-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> (cherry picked from commit d772b98283f289917a6a8370808d4d0912899384)
2014-11-17spoolss: fix jobid in level 3 EnumJobs responseDavid Disseldorp1-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> (cherry picked from commit 5e7ab3d2f4f7950099561eb22d6a9a1536297442)
2014-11-17spoolss: fix jobid in level 2 GetJob and EnumJobs responsesDavid Disseldorp1-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> (cherry picked from commit 45abaf81c67b62bab571df208931241afa660802)
2014-11-17spoolss: fix jobid in level 1 GetJob and EnumJobs responsesDavid Disseldorp1-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> (cherry picked from commit 4d7f5d2af6ef6960dccaccf89c6e88947e2591bf)
2014-11-17spoolss: fix GetJob jobid lookupsDavid Disseldorp1-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> (cherry picked from commit 3a28ae56977235d3c9e3abcd1f24b220e536c50d)
2014-11-17printing: add jobid_to_sysjob helper functionDavid Disseldorp2-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> (cherry picked from commit 77b5be1742ee7aa2733a25bfa6a3af369f5c9401)
2014-11-09s3:smbd: fix file corruption using "write cache size != 0"Stefan Metzmacher1-0/+3
A client can: - open a handle (h1) - write some data to h1. - open a 2nd handle h2 (downgrades both handles to level II) - try to read the data on h2 (this gets old data) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10921 Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-1-test): Sun Nov 9 22:57:54 CET 2014 on sn-devel-104
2014-11-09s3: nmbd: Ensure NetBIOS names are only 15 characters stored.Jeremy Allison1-1/+9
This screws up if the name is greater than MAX_NETBIOSNAME_LEN-1 in the unix charset, but less than or equal to MAX_NETBIOSNAME_LEN-1 in the DOS charset, but this is so old we have to live with that. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10920 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> (cherry picked from commit 7467f6e72cba214eeca75c34e9d9fba354c7ef31) Signed-off-by: Andreas Schneider <asn@samba.org>
2014-11-09s3: libsmbclient - smb2. MacOSX 10 SMB2 server doesn't set ↵Jeremy Allison1-0/+14
STATUS_NO_MORE_FILES when handed a non-wildcard path. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Steve French <smfrench@gmail.com> Tested-by: Ralph Boehme <slow@samba.org> Autobuild-User(master): Steve French <sfrench@samba.org> Autobuild-Date(master): Thu Oct 23 20:44:31 CEST 2014 on sn-devel-104 (cherry picked from commit 95bf43bc6a0b6a4a47b8a556eee3b78446ea4123) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10904 smbclient loops doing a directory listing against Mac OS X 10 server with a non-wildcard path.
2014-11-09spoolss: fix handling of bad EnumJobs levelsDavid Disseldorp1-1/+6
Currently Samba is inconsistent when returning WERR_UNKNOWN_LEVEL errors for spoolss EnumJobs requests - if no print jobs are present, then WERR_OK will be returned, regardless of whether the EnumJobs level is supported or not. This change fixes this behaviour, by catching invalid or unsupported levels prior to the no-jobs response fast-path. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10898 Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Oct 28 03:05:35 CET 2014 on sn-devel-104 (cherry picked from commit d4f233a746d89e13aae78008b499c71b695ff882)
2014-11-09s3-nmbd: Fix netbios name truncation.Jeremy Allison1-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> (cherry picked from commit 6adcc7bffd5e1474ecba04d2328955c0b208cabc) Signed-off-by: Andreas Schneider <asn@samba.org>
2014-11-09There are tests all over the SMB1 code to check that srv_send_smb fails, but ↵Richard Sharpe1-1/+1
it never returns false. Even if the write to the socket/fd fails, we never return false and will keep reading stuff off of the input buffer until it is exhausted and then we will exit. Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Richard Sharpe <sharpe@samba.org> Autobuild-Date(master): Sat Aug 3 17:41:22 CEST 2013 on sn-devel-104 (cherry picked from commit 852c9ac34dbef66d0b2619554c611157c2fab771) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10880 S3: source3/smbd/process.c::srv_send_smb() returns true on the error path.
2014-11-09s3: daemons - ensure nmbd and winbindd are consistent in command line ↵Jeremy Allison2-1/+3
processing by adding POPT_COMMON_DYNCONFIG. Bug #10711 - nmbd fails to accept --piddir option. https://bugzilla.samba.org/show_bug.cgi?id=10711 Signed-off-by: Jeremy Allison <jra@samba.org>
2014-10-26vfs_glusterfs: Remove "integer fd" code and store the glfs pointers.Jose A. Rivera1-90/+32
Change-Id: I74347199e54be0d1dc031985534da1e56fd3e280 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> Reviewed-by: Christopher R. Hertel <crh@samba.org> Reviewed-by: Ira Cooper <ira@samba.org> The last 3 patches address bug #10889 (Backport remaining vfs_glusterfs patches in master/4.2 to 4.1). Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-1-test): Sun Oct 26 23:51:26 CET 2014 on sn-devel-104
2014-10-26vfs_glusterfs: smb_stat_ex_from_stat commenting and cleanup.Christopher R. Hertel1-13/+8
Change-Id: If1b54e62b4fc2240aa17e5d1eae8f279f2fdfc42 Signed-off-by: Christopher R. Hertel <crh@samba.org> Reviewed-by: Jose A. Rivera <jarrpa@redhat.com> Reviewed-by: Ira Cooper <ira@samba.org>
2014-10-26vfs_glusterfs: Comment the top of the file.Christopher R. Hertel1-8/+18
Change-Id: I98b512da2e0e56f061247a7c48ce576287b43827 Signed-off-by: Christopher R. Hertel <crh@samba.org> Reviewed-by: Jose A. Rivera <jarrpa@redhat.com> Reviewed-by: Ira Cooper <ira@samba.org>
2014-10-26nss_winbind: add getgroupmembership for FreeBSDBjörn Jacke1-1/+73
The getgroupmembership call on FreeBSD is needed for "winbind expand groups=0" (the new default in 4.2) to work. Thanks to Timur I. Bakeyev for the enhancement patch. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10835 Signed-off-by: Bjoern Jacke <bj@sernet.de> Reviewed-by: Volker Lendecke <vl@samba.org> (cherry picked from commit 8ccf5f66691e2bbf0883afa658282ef2ac60b015)
2014-10-25release samba 2:4.1.13+dfsg-2 to unstabledebian/2%4.1.13+dfsg-2Ivo De Decker1-2/+2
2014-10-25use samba.links to create systemd symlinkIvo De Decker3-4/+2
2014-10-24Disable samba init script on upgrade from wheezy to jessieIvo De Decker2-0/+9
2014-10-24Mask /etc/init.d/samba init script for systemdIvo De Decker3-0/+12
2014-10-21release samba 2:4.1.13+dfsg-1 to unstabledebian/2%4.1.13+dfsg-1Ivo De Decker1-2/+2
2014-10-21Bump standards version to 3.9.6 (no changes)Ivo De Decker2-1/+2
2014-10-21install libdnsserver_common.so.0Ivo De Decker1-0/+1
2014-10-21sort samba-libs.installIvo De Decker1-2/+2
2014-10-20update my email addressIvo De Decker1-1/+1
2014-10-20start changelog for 2:4.1.13+dfsg-1Ivo De Decker1-0/+6
2014-10-20Merge tag 'upstream/4.1.13+dfsg'Ivo De Decker225-1291/+3695
Upstream version 4.1.13+dfsg
2014-10-20Imported Upstream version 4.1.13+dfsgupstream/4.1.13+dfsgIvo De Decker225-1291/+3695
2014-10-20filter chm files from upstream tarballIvo De Decker1-1/+7
Avoid lintian error source-contains-prebuilt-ms-help-file
2014-10-20VERSION: Bump version up to 4.1.14...Karolin Seeger1-2/+2
and re-enable git snapshots. Signed-off-by: Karolin Seeger <kseeger@samba.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 00:23:14 +0000