summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)AuthorFilesLines
2015-02-22Imported Upstream version 4.1.16+dfsgupstream/4.1.16+dfsgIvo De Decker3-4/+3
2014-11-24lib/util: use size_t for add_string_to_array().Günther Deschner2-2/+2
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
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-10-20Imported Upstream version 4.1.13+dfsgupstream/4.1.13+dfsgIvo De Decker16-26/+650
2014-10-19lib: util: Signal handling - change CatchChild() and CatchChildLeaveStatus() ↵Jeremy Allison2-6/+6
to return the previous handler. Bug #10831 - SIGCLD Signal handler not correctly reinstalled on old library code use - smbrun etc. https://bugzilla.samba.org/show_bug.cgi?id=10831 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Martin Schwenke <martin@meltin.net>
2014-09-26lib: Add daemon_status() to util library.Andreas Schneider2-0/+17
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10816 Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> (cherry picked from commit 9f5f5fa8ebf845c53b7a92557d7aec56ed820320)
2014-09-01s3: winbindd: Add new parameter "winbind request timeout" set to 60 seconds ↵Jeremy Allison2-0/+10
with man page. "This parameter specifies the number of seconds the winbindd daemon will wait before disconnecting either a client connection with no outstanding requests (idle) or a client connection with a request that has remained outstanding (hung) for longer than this number of seconds." Bug 3204 winbindd: Exceeding 200 client connections, no idle connection found https://bugzilla.samba.org/show_bug.cgi?id=3204 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ira Cooper <ira@samba.org>
2014-09-01lib: strings: Simplify strcasecmpVolker Lendecke1-35/+13
This makes us fallback to strcasecmp early if any INVALID_CODEPOINT appears. Without this patch we just continue to compare if both strings happen to have an INVALID_CODEPOINT in the same spot. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Bug: https://bugzilla.samba.org/show_bug.cgi?id=10716 smbd constantly crashes when filename contains non-ascii character
2014-09-01s4: tests: Added local.charset test for Bug 10716 - smbd constantly crashes ↵Jeremy Allison1-0/+12
when filename contains non-ascii character https://bugzilla.samba.org/show_bug.cgi?id=10716 Signed-off-by: Jeremy Allison <jra@samba.org>
2014-09-01lib: strings: Fix the behavior of strncasecmp_m_handle() in the face of bad ↵Jeremy Allison1-2/+27
conversions. When either string has a bad conversion, we fall back to doing raw ascii byte comparisons using strcasecmp(). This is wrong - we should fall back to strncasecmp. The problem is we've already stepped past the character that failed the conversion, so we're not re-testing those characters for comparison. This can have the effect of causing strncasecmp_m_handle() to report that two strings are identical when they are not, if the failed conversion takes place at the end of the string. The correct behavior is to step back to the point of the string(s) that failed the conversion, and continue the test from there. This is a litle trickier than the previous fix, as it requires converting the incoming n variable from remaining characters to compare to remaining bytes to compare. As bytes are always the smallest character size (1 byte) then it's safe to convert the remaining characters to check by decrementing the source string by the last character length (in bytes) and incrementing the remaining bytes to scan by the same value, then calling strncasecmp() with the stepped back strings remaining. Signed-off-by: Jeremy Allison <jra@samba.org>
2014-09-01lib: strings: Fix the behavior of strcasecmp_m_handle() in the face of bad ↵Jeremy Allison1-1/+11
conversions. When either string has a bad conversion, we fall back to doing raw ascii byte comparisons using strcasecmp(). The problem is we've already stepped past the character that failed the conversion, so we're not re-testing those characters for comparison. This can have the effect of causing strcasecmp_m_handle() to report that two strings are identical when they are not, if the failed conversion takes place at the end of the string. The correct behavior is to step back to the point of the string(s) that failed the conversion, and continue the test from there. Found by <lev@zadarastorage.com> when investigating bug 10716 - smbd constantly crashes when filename contains non-ascii character. Given the normal character set of utf-8, and an on disk filename of ISO-8859-1 of file-é on disk hex value: 66 69 6c 65 2d e9, an incoming open given the correct utf8 name of file-é will collide when it should not. Fixes: Bug 10716 - smbd constantly crashes when filename contains non-ascii character https://bugzilla.samba.org/show_bug.cgi?id=10716 Signed-off-by: Jeremy Allison <jra@samba.org>
2014-09-01lib: Remove unused nstrcpyVolker Lendecke1-5/+0
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Bug: https://bugzilla.samba.org/show_bug.cgi?id=10758 Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Mon Aug 4 09:58:16 CEST 2014 on sn-devel-104 Signed-off-by: Volker Lendecke <vl@samba.org>
2014-08-07sys_poll_intr: fix timeout arithmeticDaniel Kobras1-2/+12
Callers of sys_poll_intr() assume timeout to be in milliseconds like poll(2) expects, but implementation used nanosecond units. Also make sure timeout doesn't become infinite by mistake during time arithmetic. Signed-off-by: Daniel Kobras <d.kobras@science-computing.de> Reviewed-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Bug: https://bugzilla.samba.org/show_bug.cgi?id=10731 Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Jul 22 00:12:24 CEST 2014 on sn-devel-104
2014-08-07lib/util: move memcache.[ch] to the toplevel 'samba-util' libraryStefan Metzmacher3-1/+532
This is generic enough that it could be used in all code. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Fri Jul 18 15:43:33 CEST 2014 on sn-devel-104 (cherry picked from commit 45807028d478c082fef6f3a3d5a142d96d63fb50)
2014-08-07lib: tevent: make TEVENT_SIG_INCREMENT atomic.Jeremy Allison3-0/+36
On arm platforms incrementing a variable is not an atomic operation, so may be interrupted by signal processing (if a signal interrupts another signal handler). Use compiler built-ins to make this atomic. __sync_fetch_and_add() works on gcc, llvm, IBM xlC on AIX, and Intel icc (10.1 and above). atomic_add_32() works on Oracle Solaris. Based on an inital patch from kamei@osstech.co.jp. Bug #10640 - smbd is not responding - tevent_common_signal_handler() increments non-atomic variables https://bugzilla.samba.org/show_bug.cgi?id=10640 Back-ported from master 536c799f00d7bdd6a574b6bdbc0e9c742eeef8b5 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
2014-08-01fix unstrcpyVolker Lendecke1-1/+1
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Bug: https://bugzilla.samba.org/show_bug.cgi?id=10735 CVE-2014-3560: unstrcpy macro length is invalid
2014-07-31fix unstrcpyVolker Lendecke1-1/+1
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Bug: https://bugzilla.samba.org/show_bug.cgi?id=10735 CVE-2014-3560: unstrcpy macro length is invalid
2014-07-19ldb-samba: fix a memory leak in ldif_canonicalise_objectCategory()Stefan Metzmacher1-1/+6
Searches for '(objectCategory=Person)' will leak a ldb_dn structure on the ldb_context. These searches are typically used by Zarafa. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10469 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Thu Jul 17 00:51:57 CEST 2014 on sn-devel-104 (cherry picked from commit 8d33cddcb001a5a78aca036161d6223268274211) Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-1-test): Sat Jul 19 05:25:12 CEST 2014 on sn-devel-104
2014-07-15ldb:build: improve detection of srcdirMichael Adam1-1/+1
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com> (cherry picked from commit 09b991b79b28c9a88742e06021bb15997aba8988) The last 28 patches address bug #10693 - backport ldb-1.1.17 + changes from master.
2014-07-15ldb: make the successful ldb_transaction_start() message clearerAndrew Bartlett1-4/+8
Change-Id: I00d0705484c3b53f55c4a8ec2953e92329b7408e Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sat May 3 10:20:52 CEST 2014 on sn-devel-104 (cherry picked from commit d7c22d56d3f8be9b8293dd481fb450e3cf2343d3)
2014-07-15ldb: change version to 1.1.17Stefan Metzmacher3-1/+265
This adds some pyldb methods for ldb.Dn. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit 7f03a94ffa3752ccdb28cc50033b4e2a26e2b3f2)
2014-07-15ldb:pyldb: add some more helper functions for LdbDnStefan Metzmacher1-0/+112
This adds [g|s]et_component[|_name|_value]() and get_rdn_[name|value](). Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit 771d7b8c0df9240a9638dbf06a9f04431767bbb8)
2014-07-15ldb:pyldb: fix doc string for set_extended_component()Stefan Metzmacher1-1/+1
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit 094c39107c0abf4951e6f7012ac06b08cae1ea04)
2014-07-15ldb:pyldb: add some const to PyObject_FromLdbValue()Stefan Metzmacher1-1/+1
PyString_FromStringAndSize() makes a copy of the value... Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit aae9da9803dd551364bc3c096e06601bb1c9ed50)
2014-07-15ldb: Add a env variable to disable RTLD_DEEPBIND.Andreas Schneider1-6/+19
We need a way to disable this in order to allow the ldb_*ldap modules to work with a preloaded socket wrapper. The only known user is the bind_dlz module, but symbol versioniong might be enough... So in future we may remove this completely or at least invert the default behavior. Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 11e87cdbb694cf542f3b7633326005abd49e43f1)
2014-07-15ldb: pass module init errors back to the callerAndrew Bartlett1-2/+3
This makes provision errors clearer in Samba, as we can now get permission denied errors presented from LDB modules. Andrew Bartlett Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> (cherry picked from commit e76bbef8b796441985550c553db1ab48d6495709)
2014-07-15ldb: Return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS rather than OPERATIONS_ERROR ↵Andrew Bartlett1-2/+5
on EACCES and EPERM This makes provision errors clearer in Samba. Andrew Bartlett Reviewed-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> (cherry picked from commit 673d41503c6e391337df1b86e49108d58f1af6bd)
2014-07-15ldb: Fix 1138330 Dereference null return valueVolker Lendecke1-0/+4
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit e8b0726411213acb133a25c14ab42020e4a8de68)
2014-07-15lib/ldb fix compiler warningsChristian Ambach1-2/+2
about potentially uninitialized variables Signed-off-by: Christian Ambach <ambi@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 35b4ba0193d783d85283b07f520f0af8dc2c1260)
2014-07-15lib/ldb fix compiler warningsChristian Ambach1-2/+2
about potentially uninitialized variables Signed-off-by: Christian Ambach <ambi@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 9784ed9fb75022fcd7eaef24108ed8c6acf7f86f)
2014-07-15ldb: use of NULL pointer bugfixPavel Reichl1-2/+2
Autobuild-User(master): Simo Sorce <idra@samba.org> Autobuild-Date(master): Tue Dec 3 21:13:53 CET 2013 on sn-devel-104 (cherry picked from commit 4b637c367fdda832e95208f49e8893b0a0cac4b4)
2014-07-15ldb: Fix CID 241329 Array compared against 0Volker Lendecke1-1/+1
u.generate.remote_names is an array, not a pointer Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ira Cooper <ira@samba.org> (cherry picked from commit d2731ad5aae9f1fb8c1c6a65a61ef787e993b248)
2014-07-15ldb: Fix CID 240798 Uninitialized pointer readVolker Lendecke1-1/+1
Not called right now, because nobody tries multiple sort attributes. But if someone did, build_response would have looked at the uninitialized controls. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Oct 22 03:28:20 CEST 2013 on sn-devel-104 (cherry picked from commit 4e06c61b41fdde21fafaeee3c4fb3366744de9d9)
2014-07-15ldb:rdn_name: reject 'distinguishedName' depending of the MOD flagsStefan Metzmacher1-2/+8
This is what Windows 2008 R2 returns: LDB_MOD_ADD => LDB_ERR_UNWILLING_TO_PERFORM LDB_MOD_REPLACE => LDB_ERR_CONSTRAINT_VIOLATION LDB_MOD_DEL => LDB_ERR_UNWILLING_TO_PERFORM Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit d2ff474766ebb104309bf1e801c54ce0f8ea0a64)
2014-07-15s4-openldap: Remove use of talloc_reference in ldb_map_outbound.cNadezhda Ivanova1-9/+13
Instead of referencing the values array of the element to the new element, copy them, to avoid use of talloc_reference and remove a warning of talloc_steal with reference. The issue is only relevant when openldap backend is used. Signed-off-by: Nadezhda Ivanova <nivanova@symas.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 75705776929d87f1a694582261c07d1724574370)
2014-07-15Add LDB_MAP_RENDROP optionHoward Chu4-8/+23
Like LDB_MAP_RENAME, but drop the attribute if it occurs in an Add request. Used for distinguishedName attribute, is read-only and generated but for some bizarre reason AD allows it in an Add request. Signed-off-by: Howard Chu <hyc@symas.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Nadezhda Ivanova <nivanova@symas.com> (cherry picked from commit 93f3aba5e083976a791b982b2064b619800ce110)
2014-07-15Fix SEGV from improperly formed SUBSTRING/PRESENCE filterHoward Chu1-1/+1
Signed-off-by: Howard Chu <hyc@symas.com> Reviewed-by: Simo Sorce <idra@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Thu Sep 19 01:42:43 CEST 2013 on sn-devel-104 (cherry picked from commit d9bf88dc749cdbc34f70345b156b0117ecf2932b)
2014-07-15Cleanup map return codesHoward Chu1-18/+17
-1 was never a valid LDB return code, just use OPERATIONS_ERROR Signed-off-by: Howard Chu <hyc@symas.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Nadezhda Ivanova <nivanova@samba.org> Autobuild-Date(master): Tue Sep 17 07:51:45 CEST 2013 on sn-devel-104 (cherry picked from commit 6ed5b1c159867466e54a54a10adcc6c49a0a7837)
2014-07-15ldb: Show the type of failing operation in default error messageAndrew Bartlett1-1/+26
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 347b2c65a4b8c219cfdae3306fdc3d793980cbed)
2014-07-15ldb: Do not build libldb-cmdline when using system ldb.Jeroen Dekkers1-4/+4
Cleanup leftover include and linking of libldb-cmdline in oLschema2ldif. Do not build libldb-cmdline anymore when using the system ldb, oLschema2ldif was the only reason for building libldb-cmdline. Signed-off-by: Jeroen Dekkers <jeroen@dekkers.ch> Reviewed-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Tue Sep 10 12:52:26 CEST 2013 on sn-devel-104 (cherry picked from commit 0af09f0179c024099e0776d3794f4b3d7fb3f6f6)
2014-07-15ldb_map: Fix CID 1034791 Dereference null return valueVolker Lendecke1-0/+6
Add NULL checks Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit cb598ddab6935820975042a8a307c75dba9d7e31)
2014-07-15pyldb: Fix CID 1034792 Dereference null return valueVolker Lendecke1-0/+4
Add a NULL check Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit cbb5c1ce39640ffd01aeed6d87a57940e344792c)
2014-07-15ldb: Fix CID 1034793 Dereference null return valueVolker Lendecke1-0/+4
Add a proper NULL check Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit 15bd82550dab7a4709e92d639ee563dbc4780366)
2014-07-15ldb: Fix a const warningVolker Lendecke2-3/+3
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Simo Sorce <idra@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Sun Aug 18 10:26:27 CEST 2013 on sn-devel-104 (cherry picked from commit 06273504586733ac548ddadad6c7bc757d2d5e25)
2014-07-15pyldb: decrement ref counters on py_results and quiet warningsMatthieu Patou1-0/+4
Signed-off-by: Matthieu Patou <mat@matws.net> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Autobuild-User(master): Matthieu Patou <mat@samba.org> Autobuild-Date(master): Tue Aug 6 00:32:46 CEST 2013 on sn-devel-104 (cherry picked from commit 0602009b999142187d74b74be13de8c7f64c7b24)
2014-05-20lib-util: rename memdup to smb_memdup and fix all callers (bug #10556)Björn Baumbach2-2/+2
Signed-off-by: Björn Baumbach <bb@sernet.de> Reviewed-by: Volker Lendecke <vl@samba.org> (cherry picked from commit fae7e5d771d1c69bded1189b23335647023fa0f7) Conflicts: ctdb/lib/util/util.h Also renamed memdup() in source3/locking/brlock.c
2014-05-20add systemd integrationAlexander Bokovoy3-2/+49
Add --with-systemd / --without-systemd options to check whether libsystemd-daemon library is available and use it to report service startup status to systemd for smbd/winbindd/nmbd and AD DC. The problem it solves is correct reporting of the Samba services at the point when they are ready to serve clients, important for high availability software integration. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10517 Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> (cherry picked from commit 54b5d9a7384ae27b2a26586ff909128427c05abe)
2014-05-19byteorder: do not assume PowerPC is big-endianDavid Disseldorp1-4/+6
byteorder.h currently uses reverse-indexing ASM instructions for little endian multi-byte storage/retrieval on PowerPC. With Power8 this is an incorrect assumption, as it can be big or little endian. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10590 Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Christof Schmitt <cs@samba.org> (cherry picked from commit 5bf6ed5ebd0dc5ecdc5bcfb1d4720e9251849adc)
2014-04-01tevent: fix crash bug in tevent_queue_immediate_trigger()Stefan Metzmacher1-0/+4
Assume we we have a queue with 2 entries (A and B with triggerA() and triggerB()). If triggerA() removes itself tevent_queue_entry_destructor() will be called for A, this schedules the immediate event to call triggerB(). If triggerA() then also removes B by an explicit of implizit talloc_free(), q->list is NULL, but the immediate event is still scheduled and can't be unscheduled. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> (cherry picked from commit 7fe5584e2a59584431cb2ddf8a4da22bfb924454)
2014-03-10waf:lib/replace fix iconv checks on HP/UXChristian Ambach1-1/+1
we need to copy away the list of LDFLAGS to be tried before modifying it instead of just creating a new reference and then continuing with a modified list while it should have been reset back to the original value Bug: https://bugzilla.samba.org/show_bug.cgi?id=9911 Signed-off-by: Christian Ambach <ambi@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Thu Feb 13 02:01:03 CET 2014 on sn-devel-104 (cherry picked from commit 6a7c420a79cc1258528f152f4de9a0608767729f)