[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Wed Oct 25 23:21:02 UTC 2023


The branch, master has been updated
       via  704a615521c docs-xml: add manpage for wspsearch cli client
       via  a3a7a94ff43 s3/utils: Add search client
       via  387c9f3aa5f libcli/wsp: Add simple client api for wsp client code.
       via  47a0dc6fa6c add accessor for tstream_context
       via  2b2fdd5323c remove problematic include (seems to bring in conflicted definitions)
       via  8977d0a5bce librpc/wsp: Add some util functions needed for wsp client api
       via  86d43421806 libcli/wsp: Test AQS parser
       via  68ce6cf6845 librpc/wsp: Add functions to dump restriction as string
       via  b28fb85a1f8 libcli/wsp: Add support for simplified Advanced Query Syntax
       via  46b4a99bfe1 librpc/wsp: add some helper functions needed to support AQS
       via  ae9d9434de8 librpc/wsp: adjust the wsp property api to additionally use a csv file
       via  8188b37bf57 docs-xml: Add config param for defining extra wsp properties
       via  62f96d9c69a librpc/rpc: Add windows propertyset info and associated accessor and helper api.
       via  a3b25146805 s3/build: Add support for WSP in configure script.
       via  d766729cc2d librpc/idl: Add idl for WSP and also some required helper functions.
       via  180f25f7bb2 libcli/smb: add FSCTL_PIPE_WAIT
       via  a16f3f7e6ae libcli: Implement a tstream dcerpc_binding_handle
       via  8cc1e25a004 libcli/smb: Allow dynamic setting of the max_data in SMB Pipe transaction.
       via  53d87445543 s4/lib: remove packet_full_request_u16, not used anymore
       via  4d1088faea8 libcli/util: add struct tstream_context to tstream_read_pdu_blob_full_fn_t
       via  8800f4f8a3b libcli/util: add tstream_full_request_u32 and tstream_full_request_u16
       via  a50e3483783 codespellignore: ignore some spellings introduced with wsp files
       via  40b51535fcb third_party/heimdal_build: Fix spelling
       via  e3a440126f4 testdata: Fix spelling
       via  fef091b6393 script: Fix code spelling
       via  378aa653a5a s4:torture: Fix code spelling
       via  fc1fd9c656a s4:rpc_server: Fix code spelling
       via  7c9172543d4 s4:ntvfs: Fix code spelling
       via  46a4ce32abe s4:librpc: Fix code spelling
       via  c73456d7bd4 s4:lib: Fix code spelling
       via  2ac1d19d64b s4:kdc: Fix code spelling
       via  234b9529861 s4:dsdb: Fix code spelling
       via  b55049711ee s4:auth: Fix code spelling
       via  b9ea773f05c s3:utils: Fix code spelling
       via  61d5816ecd0 s3:smbd: Fix code spelling
       via  c5af0e1e674 s3:rpc_server: Fix code spelling
       via  1a670182f46 s3:passdb: Fix code spelling
       via  3890b12924a s3:libsmb: Fix code spelling
       via  1d6d21bdd86 s3:libads: Fix code spelling
       via  58ba1d4c19c s3:lib: Fix code spelling
       via  4cf3e4eb53e s3:auth: Add missing word to comment
       via  46f4dd3ea7b tests/krb5: Fix code spelling
       via  1ce4af01bd2 python:tests: Fix code spelling
       via  c36163c3157 pidl: Fix code spelling
       via  2dc6fab2ed6 librpc:ndr: Fix code spelling
       via  fb57dbe7013 security.idl: Fix code spelling
       via  093ce69e159 libcli: Fix code spelling
       via  47975ea8964 libcli/security: Fix code spelling
       via  53caed5ea38 lib/util: Fix comment
       via  1503589524f tevent: Fix code spelling
       via  82ec1965c86 talloc: Fix documentation
       via  97566f1b832 lib/fuzzing: Fix code spelling
       via  ee8820b6dc6 ldb: Fix code spelling
       via  f2c828340ae examples: Fix code spelling
       via  e3bc4d4ae03 docs-xml: Fix documentation
       via  984b3ab770b auth: Fix code spelling
       via  a1f5965f8da SECURITY.md: Fix spelling
       via  910467204f8 s4:kdc: Add device to Authenticated Users for RBCD conditions evaluation
       via  f48afb2ba71 s4:kdc: Add device to default groups for RBCD conditions evaluation
       via  5f0ebf08c77 tests/krb5: Add tests for group membership with RBCD
       via  49dca84731b tests/krb5: Add more tests of the device belonging to certain groups
       via  2543bc0453f selftest: Remove ubsan suppressions
       via  7c1492c50c7 s4:ntvfs: Avoid signed integer overflow
       via  ee239525822 s4:dsdb:tests: Remove unnecessary f‐strings
       via  a0c1c4691dc s3:passdb: Fix code formatting
       via  301cc80b287 s3:libads: Update code reference in comment
       via  d0c24a52f20 tests/krb5: Sort imports
       via  defeb3e6985 tests/krb5: Don’t pass parameters unnecessarily
       via  c750c1db7f2 python:tests: Remove unnecessary f‐strings
       via  17983427352 python: Remove unnecessary f‐strings
       via  b4de22a74d1 libcli/security: Fix leak on reallocation failure in conditional_ace_encode_binary()
       via  8f4c17e9b51 libcli/security: Fix leak on reallocation failure in pull_composite()
       via  04548bdbf23 .gitattributes: Treat file containing test SDDL as binary
       via  d7a6488da81 lib:param: Set a memory context for the globals if not initialized yet
       via  0e45a0cec95 s3:param: Make init_globals() public
       via  e30c404fb7a s3:param: Use the memory context we just created instead of tos
       via  49424f18b19 s3:param: Use a talloc stackframe in pyparam
       via  e24900ac895 s3:client: Call gfree_all() before exit in smbspool
       via  e48798cbb03 s3:client: Call gfree_all() before exit in smbclient
       via  4d411cf5cec s3:utils: Call gfree_all() before exit in smbtree
       via  643e0ae8761 s3:utils: Call gfree_all before exit in smbpasswd
       via  6aa56331212 s3:utils: Remove trailing white spaces in smbpasswd.c
       via  bbda37e4e3d s3:utils: Call gfree_all() before exit in smbget
       via  8a873f89773 s3:utils: Call gfree_all() before exit in smbfilter
       via  f849efebb84 s3:utils: Remove trailing white spaces in smbfilter.c
       via  2eee959fab6 s3:utils: Call gfree_all() before exit in smbcquotas
       via  6d482485ca9 s3:utils: Call gfree_all() before exit in smbcontrol
       via  9428fa3599a s3:utils: Call gfree_all() before exit in smbcacls
       via  d7a8e63f1db s3:utils: Call gfree_all() before exit in sharesec
       via  72add41e2a7 s3:utils: Call gfree_all() before exit in regedit
       via  66c76976150 s3:utils: Call gfree_all() before exit in pdbedit
       via  8482d46faba s3:utils: Call gfree_all() before exit in ntlm_auth
       via  0653f78bcc7 s3:utils: Call gfree_all() before exit in net
      from  3c4714bc834 s3:rpc_server: Correctly reset DEVMODE bit

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 704a615521cd90693009366fa8ae23a25210d119
Author: Noel Power <noel.power at suse.com>
Date:   Tue Oct 25 18:30:31 2022 +0100

    docs-xml: add manpage for wspsearch cli client
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Oct 25 23:20:33 UTC 2023 on atb-devel-224

commit a3a7a94ff4303f1c99c10d2dda4cea86574582e3
Author: Noel Power <noel.power at suse.com>
Date:   Thu Jul 21 16:53:17 2016 +0100

    s3/utils: Add search client
    
    Simple cli client for doing a basic windows search.
    
    example:
    
      wspsearch -U$(USER)%$(PASSWD) //$(SERVER)/$(SHARE) --search='DSC' --kind=Picture
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 387c9f3aa5fd71ece868ad02a9e65669b59ed8b6
Author: Noel Power <noel.power at suse.com>
Date:   Mon Oct 17 20:15:32 2022 +0100

    libcli/wsp: Add simple client api for wsp client code.
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 47a0dc6fa6c983bed65d2e950845ae47e1f4df64
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 23 12:06:02 2023 +0100

    add accessor for tstream_context
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2b2fdd5323cd5588e08c16953802a880bcab483e
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 23 11:28:21 2023 +0100

    remove problematic include (seems to bring in conflicted definitions)
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8977d0a5bce25a2a50f8d77f6997bb9b5282bad4
Author: Noel Power <noel.power at suse.com>
Date:   Tue Oct 25 11:30:03 2022 +0100

    librpc/wsp: Add some util functions needed for wsp client api
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 86d434218063cf0c982015be908681bd9fe91f12
Author: Noel Power <noel.power at suse.com>
Date:   Mon Oct 24 20:50:27 2022 +0100

    libcli/wsp: Test AQS parser
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 68ce6cf68457aa7f07bc9d9ee8c64906106783fb
Author: Noel Power <noel.power at suse.com>
Date:   Mon Oct 17 19:14:35 2022 +0100

    librpc/wsp: Add functions to dump restriction as string
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit b28fb85a1f88aa55db07a53eae32bd663a3e08d8
Author: Noel Power <noel.power at suse.com>
Date:   Wed Jun 29 11:29:54 2016 +0100

    libcli/wsp: Add support for simplified Advanced Query Syntax
    
    Add support to parse AQS-like (Advanced query syntax)
    
    AQS - see https://learn.microsoft.com/en-gb/windows/win32/search/-search-3x-advancedquerysyntax
    
    The basic (AQS) syntax is supported e.g. a query is built of a sequence of
    queries connected by AND, OR and NOT where the query elements are
    essentially restrictions defined by a property. There are some
    limitations on the operators supported[1] and additionally some things
    like enumerated ranges are not supported at all and range values are not
    delimited as specified [2]. Some special cases that you see in the
    windows search UI are exceptions [3] which are handled more or less as keywords
    
    Some examples:
    
    The following are all exactly the same query just expressed using
    different variations of the syntax
    
    'ALL:($<p403 OR $<p404) AND System.Kind:picture AND Scope:"FILE://somemachine/someshare" AND > System.Size:10241-102401'
    
    'ALL:$<p403 OR ALL:$<p404 AND System.Kind:picture AND Scope:"FILE://somemachine/someshare" AND > System.Size:>=10241 AND System.Size:<102401'
    
    'ALL:$<p403 OR ALL:$<p404 AND System.Kind:picture AND Scope:"FILE://somemachine/someshare" AND > System.Size:small'
    
    The queries above by default select the property System.ItemUrl as the
    one and only column returned, the query parameter however accepts a
    variation to the AQS like syntax to allow arbitrary columns to be
    selected e.g.
    
    'SELECT System.ItemName, System.ItemURL, System.Size WHERE ALL:$<p403 OR ALL:$<p404 AND System.Kind:picture AND Scope:"FILE://somemachine/someshare" AND System.Size:small'
    
    [1] supported operators
        -------------------
        =    Equals
        !=   Not Equals
        >    Greater than
        <    Less than
        >=   Greater than or equals
        <=   Less than or equals
    
        $=   equals
        $<   starts with
    [2] ranges are specified as value-value instead of value..value (seems
        my flex/bison skills are not good enough and couldn't get that to
        work with '..'
    
    [3] The windows UI has shortcut ranges (presumably represented as enumerated
        ranges) providing date ranges like 'today', 'tomorrow',
       'lastweek' etc. and similarly sizes like "empty, tiny, small, large..."
    
       These are supported (but implemented as keywords)
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 46b4a99bfe195122bd8684f9211cb3fb4f536baf
Author: Noel Power <noel.power at suse.com>
Date:   Mon Oct 17 14:20:49 2022 +0100

    librpc/wsp: add some helper functions needed to support AQS
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit ae9d9434de86c6011e77b6081433ccf72c7f9658
Author: Noel Power <noel.power at suse.com>
Date:   Tue Aug 29 15:01:03 2023 +0100

    librpc/wsp: adjust the wsp property api to additionally use a csv file
    
    We have definitions for a number of properties both from the WSP
    spec document and from those used by wireshark. These properties
    are built into samba (generated from csv files). This commit allows
    extra properties to be added on the fly in a custom csv file, the
    format of the csv file is the same as that used in the build. This
    allows us to add some 'unknown' properties on the fly, although we
    would hope that information regarding these properties would be
    incorporated into the build in due course.
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8188b37bf576f54bd58855ea97e02ba7c1096a7d
Author: Noel Power <noel.power at suse.com>
Date:   Thu Jan 12 14:39:09 2023 +0000

    docs-xml: Add config param for defining extra wsp properties
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 62f96d9c69aef4d7a7f0fc50996345bb1fb29d47
Author: Noel Power <noel.power at suse.com>
Date:   Thu May 7 15:09:32 2020 +0100

    librpc/rpc: Add windows propertyset info and associated accessor and helper api.
    
    wsp_util.c contains property definitions for well known windows
    properties that can be used with WSP. These properties are generated from
    some csv files (located in the librpc/wsp). The csv files themselves
    were generated from a couple of sources e.g. the [MS-WSP]:
    Windows Search Protocol document and wireshark mswsp dissector source code.
    
    for more details please see librpc/wsp/README
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit a3b25146805cd4aa893a12b3de9fc19c6b0ea756
Author: Noel Power <noel.power at suse.com>
Date:   Tue Jul 26 11:47:43 2016 +0100

    s3/build: Add support for WSP in configure script.
    
    Building wsp cli, tools should be controlled by
    specifying '--enable-wsp' Note: By default this option is not enabled
    as the is an experimental feature however it is enabled if configure
    is called with '--selftest'
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit d766729cc2ddc805ea4eca6b8d08e03149aaced5
Author: Noel Power <noel.power at suse.com>
Date:   Wed Dec 3 10:56:18 2014 +0000

    librpc/idl: Add idl for WSP and also some required helper functions.
    
    Represent the message data, structures and constants to do with the
    WSP (Windows Search Protocol) as idl.
    
    (see: https://msdn.microsoft.com/en-us/library/cc251767.aspx)
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 180f25f7bb2d89c8da0aa09797f35cd76c40bf7b
Author: Ralph Boehme <slow at samba.org>
Date:   Sat Sep 24 18:45:14 2016 -0700

    libcli/smb: add FSCTL_PIPE_WAIT
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit a16f3f7e6ae9ecdaaf15724f52ade748a77d882a
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Jun 29 12:47:18 2016 +0100

    libcli: Implement a tstream dcerpc_binding_handle
    
    This implements a dcerpc_binding_handle that does just pass request and
    response blob passing.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8cc1e25a00434de1afe5d9fb7f4f8e503e7fb0f5
Author: Noel Power <noel.power at suse.com>
Date:   Thu Jun 5 10:52:54 2014 +0100

    libcli/smb: Allow dynamic setting of the max_data in SMB Pipe transaction.
    
    Some services like WSP can send larger messages than the current 'Max Ioctl'
    limit, this results in the server producing a BUFFER_OVERFLOW status (and
    additionally clipping the message sent). Add support to allow a client to
    modify the hardcoded 'Max Ioctl' default value to allow the server to
    successfully send larger responses.
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 53d874455437ca3627062893cba1a2713d338f17
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Sep 20 18:05:19 2016 -0700

    s4/lib: remove packet_full_request_u16, not used anymore
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 4d1088faea8802af588218c98ae34e1700245806
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Sep 21 14:24:45 2016 -0700

    libcli/util: add struct tstream_context to tstream_read_pdu_blob_full_fn_t
    
    Add struct tstream_context to tstream_read_pdu_blob_full_fn_t and update
    all callers of tstream_read_pdu_blob_send() to use the correct callback.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8800f4f8a3b1fa4a1ded1e1a17d1de355f16ef25
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Sep 21 14:27:14 2016 -0700

    libcli/util: add tstream_full_request_u32 and tstream_full_request_u16
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit a50e34837830331b600252a15d8f4ae707c20520
Author: Noel Power <noel.power at suse.com>
Date:   Mon Aug 28 20:52:45 2023 +0100

    codespellignore: ignore some spellings introduced with wsp files
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 40b51535fcbb5c83f231a2d86c731397427be96a
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Aug 30 12:23:46 2023 +1200

    third_party/heimdal_build: Fix spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e3a440126f4128c347bdebbdc17cc35e7c60f70f
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 12:09:05 2023 +1200

    testdata: Fix spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit fef091b6393c34bb1118fca1d3d636a0563711b0
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 12:08:03 2023 +1200

    script: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 378aa653a5a8525a9c9185d52dc526ea268ca5e3
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Oct 9 12:09:01 2023 +1300

    s4:torture: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit fc1fd9c656a7d41960fc13429fe61772ed794d98
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 09:16:18 2023 +1200

    s4:rpc_server: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7c9172543d4dae4e73914ed957f2212f18cdd0e4
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Oct 6 11:42:30 2023 +1300

    s4:ntvfs: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 46a4ce32abe81a012282dbee66ad3f7ddc45aadf
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Sep 27 12:39:31 2023 +1300

    s4:librpc: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c73456d7bd48b2293f63d44e0ed6b2a563bbb2b8
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 09:16:04 2023 +1200

    s4:lib: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2ac1d19d64bc3bc22a10ed3330cde25b6ab31852
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Oct 17 11:21:00 2023 +1300

    s4:kdc: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 234b95298610da88dfcefdc51a416358baa77210
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Oct 9 12:48:15 2023 +1300

    s4:dsdb: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit b55049711ee3a72657acbb9dacce455b1bf881fc
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 08:08:03 2023 +1200

    s4:auth: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit b9ea773f05c929c2004b8dc90cc6fcced4c9c7f8
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 09:15:50 2023 +1200

    s3:utils: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 61d5816ecd030429aecbb731598f1d3657f8d118
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Oct 20 13:52:50 2023 +1300

    s3:smbd: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c5af0e1e674d4d04801389cfda665a16550e405b
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Oct 4 19:03:39 2023 +1300

    s3:rpc_server: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1a670182f463f9b20cf6dc435de2726a16386b1a
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Sep 27 12:39:03 2023 +1300

    s3:passdb: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 3890b12924a29578616ae410951bb7130975f704
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Sep 11 12:51:16 2023 +1200

    s3:libsmb: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1d6d21bdd865d8af010abb0baeac9ae4c6a4f6bd
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Thu Sep 21 13:47:37 2023 +1200

    s3:libads: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 58ba1d4c19cb4f9954a5f1bc0583e7e59316a3c5
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 12:08:10 2023 +1200

    s3:lib: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 4cf3e4eb53e7fdedf155c356d36e35aebf75ef2e
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Sep 19 17:02:17 2023 +1200

    s3:auth: Add missing word to comment
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 46f4dd3ea7ba28567128c9332eb91864f5d948eb
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 12:27:48 2023 +1200

    tests/krb5: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1ce4af01bd291a8200bbbd86dc4ae421bc38f9a0
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Oct 16 16:08:45 2023 +1300

    python:tests: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c36163c31575617fec1b9e6699be1a7554561c17
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Thu Sep 21 10:08:37 2023 +1200

    pidl: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2dc6fab2ed66ad598adf9fc890b1030810167b0b
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Sep 20 17:41:43 2023 +1200

    librpc:ndr: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit fb57dbe70133b2f9e2c39ad873ec6cb67283b583
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Sep 19 16:52:05 2023 +1200

    security.idl: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 093ce69e15904821fdfe845c451c20086a25030d
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 12:04:20 2023 +1200

    libcli: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 47975ea8964411d7e372fbe2dee34d33f7ed9799
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Jul 31 10:14:48 2023 +1200

    libcli/security: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 53caed5ea38a5d82c459916aaf215463a37ef028
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Thu Sep 21 12:15:23 2023 +1200

    lib/util: Fix comment
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1503589524f5ef171b6eefc13dfbf289edd4adfc
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Sep 18 15:24:45 2023 +1200

    tevent: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 82ec1965c86909af111ddebc4d25743f24cf103f
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Thu Oct 5 13:58:04 2023 +1300

    talloc: Fix documentation
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 97566f1b832c7908f6a1650c8c4f5deccbb59e70
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Sep 20 15:54:49 2023 +1200

    lib/fuzzing: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit ee8820b6dc604368f95d647cace0647da9ee7e35
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Oct 16 16:08:04 2023 +1300

    ldb: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit f2c828340aef2e9c889474d9ed006cbb943eb731
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Oct 6 12:35:52 2023 +1300

    examples: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e3bc4d4ae03e9a1375b2f5d929575808954e71c3
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Oct 11 11:47:32 2023 +1300

    docs-xml: Fix documentation
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 984b3ab770b7a879520647bd3edecb6ac9d9a562
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Sep 22 08:07:45 2023 +1200

    auth: Fix code spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit a1f5965f8daf60ff606614d4eed1feb3a4314737
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Oct 10 10:46:02 2023 +1300

    SECURITY.md: Fix spelling
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 910467204f8872b1305ec8698f41b2ff4524a8a3
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Oct 25 15:10:48 2023 +1300

    s4:kdc: Add device to Authenticated Users for RBCD conditions evaluation
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit f48afb2ba71595d49c444a36453b1ef1f5bbb340
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Oct 25 14:56:41 2023 +1300

    s4:kdc: Add device to default groups for RBCD conditions evaluation
    
    This means that expressions like ‘Device_Member_of(WD)’ will now work,
    as they should.
    
    It *also* means that expressions like ‘Device_Member_of(NU)’ will work,
    even though they shouldn’t. This is because we consider SID_NT_NETWORK
    to be a default group.
    
    Our new behaviour may be wrong, but at least it’s now consistent with
    the behaviour of user‐relative expressions like ‘Member_of(WD)’ and
    ‘Member_of(NU)’.
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 5f0ebf08c778caecc0ae313f7a8703c392d81762
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Oct 25 15:09:54 2023 +1300

    tests/krb5: Add tests for group membership with RBCD
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 49dca84731b0e5f045caf7bc73be6f521e735555
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Oct 25 14:59:27 2023 +1300

    tests/krb5: Add more tests of the device belonging to certain groups
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2543bc0453ff42efd4d29088df0075d39e7954ba
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Oct 24 16:47:56 2023 +1300

    selftest: Remove ubsan suppressions
    
    These instances of undefined behaviour ought now to be fixed.
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7c1492c50c7b8507077c7993510c8ac9b9cc4c65
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Sep 4 16:49:48 2023 +1200

    s4:ntvfs: Avoid signed integer overflow
    
    Signed integer overflow is undefined behaviour.
    
    ubsan reports errors similar to the following:
    signed integer overflow: 9223372036854775807 + 2147483682 cannot be represented in type 'long int'
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit ee23952582224463c1293e7e0c92613596205e79
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Oct 24 16:33:36 2023 +1300

    s4:dsdb:tests: Remove unnecessary f‐strings
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit a0c1c4691dc394bcf407e0086fc4a6339ee2af59
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Sep 27 12:39:14 2023 +1300

    s3:passdb: Fix code formatting
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 301cc80b287e4fa802a37213fb5065ea43caf184
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Thu Sep 21 13:48:07 2023 +1200

    s3:libads: Update code reference in comment
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit d0c24a52f2064d97fb3f2d22ce6f77a2ebd85df0
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Oct 24 17:11:23 2023 +1300

    tests/krb5: Sort imports
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit defeb3e69859bba7565618f2255d7fd55d75fef1
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Oct 24 17:08:46 2023 +1300

    tests/krb5: Don’t pass parameters unnecessarily
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c750c1db7f2e9127efac978aa0490015eb3c24d7
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Tue Oct 24 16:32:31 2023 +1300

    python:tests: Remove unnecessary f‐strings
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 17983427352fa28f7b5d17ccc84fede73b6e7e22
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Mon Oct 2 16:03:59 2023 +1300

    python: Remove unnecessary f‐strings
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit b4de22a74d1a124af45ce0ec336b61b04a73ed97
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Sep 20 15:04:14 2023 +1200

    libcli/security: Fix leak on reallocation failure in conditional_ace_encode_binary()
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8f4c17e9b519b5f021d3e0d589c2ad2bdd2bb2ac
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Wed Sep 20 15:03:28 2023 +1200

    libcli/security: Fix leak on reallocation failure in pull_composite()
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 04548bdbf2368f7a6da4bd964a92ed24f2c7c38c
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Fri Aug 18 11:47:05 2023 +1200

    .gitattributes: Treat file containing test SDDL as binary
    
    This file contains some very long lines that can make it hard to grep
    for things from the terminal.
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit d7a6488da81e6c48c435b8bedc8a38dbf87eb796
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Sep 5 10:07:59 2023 +0200

    lib:param: Set a memory context for the globals if not initialized yet
    
    Typically once the smb.conf starts to be loaded,
    loadparm_s3_init_globals() will be called and a memory context for
    strings on the static Globals will be created.  But we might call
    lpcfg_set_cmdline() before we load the smb.conf file, so we (via a
    helper pointer) call loadparm_s3_init_globals() to get that
    initialisation done earlier, ensuring that all allocations on Globals is
    done on a memory context that we can later TALLOC_FREE() before exit().
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0e45a0cec95da4173bfaf2084cf13fa5b84c4fde
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:43:15 2023 +0200

    s3:param: Make init_globals() public
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e30c404fb7a278adfac73c623969015de499a853
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 25 12:15:09 2023 +0200

    s3:param: Use the memory context we just created instead of tos
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 49424f18b193ad3ac17f4bee8cc866213d8481d6
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 25 12:26:44 2023 +0200

    s3:param: Use a talloc stackframe in pyparam
    
    Several parts of the code use talloc_tos() requiring a stackframe to be
    present. This is needed as loadparm_init_s3() will call init_globals()
    later.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e24900ac89500e515a46324239a61b73203e6454
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:05:56 2023 +0200

    s3:client: Call gfree_all() before exit in smbspool
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e48798cbb038f05a24bcabf7dce5826210dfd31e
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:54:00 2023 +0200

    s3:client: Call gfree_all() before exit in smbclient
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 4d411cf5cecd4e584f500335310164ed22c199d7
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:04:19 2023 +0200

    s3:utils: Call gfree_all() before exit in smbtree
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 643e0ae87617a4fa5f0ec8d1674f25c73e1f9f14
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:54:47 2023 +0200

    s3:utils: Call gfree_all before exit in smbpasswd
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 6aa56331212e9c739b389f1eecd124d3bfcfa54b
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:56:24 2023 +0200

    s3:utils: Remove trailing white spaces in smbpasswd.c
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit bbda37e4e3d3dad3edcc50331f93332dc5e25619
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:03:40 2023 +0200

    s3:utils: Call gfree_all() before exit in smbget
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8a873f89773dfef58ff7f3e846c942d22421d0c2
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:03:12 2023 +0200

    s3:utils: Call gfree_all() before exit in smbfilter
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit f849efebb84b1b0d4bd6d0084ea699f0002792be
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:02:50 2023 +0200

    s3:utils: Remove trailing white spaces in smbfilter.c
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2eee959fab6a144eb3b3fde218781705df8899b6
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:01:58 2023 +0200

    s3:utils: Call gfree_all() before exit in smbcquotas
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 6d482485ca9254713fa8953f94de5dd58083efbc
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:01:24 2023 +0200

    s3:utils: Call gfree_all() before exit in smbcontrol
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 9428fa3599a28a9bfe5fa9a2b29e668320d84c65
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:00:46 2023 +0200

    s3:utils: Call gfree_all() before exit in smbcacls
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit d7a8e63f1db629614e4672dec8f9e51251981f36
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 12:00:16 2023 +0200

    s3:utils: Call gfree_all() before exit in sharesec
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 72add41e2a72ffa4b7bac01af650d08d10dfb001
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:59:35 2023 +0200

    s3:utils: Call gfree_all() before exit in regedit
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 66c76976150666246e9d2fadb47ca417ecc041ed
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:58:49 2023 +0200

    s3:utils: Call gfree_all() before exit in pdbedit
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8482d46faba020c442b161d937d034fd1d444605
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:58:10 2023 +0200

    s3:utils: Call gfree_all() before exit in ntlm_auth
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0653f78bcc79842fbe53a7022cd221cd86c512d6
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 24 11:57:14 2023 +0200

    s3:utils: Call gfree_all() before exit in net
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 .codespellignore                                   |    3 +
 .gitattributes                                     |    1 +
 SECURITY.md                                        |    2 +-
 auth/gensec/gensec_start.c                         |    6 +-
 auth/kerberos/kerberos_pac.c                       |    8 +-
 ctdb/doc/ctdb-tunables.7.xml                       |    2 +-
 docs-xml/manpages/rpcclient.1.xml                  |    2 +-
 docs-xml/manpages/smbcacls.1.xml                   |    2 +-
 docs-xml/manpages/wspsearch.1.xml                  |  190 ++
 docs-xml/smbdotconf/misc/wspproperties.xml         |   55 +
 .../security/aclflaginheritedcanonicalization.xml  |    2 +-
 examples/VFS/shadow_copy_test.c                    |    2 +-
 lib/fuzzing/oss-fuzz/do_build.sh                   |    2 +-
 lib/ldb/common/ldb_modules.c                       |    4 +-
 lib/ldb/ldb_key_value/ldb_kv.c                     |    4 +-
 lib/ldb/ldb_key_value/ldb_kv_index.c               |    2 +-
 lib/ldb/ldb_tdb/ldb_tdb.c                          |   12 +-
 lib/ldb/tests/ldb_mod_op_test.c                    |    2 +-
 lib/param/loadparm.c                               |   14 +-
 lib/param/s3_param.h                               |    1 +
 lib/talloc/talloc.h                                |    2 +-
 lib/tevent/tevent.h                                |    4 +-
 lib/util/util_process.c                            |    2 +-
 libcli/ldap/ldap_message.c                         |    5 +-
 libcli/ldap/ldap_message.h                         |    6 +-
 libcli/security/claims-conversions.c               |    2 +-
 libcli/security/conditional_ace.c                  |   37 +-
 libcli/security/sddl_conditional_ace.c             |    8 +-
 .../tests/data/export-sddl-fuzz-seeds-as-json      |    4 +-
 libcli/security/tests/test_run_conditional_ace.c   |    6 +-
 libcli/security/tests/test_sddl_conditional_ace.c  |    2 +-
 .../security/tests/windows/windows-sddl-tests.py   |    4 +-
 libcli/security/util_sid.c                         |    2 +-
 libcli/smb/smb2cli_ioctl.c                         |  129 ++
 libcli/smb/smbXcli_base.h                          |   18 +
 libcli/smb/tstream_smbXcli_np.c                    |   25 +-
 libcli/smb/tstream_smbXcli_np.h                    |    3 +
 libcli/smb/wscript                                 |    2 +-
 .../tstream_binding_handle.c                       |  341 ++++
 .../tstream_binding_handle.h                       |   25 +-
 libcli/tstream_binding_handle/wscript_build        |    5 +
 libcli/util/nterr.c                                |    2 +-
 libcli/util/ntstatus.h                             |    4 +-
 libcli/util/tstream.c                              |   30 +-
 libcli/util/tstream.h                              |   32 +-
 libcli/wsp/test_wsp_parser.c                       |  402 ++++
 libcli/wsp/wscript_build                           |   41 +
 libcli/wsp/wsp_aqs.c                               |  877 ++++++++
 libcli/wsp/wsp_aqs.h                               |  166 ++
 libcli/wsp/wsp_aqs_lexer.l                         |  152 ++
 libcli/wsp/wsp_aqs_parser.y                        |  422 ++++
 librpc/idl/ioctl.idl                               |   12 +
 librpc/idl/security.idl                            |    2 +-
 librpc/idl/wscript_build                           |    2 +
 librpc/idl/wsp.idl                                 | 1345 ++++++++++++
 librpc/idl/wsp_data.idl                            |  308 +++
 librpc/ndr/ndr_compression.c                       |    4 +-
 librpc/wscript_build                               |   24 +-
 librpc/wsp/README                                  |   50 +
 librpc/wsp/allprops-from-ms-wsp-spec.csv           |  423 ++++
 librpc/wsp/extra-props.csv                         |   63 +
 .../lib/version_test.c => librpc/wsp/wsp_helper.c  |   26 +-
 .../lib/util_cluster.h => librpc/wsp/wsp_helper.h  |   17 +-
 librpc/wsp/wsp_util.c                              |  919 +++++++++
 librpc/wsp/wsp_util.h                              |   89 +
 pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm            |    4 +-
 pidl/lib/Parse/Pidl/Samba4/NDR/ServerCompat.pm     |    4 +-
 python/samba/functional_level.py                   |    2 +-
 python/samba/netcmd/delegation.py                  |    4 +-
 python/samba/tests/dns_packet.py                   |    4 +-
 python/samba/tests/krb5/authn_policy_tests.py      |    6 +-
 python/samba/tests/krb5/compatability_tests.py     |    6 +-
 python/samba/tests/krb5/conditional_ace_tests.py   |  252 +++
 python/samba/tests/krb5/device_tests.py            |    2 -
 python/samba/tests/krb5/s4u_tests.py               |    4 +-
 python/samba/tests/samba_tool/domain_auth_silo.py  |    2 +-
 python/samba/tests/samba_tool/domain_claim.py      |    2 +-
 script/attr_count_read                             |    4 +-
 selftest/knownfail_heimdal_kdc                     |    2 +
 selftest/knownfail_mit_kdc                         |   22 +
 selftest/tests.py                                  |    2 +
 selftest/ubsan.supp                                |    6 -
 source3/auth/token_util.c                          |    2 +-
 source3/client/client.c                            |    2 +
 source3/client/smbspool.c                          |    2 +-
 source3/lib/adouble.c                              |    2 +-
 source3/lib/smbldap.c                              |    2 +-
 source3/lib/tldap.c                                |    8 +-
 source3/libads/kerberos.c                          |    4 +-
 source3/libsmb/pylibsmb.c                          |    2 +-
 source3/param/loadparm.c                           |    9 +-
 source3/param/loadparm.h                           |    4 +
 source3/param/loadparm_ctx.c                       |    3 +-
 source3/param/pyparam.c                            |   15 +-
 source3/passdb/pdb_ldap.c                          |    7 +-
 source3/passdb/pdb_nds.c                           |    8 +-
 source3/rpc_client/rpc_transport.h                 |    3 +-
 source3/rpc_client/rpc_transport_tstream.c         |    8 +
 source3/rpc_client/wsp_cli.c                       | 2157 ++++++++++++++++++++
 source3/rpc_client/wsp_cli.h                       |  114 ++
 source3/rpc_server/mdssvc/es_mapping.c             |    2 +-
 source3/rpc_server/rpc_host.c                      |    2 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |   18 +-
 source3/smbd/smbXsrv_client.c                      |    2 +-
 source3/smbd/smbXsrv_tcon.c                        |    2 +-
 source3/utils/net.c                                |    3 +
 source3/utils/ntlm_auth.c                          |    2 +-
 source3/utils/pdbedit.c                            |    1 +
 source3/utils/regedit.c                            |    2 +
 source3/utils/sharesec.c                           |    1 +
 source3/utils/smbcacls.c                           |    1 +
 source3/utils/smbcontrol.c                         |    1 +
 source3/utils/smbcquotas.c                         |    1 +
 source3/utils/smbfilter.c                          |    9 +-
 source3/utils/smbget.c                             |    1 +
 source3/utils/smbpasswd.c                          |   31 +-
 source3/utils/smbtree.c                            |   11 +-
 source3/utils/wscript_build                        |   17 +
 source3/utils/wspsearch.c                          |  820 ++++++++
 source3/wscript                                    |    9 +
 source3/wscript_build                              |    6 +
 source4/auth/kerberos/kerberos_util.c              |    2 +-
 source4/dns_server/dns_server.c                    |    8 +-
 source4/dsdb/repl/drepl_partitions.c               |    2 +-
 source4/dsdb/samdb/ldb_modules/partition.c         |    2 +-
 source4/dsdb/samdb/ldb_modules/password_hash.c     |    2 +-
 source4/dsdb/tests/python/acl.py                   |   12 +-
 source4/kdc/db-glue.c                              |    7 +-
 source4/kdc/kdc-proxy.c                            |    2 +-
 source4/kdc/kdc-server.c                           |   12 +-
 source4/kdc/mit_samba.c                            |    2 +-
 source4/ldap_server/ldap_server.c                  |    4 +-
 source4/lib/stream/packet.c                        |   12 -
 source4/lib/stream/packet.h                        |    1 -
 source4/lib/tls/tls_tstream.c                      |    2 +-
 source4/libcli/wrepl/winsrepl.c                    |    2 +-
 source4/librpc/rpc/dcerpc_schannel.c               |    4 +-
 source4/ntp_signd/ntp_signd.c                      |    8 +-
 source4/ntvfs/posix/pvfs_dirlist.c                 |   12 +-
 source4/ntvfs/posix/pvfs_resolve.c                 |    4 +-
 source4/rpc_server/backupkey/dcesrv_backupkey.c    |    6 +-
 source4/rpc_server/drsuapi/getncchanges.c          |    6 +-
 source4/scripting/bin/gen_wsp_props.py             |  201 ++
 source4/torture/drs/python/getncchanges.py         |    2 +-
 source4/torture/drs/python/repl_secdesc.py         |    4 +-
 source4/torture/ntp/ntp_signd.c                    |    2 +-
 source4/torture/raw/lookuprate.c                   |    2 +-
 source4/torture/raw/oplock.c                       |    4 +-
 source4/torture/rpc/forest_trust.c                 |    2 +-
 source4/torture/rpc/netlogon.c                     |    6 +-
 source4/torture/rpc/samlogon.c                     |    4 +-
 source4/torture/smb2/multichannel.c                |    6 +-
 source4/wrepl_server/wrepl_in_connection.c         |   10 +-
 testdata/compression/README                        |    4 +-
 third_party/heimdal_build/config.h                 |    2 +-
 wscript_build                                      |    2 +
 156 files changed, 10060 insertions(+), 285 deletions(-)
 create mode 100644 docs-xml/manpages/wspsearch.1.xml
 create mode 100644 docs-xml/smbdotconf/misc/wspproperties.xml
 create mode 100644 libcli/tstream_binding_handle/tstream_binding_handle.c
 copy auth/auth_util.h => libcli/tstream_binding_handle/tstream_binding_handle.h (58%)
 create mode 100644 libcli/tstream_binding_handle/wscript_build
 create mode 100644 libcli/wsp/test_wsp_parser.c
 create mode 100644 libcli/wsp/wscript_build
 create mode 100644 libcli/wsp/wsp_aqs.c
 create mode 100644 libcli/wsp/wsp_aqs.h
 create mode 100644 libcli/wsp/wsp_aqs_lexer.l
 create mode 100644 libcli/wsp/wsp_aqs_parser.y
 create mode 100644 librpc/idl/wsp.idl
 create mode 100644 librpc/idl/wsp_data.idl
 create mode 100644 librpc/wsp/README
 create mode 100644 librpc/wsp/allprops-from-ms-wsp-spec.csv
 create mode 100644 librpc/wsp/extra-props.csv
 copy source3/lib/version_test.c => librpc/wsp/wsp_helper.c (60%)
 copy source3/lib/util_cluster.h => librpc/wsp/wsp_helper.h (73%)
 create mode 100644 librpc/wsp/wsp_util.c
 create mode 100644 librpc/wsp/wsp_util.h
 create mode 100644 source3/rpc_client/wsp_cli.c
 create mode 100644 source3/rpc_client/wsp_cli.h
 create mode 100644 source3/utils/wspsearch.c
 create mode 100755 source4/scripting/bin/gen_wsp_props.py


Changeset truncated at 500 lines:

diff --git a/.codespellignore b/.codespellignore
index c2f4c37feab..8827976109d 100644
--- a/.codespellignore
+++ b/.codespellignore
@@ -8,10 +8,13 @@ blong
 browseable
 bre
 bu
+childres
 clen
 creat
+connectin
 daa
 ect
+ege
 fo
 hampster
 htmp
diff --git a/.gitattributes b/.gitattributes
index 1fda7c1af77..e9be5f432bc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,7 @@
 *.dump binary
 *.SAMBABACKUP binary
 libcli/security/tests/data/conditional_aces.txt.json binary
+libcli/security/tests/windows/non_canonical.txt binary
 testdata/compression/compressed-huffman/** binary
 testdata/compression/compressed-more-huffman/** binary
 testdata/compression/compressed-more-plain/** binary
diff --git a/SECURITY.md b/SECURITY.md
index 33dbd30357c..1264544ea1e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,7 +9,7 @@ matrix showing the currently supported versions of Samba.
 
 Please report all security issues or defects to security at samba.org and **never** on IRC, public mailing lists or in Bugzilla!
 
-Once reported and if warrented by the specific issue, the Samba Team
+Once reported and if warranted by the specific issue, the Samba Team
 will follow the process outlined in
 https://wiki.samba.org/index.php/Samba_Security_Process to produce a
 security release.
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 3a3165b52eb..072188a6752 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -104,7 +104,7 @@ static const struct gensec_security_ops **gensec_use_kerberos_mechs(
 		bool keep = false;
 
 		/*
-		 * We want to keep SPNGEO and other backends
+		 * We want to keep SPNEGO and other backends
 		 */
 		keep = old_gensec_list[i]->glue;
 
@@ -168,7 +168,7 @@ _PUBLIC_ const struct gensec_security_ops **gensec_security_mechs(
 
 			/*
 			 * Even if Kerberos is set to REQUIRED, keep the
-			 * schannel auth mechanism that machine accounts are
+			 * schannel auth mechanism so that machine accounts are
 			 * able to authenticate via netlogon.
 			 */
 			if (gensec_security->gensec_role == GENSEC_SERVER) {
@@ -975,7 +975,7 @@ _PUBLIC_ NTSTATUS gensec_start_mech_by_oid(struct gensec_security *gensec_securi
 }
 
 /**
- * Start a GENSEC sub-mechanism by a well know SASL name
+ * Start a GENSEC sub-mechanism by a well known SASL name
  *
  */
 
diff --git a/auth/kerberos/kerberos_pac.c b/auth/kerberos/kerberos_pac.c
index 8d3b467622d..ae4557bbd6f 100644
--- a/auth/kerberos/kerberos_pac.c
+++ b/auth/kerberos/kerberos_pac.c
@@ -179,7 +179,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
 	}
 
 	if (pac_data->num_buffers < 4) {
-		/* we need logon_ingo, service_key and kdc_key */
+		/* we need logon_info, service_key and kdc_key */
 		DEBUG(0,("less than 4 PAC buffers\n"));
 		talloc_free(tmp_ctx);
 		return NT_STATUS_INVALID_PARAMETER;
@@ -197,14 +197,14 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
 	}
 
 	if (pac_data_raw->num_buffers < 4) {
-		/* we need logon_ingo, service_key and kdc_key */
+		/* we need logon_info, service_key and kdc_key */
 		DEBUG(0,("less than 4 PAC buffers\n"));
 		talloc_free(tmp_ctx);
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
 	if (pac_data->num_buffers != pac_data_raw->num_buffers) {
-		/* we need logon_ingo, service_key and kdc_key */
+		/* we need logon_info, service_key and kdc_key */
 		DEBUG(0, ("misparse! PAC_DATA has %d buffers while "
 			  "PAC_DATA_RAW has %d\n", pac_data->num_buffers,
 			  pac_data_raw->num_buffers));
@@ -368,7 +368,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
 	}
 
 	if (tgs_authtime) {
-		/* Convert to NT time, so as not to loose accuracy in comparison */
+		/* Convert to NT time, so as not to lose accuracy in comparison */
 		unix_to_nt_time(&tgs_authtime_nttime, tgs_authtime);
 
 		if (tgs_authtime_nttime != logon_name->logon_time) {
diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml
index e4f7ce0b96a..766213e1423 100644
--- a/ctdb/doc/ctdb-tunables.7.xml
+++ b/ctdb/doc/ctdb-tunables.7.xml
@@ -284,7 +284,7 @@ MonitorInterval=20
 	      networks.
 	    </para>
 	    <para>
-	      You can override automatic the "home" node allocation by
+	      You can override the automatic "home" node allocation by
 	      creating a file "home_nodes" next to the
 	      "public_addresses" file. As an example the following
 	      "home_nodes" file assigns the address 192.168.1.1 to
diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index e57d614247f..164a2dbc0bd 100644
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -710,7 +710,7 @@ Comma Separated list of Files
 	<para><command>rpcclient</command> is designed as a developer testing tool
 	and may not be robust in certain areas (such as command line parsing).
 	It has been known to  generate a core dump upon failures when invalid
-	parameters where passed to the interpreter. </para>
+	parameters were passed to the interpreter. </para>
 
 	<para>From Luke Leighton's original rpcclient man page:</para>
 
diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index ef504b41051..a99d2d192f6 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -75,7 +75,7 @@
 	<manvolnum>7</manvolnum></citerefentry> suite.</para>
 
 	<para>The <command>smbcacls</command> program manipulates NT Access Control
-	Lists (ACLs) on SMB file shares. An ACL is comprised zero or more Access
+	Lists (ACLs) on SMB file shares. An ACL comprises zero or more Access
 	Control Entries (ACEs), which define access restrictions for a specific
 	user or group.</para>
 </refsect1>
diff --git a/docs-xml/manpages/wspsearch.1.xml b/docs-xml/manpages/wspsearch.1.xml
new file mode 100644
index 00000000000..06878d65404
--- /dev/null
+++ b/docs-xml/manpages/wspsearch.1.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="wspsearch.1">
+
+  <refmeta>
+    <refentrytitle>wspsearch</refentrytitle>
+    <manvolnum>1</manvolnum>
+    <refmiscinfo class="source">Samba</refmiscinfo>
+    <refmiscinfo class="manual">User Commands</refmiscinfo>
+    <refmiscinfo class="version">&doc.version;</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>wspsearch</refname>
+    <refpurpose>Run Windows Search Protocol searches against a SMB server</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>wspsearch</command>
+      <arg choice="req">//server/share</arg>
+      <arg choice="opt">--limit=results</arg>
+      <arg choice="opt">--search=phrase</arg>
+      <arg choice="opt">--kind=KIND</arg>
+      <arg choice="opt">--query=QUERY</arg>
+      <arg choice="opt">-?|--help</arg>
+      <arg choice="opt">--usage</arg>
+      <arg choice="opt">-d|--debuglevel=DEBUGLEVEL</arg>
+      <arg choice="opt">--debug-stdout</arg>
+      <arg choice="opt">-s|--configfile=CONFIGFILE</arg>
+      <arg choice="opt">--option=name=value</arg>
+      <arg choice="opt">-l|--log-basename=LOGFILEBASE</arg>
+      <arg choice="opt">--leak-report</arg>
+      <arg choice="opt">--leak-report-full</arg>
+      <arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
+      <arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
+      <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
+      <arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
+      <arg choice="opt">--netbios-scope=SCOPE</arg>
+      <arg choice="opt">-W|--workgroup=WORKGROUP</arg>
+      <arg choice="opt">--realm=REALM</arg>
+      <arg choice="opt">-U|--user=[DOMAIN/]USERNAME[%PASSWORD]</arg>
+      <arg choice="opt">-N|--no-pass</arg>
+      <arg choice="opt">--password=STRING</arg>
+      <arg choice="opt">--pw-nt-hash</arg>
+      <arg choice="opt">-A|--authentication-file=FILE</arg>
+      <arg choice="opt">-P|--machine-pass</arg>
+      <arg choice="opt">--simple-bind-dn=DN</arg>
+      <arg choice="opt">--use-kerberos=desired|required|off</arg>
+      <arg choice="opt">--use-krb5-ccache=CCACHE</arg>
+      <arg choice="opt">--use-winbind-ccache</arg>
+      <arg choice="opt">--client-protection=sign|encrypt|off</arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+    <manvolnum>1</manvolnum></citerefentry> suite.</para>
+
+    <para>wspsearch is a simple utility to run Windows Search Protocol searches against a SMB server that has the WSP service enabled.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+	<term>server</term>
+	<listitem>
+	  <para>The SMB server name or IP address to connect to.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>sharename</term>
+	<listitem>
+	  <para>The name of a share on the server.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>--query</term>
+	<listitem><para>A query specified in simplified AQS-like (Advanced query syntax).</para>
+	<para>Basic (AQS) syntax is supported (See <emphasis>SEE ALSO</emphasis>).
+	A query consists of a sequence of queries connected by AND, OR
+	and NOT boolean operators. The query elements are essentially
+	restrictions defined by a property. There are some limitations on the
+	operators supported and some types of properties like enumerated
+	ranges are not supported at all. Additionally syntactically
+	range values are not delimited as specified by AQS (ranges are
+	instead specified as value-value). Some special cases that you see in
+	the windows search UI (for example sizes like 'tiny', 'small',
+	'large' etc.) are exceptions which are handled more or less
+	as keywords. See <emphasis>EXAMPLES</emphasis>.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>--search=phrase</term>
+	<listitem>
+	  <para>A simple phrase that is searched across the index
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>--kind=KIND</term>
+	<listitem>
+	  <para>kind one of;
+	  <itemizedlist>
+		  <listitem><para><emphasis>Calendar</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Communication</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Contact</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Document</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Email</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Feed</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Folder</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Game</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>InstantMessage</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Journal</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Movie</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Music</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Link</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Note</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Picture</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Program</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>RecordedTV</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>SearchFolder</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Task</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>Video</emphasis> </para> </listitem>
+		  <listitem><para><emphasis>WebHistory</emphasis> </para> </listitem>
+	  </itemizedlist>
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>--limit</term>
+	<listitem><para>A limit on the number of results returned, by default
+	there is a limit of 500 results, a limit of 0 indicates no limit and
+	all results will be returned.</para></listitem>
+      </varlistentry>
+
+      &popt.autohelp;
+      &cmdline.common.samba.client;
+      &cmdline.common.credentials;
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>EXAMPLES</title>
+
+    <para>Search using a basic phrase:</para>
+    <programlisting>
+	'wspsearch -Usomeuser%password //server/share --phrase="cats"'
+    </programlisting>
+
+    <para>Search using an AQS like query for a picture whose name starts with p403 or p404:</para>
+    <programlisting>
+	'wspsearch -Usomeuser%password //server/share --query="ALL:$<p403 OR ALL:$<p404 AND System.Kind:picture"'
+    </programlisting>
+
+  </refsect1>
+
+  <refsect1>
+    <title>SEE ALSO</title>
+    <para>Adanced Query Syntax
+    <ulink url="https://learn.microsoft.com/en-gb/windows/win32/search/-search-3x-advancedquerysyntax">
+    https://learn.microsoft.com/en-gb/windows/win32/search/-search-3x-advancedquerysyntax </ulink>
+    </para>
+  </refsect1>
+
+  <refsect1>
+    <title>VERSION</title>
+
+    <para>This man page is part of version &doc.version; of the Samba suite.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>The original Samba software and related utilities were created by
+    Andrew Tridgell. Samba is now developed by the Samba Team as an Open
+    Source project similar to the way the Linux kernel is developed.</para>
+
+    <para>The wspsearch manpage was written by Noel Power.</para>
+  </refsect1>
+</refentry>
diff --git a/docs-xml/smbdotconf/misc/wspproperties.xml b/docs-xml/smbdotconf/misc/wspproperties.xml
new file mode 100644
index 00000000000..45c420c9099
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/wspproperties.xml
@@ -0,0 +1,55 @@
+<samba:parameter name="wsp property file"
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>
+	<smbconfoption name="wsp property file"/> parameter.
+	This parameter specifies the file where additional WSP Windows Search Protocol properties 
+	are stored. The format of the file is a csv consisting of 10 comma separated columns. The
+	first 3 columns are required, the other columns are desirable but not necessary.
+	</para>
+	<variablelist>
+		<varlistentry>
+			<term>Property Name</term>
+			<listitem><para>A property name e.g. System.ItemUrl.</para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>GUID</term>
+			<listitem><para>A guid that identifies the propertyset the property belongs to.</para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>prop ID</term>
+			<listitem><para>A number that together with the GUID uniquely identifies the property.</para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>inInverted Index</term>
+			<listitem><para>Set to TRUE is the property is indexed.</para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>isColumn</term>
+			<listitem><para>Set to TRUE if the property is one that can be returned in rows returned from WSP query.</para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>type</term>
+			<listitem><para>One of
+			<emphasis>Boolean</emphasis>,<emphasis>Buffer</emphasis>,<emphasis>Byte</emphasis>,<emphasis>DateTime</emphasis>,<emphasis>Double</emphasis>,<emphasis>Int32</emphasis>,<emphasis>String</emphasis>,<emphasis>UInt16</emphasis>,<emphasis>UInt32</emphasis>,<emphasis>UInt64</emphasis> </para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>MaxSize</term>
+			<listitem><para>maximum size when stored.</para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>Vector Property</term>
+			<listitem><para>TRUE if this is a multivalue property.</para></listitem>
+                </varlistentry>
+		<varlistentry>
+			<term>Description</term>
+			<listitem><para>Description of what the property is used for.</para></listitem>
+                </varlistentry>
+	</variablelist>
+
+
+</description>
+<value type="default"/>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/aclflaginheritedcanonicalization.xml b/docs-xml/smbdotconf/security/aclflaginheritedcanonicalization.xml
index 676d5b478a3..b306b2be48d 100644
--- a/docs-xml/smbdotconf/security/aclflaginheritedcanonicalization.xml
+++ b/docs-xml/smbdotconf/security/aclflaginheritedcanonicalization.xml
@@ -23,7 +23,7 @@
 	tools like rsync that copy data blobs from xattrs that represent ACLs
 	created by the acl_xattr VFS module will result in copies of the ACL
 	that are identical to the source. Without this option, the copied ACLs
-	would all loose the DI flag if set on the source.</para>
+	would all lose the DI flag if set on the source.</para>
 </description>
 
 <value type="default">yes</value>
diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index 48bf9d580ff..157e576aaa0 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -30,7 +30,7 @@
     For this share
     Z:\
 
-    the ShadowCopies are in this directories
+    the ShadowCopies are in these directories
 
     Z:\@GMT-2003.08.05-12.00.00\
     Z:\@GMT-2003.08.05-12.01.00\
diff --git a/lib/fuzzing/oss-fuzz/do_build.sh b/lib/fuzzing/oss-fuzz/do_build.sh
index b23f6cd4e3e..29a6ceb38a1 100755
--- a/lib/fuzzing/oss-fuzz/do_build.sh
+++ b/lib/fuzzing/oss-fuzz/do_build.sh
@@ -283,7 +283,7 @@ done
 # library B as a dependency of A from the wrong place.
 chrpath -d $OUT/lib/*
 
-# Grap the seeds dictionary from github and put the seed zips in place
+# Grab the seeds dictionary from github and put the seed zips in place
 # beside their executables.
 
 wget https://gitlab.com/samba-team/samba-fuzz-seeds/-/jobs/artifacts/master/download?job=zips \
diff --git a/lib/ldb/common/ldb_modules.c b/lib/ldb/common/ldb_modules.c
index 53875ee216a..b5627b0d04f 100644
--- a/lib/ldb/common/ldb_modules.c
+++ b/lib/ldb/common/ldb_modules.c
@@ -799,7 +799,7 @@ int ldb_module_send_entry(struct ldb_request *req,
 	return req->callback(req, ares);
 }
 
-/* calls the request callback to send an referrals
+/* calls the request callback to send a referral
  *
  * params:
  *      req: the original request passed to your module
@@ -923,7 +923,7 @@ static int ldb_modules_load_dir(const char *modules_dir, const char *version);
   ldb_register_module() and ldb_register_backend() to register a
   module or backend, but it may also be used to register command line
   handling functions, ldif handlers or any other local
-  modififications.
+  modifications.
 
   The ldb_init_module() function does not get a ldb_context passed in,
   as modules will be used for multiple ldb context handles. The call
diff --git a/lib/ldb/ldb_key_value/ldb_kv.c b/lib/ldb/ldb_key_value/ldb_kv.c
index 347b4fbfd8a..ef69e5e5b03 100644
--- a/lib/ldb/ldb_key_value/ldb_kv.c
+++ b/lib/ldb/ldb_key_value/ldb_kv.c
@@ -1582,7 +1582,7 @@ static int ldb_kv_start_trans(struct ldb_module *module)
 	if (ldb_kv->pid != pid) {
 		ldb_asprintf_errstring(ldb_module_get_ctx(ldb_kv->module),
 				       __location__
-				       ": Reusing ldb opend by pid %d in "
+				       ": Reusing ldb opened by pid %d in "
 				       "process %d\n",
 				       ldb_kv->pid,
 				       pid);
@@ -1625,7 +1625,7 @@ static int ldb_kv_prepare_commit(struct ldb_module *module)
 	if (ldb_kv->pid != pid) {
 		ldb_asprintf_errstring(ldb_module_get_ctx(module),
 				       __location__
-				       ": Reusing ldb opend by pid %d in "
+				       ": Reusing ldb opened by pid %d in "
 				       "process %d\n",
 				       ldb_kv->pid,
 				       pid);
diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c
index f76087de6af..3f1a847f2b6 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_index.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_index.c
@@ -1089,7 +1089,7 @@ static struct ldb_dn *ldb_kv_index_key(struct ldb_context *ldb,
 
 	/*
 	 * We do not base 64 encode a DN in a key, it has already been


-- 
Samba Shared Repository



More information about the samba-cvs mailing list