[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sat May 12 02:58:02 UTC 2018
The branch, master has been updated
via cda3b23 pysmb: Add some more documentation for conn.list
via b3799fb gpo: Ensure all files are retrieved in fetch
via 454d814 Fix spelling s/woks/works
via 38fc812 traffic: improve is_really_a_packet
via c1af6a0 traffic: improve add_short_packet by avoiding str.split
via 5107e56 traffic: simplify forget_packets_outside_window
via 4fb5e28 traffic: grant user write permission
via 7181af9 traffic_replay: fetch domain from creds other than opts
via fd2bcd5 traffic: set domain on user_creds and machine_creds
via 7c93fb5 traffic_packets: provision request data for packet_drsuapi_13
via 9cabb16 traffic_packets: add trailing $ to fix packet_rpc_netlogon_30
via eafda91 traffic_packets: add windows instructions for ldap 0 simple bind
via 14af041 traffic_packets: replace share_name from netlogon to IPC$ for packet_srvsvc_16
via 51333c1 traffic_packets: replace level 102 to 101 for packet_srvsvc_21
via 34e35c4 traffic: add credentials to samr
via 8d8ef48 traffic_packets: support NT_STATUS_NO_SUCH_DOMAIN in packet_lsarpc_39
via 4e37336 traffic_replay: fix typo in message string
via 5ed1682 traffic_replay: set gensec features to encrypt credentials
via 4d95052 traffic: add paged_results control for ldb search
via 2a4261c selftest: Add a test for creds.{get,set}_secure_channel_type()
via 656ec98 pycredentials: add py_creds_get_secure_channel_type
via 6a6d142 cmd_drsuapi: add dswriteaccountspn command
via 674fd1c Improve vfs_linux_xfs_sgid manpage
via d4bbff5 Fix pidl manpage sections
via 15d2f4f Fix spelling s/unsuported/unsupported/
via 5a0fd87 Fix spelling s/unitialized/uninitialized/
via 66a9b53 Fix spelling s/succesfully/successfully/
via c55248b Fix spelling s/specfied/specified/
via 8f7749c Fix spelling s/retun/return/
via 44ae088 Fix spelling s/retrive/retrieve/
via 25ac1f1 Fix spelling s/receving/receiving/
via 43ec8c6 Fix spelling s/protcol/protocol/
via 8ed2873 Fix spelling s/propogate/propagate/
via 6fa770f Fix spelling s/processs/process/
via e8a3a43 Fix spelling s/ouput/output/
via 7ad87bb Fix spelling s/opions/options/
via 1af8968 Fix spelling s/openened/opened/
via fab4fe9 Fix spelling s/missmatch/mismatch/
via 2bacc1c Fix spelling s/malicous/malicious/
via fd46fd0 Fix spelling s/fowarding/forwarding/
via f5b908d Fix spelling s/formated/formatted/
via 4e47642 Fix spelling s/Everytime/Every time/
via 2bde81d Fix spelling s/doens't/doesn't/
via 3a7b129 Fix spelling s/desriptor/descriptor/
via 685f452 Fix spelling s/coult/could/
via f74090c Fix spelling s/conection/connection/
via 8fc64d4 Fix spelling s/authenticaiton/authentication/
via b2a1dea Fix spelling s/anwser/answer/
via fe53f0b Fix spelling s/allows to/allows one to/
via 5ca89d8 Fix typo for response
from ced5585 s3:smbd: fix interaction between chown and SD flags
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cda3b233372dd72c210a39f6efeaa8dbf26e9c67
Author: Garming Sam <garming at catalyst.net.nz>
Date: Wed May 9 15:39:09 2018 +1200
pysmb: Add some more documentation for conn.list
There are two options which are undocumented.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Sat May 12 04:57:29 CEST 2018 on sn-devel-144
commit b3799fb6e60f7b33bd5d03e4c924687a5838d968
Author: Garming Sam <garming at catalyst.net.nz>
Date: Wed May 9 15:24:38 2018 +1200
gpo: Ensure all files are retrieved in fetch
.ini files are normally set as hidden, and will not be found over SMB.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 454d8148a68049a22b852ead1a3e19c1da56fc5f
Author: Garming Sam <garming at catalyst.net.nz>
Date: Tue May 8 17:09:53 2018 +1200
Fix spelling s/woks/works
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 38fc8125e2728926da31555386b93a0d5acb1c0e
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu May 10 17:11:29 2018 +1200
traffic: improve is_really_a_packet
This function will repeat on each packet.
Avoid exception for getattr, which is expensive for performance.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit c1af6a0dada79888d3eb9c820163a6b34e900638
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu May 10 17:04:50 2018 +1200
traffic: improve add_short_packet by avoiding str.split
Avoid str.split, which will repeat for each packet.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 5107e56aa089b51f8d00049b63b2c79ea9e495cc
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu May 10 17:01:19 2018 +1200
traffic: simplify forget_packets_outside_window
Make code compact, and improve performance a little bit.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 4fb5e28b663c57cc4f67b28312a291132dae2fb6
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu May 10 16:43:04 2018 +1200
traffic: grant user write permission
Some packets need user to have write permission, e.g.: writeaccountspn
Grant user write permission then we can send packets successfully.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 7181af9f9459d65df9df59ed447729e1c13a958c
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Mon May 7 10:18:42 2018 +1200
traffic_replay: fetch domain from creds other than opts
For traffic_replay script, when user provides `--workgroup` or `-W` option,
it will be set on the creds option group, not the default opts one.
The previous code will not work properly when smb.conf file is missing.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit fd2bcd5d1033d7801e0b955d25279b2d8849c0ae
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 2 05:04:03 2018 +0000
traffic: set domain on user_creds and machine_creds
The domain is missing in traffic user and machine credential, this will cause
some packet tests fail against windows.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 7c93fb57f598a8d0d2528c950b9eec2cf5e14189
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Tue May 1 16:58:01 2018 +1200
traffic_packets: provision request data for packet_drsuapi_13
The `drsuapi.DsWriteAccountSpnRequest1` struct in this packet was empty before.
Samba lets it go but Windows will report an invalid parameter error.
Provision the request with proper data, and give user permission to
write account SPN.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 9cabb16b489b43495472b0e7229ba864daa7d479
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Tue May 1 17:15:09 2018 +1200
traffic_packets: add trailing $ to fix packet_rpc_netlogon_30
For `NetrServerPasswordSet2`, the 2nd arg `account_name` must end with a
$, otherwise windows will return an `Access Denied` error.
Use `creds.get_username()` instead of `creds.get_workstation()` to
include the trailing $.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit eafda9137afba96e2375262f846f79597583ab82
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Apr 27 14:51:11 2018 +1200
traffic_packets: add windows instructions for ldap 0 simple bind
To run packet_ldap_0 simple bind test against Windows, we need to
install CA on Windows with following PowerShell commands:
Install-windowsfeature ADCS-Cert-Authority
Install-AdcsCertificationAuthority -CAType EnterpriseRootCA
Restart-Computer
Otherwise we will get `NT_STATUS_CONNECTION_RESET` error.
Didn't change any code, just add above instructions in comment.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 14af041c139984591698f9e176ff9ba9a428dc34
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Apr 27 12:07:16 2018 +1200
traffic_packets: replace share_name from netlogon to IPC$ for packet_srvsvc_16
Sharename list for Windows:
Sharename Type Comment
--------- ---- -------
ADMIN$ Disk Remote Admin
C$ Disk Default share
IPC$ IPC Remote IPC
For Samba:
Sharename Type Comment
--------- ---- -------
netlogon Disk
sysvol Disk
IPC$ IPC IPC Service
While test packet_srvsvc_16 with share_name `netlogon`,
it passed Samba, and got a WERR_NERR_NETNAMENOTFOUND error for Windows.
Change share name to `IPC$` so Samba and Windows have it in common.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 51333c153844ae22eed645a0ce6c70eef78d1963
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Apr 27 11:27:59 2018 +1200
traffic_packets: replace level 102 to 101 for packet_srvsvc_21
Level 102 will cause WERR_ACCESS_DENIED error against Windows, because:
> If the level is 102 or 502, the Windows implementation checks whether
> the caller is a member of one of the groups previously mentioned or
> is a member of the Power Users local group.
It passed against Samba since this check is not implemented by Samba yet.
refer to:
https://msdn.microsoft.com/en-us/library/cc247297.aspx#Appendix_A_80
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 34e35c4c80f8722d15770754393ce8673fc74a3b
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu Apr 26 12:15:10 2018 +1200
traffic: add credentials to samr
lp and creds are missing in SamrContext and samr connection.
While run traffic_replay against windows, this will cause
`Access Denied` error.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 8d8ef48650ca5ec49f080be7f1fd813617aa6d31
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed Apr 18 15:45:10 2018 +1200
traffic_packets: support NT_STATUS_NO_SUCH_DOMAIN in packet_lsarpc_39
For packet_lsarpc_39, samba will return NT_STATUS_OBJECT_NAME_NOT_FOUND,
however, windows will return NT_STATUS_NO_SUCH_DOMAIN.
Allow both status for now to keep compatiable with both samba and
windows DC.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 4e37336632bd6a26bd960d5ee2e80fa1a22e8440
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed Apr 18 15:40:18 2018 +1200
traffic_replay: fix typo in message string
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 5ed1682905849f8b1971eac79fa7718aa0f07744
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed Apr 18 15:31:12 2018 +1200
traffic_replay: set gensec features to encrypt credentials
While running traffic_replay script against windows dc, it will fail
with a `LDAP_UNWILLING_TO_PERFORM` error for adding user.
Windows requires the credentials to be encrypted before sending.
`set_gensec_features` will fix it.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 4d950527f3e68cff7fa7281f3266be0d81cc9bde
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed Apr 18 15:36:02 2018 +1200
traffic: add paged_results control for ldb search
While there are more then 1000 records in the search result from Windows,
a `LDAP_SIZE_LIMIT_EXCEEDED` error will be returned.
Add paged_results control to fix.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 2a4261c0527b803173a151bff3b35dbc687db707
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 11 13:18:43 2018 +1200
selftest: Add a test for creds.{get,set}_secure_channel_type()
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 656ec98e5b248f9107af5713495e4aeca17e3155
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 2 21:40:39 2018 +0000
pycredentials: add py_creds_get_secure_channel_type
We have only set, need get.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 6a6d14248d6a4f4ebc92e3ff6529fe9f82fb8388
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Tue May 1 12:44:43 2018 +1200
cmd_drsuapi: add dswriteaccountspn command
The dswriteaccountspn command is missing in drsuapi, add it so we can
use it in rpcclient.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 674fd1c2834567d473a0b8483eb20e66a27882c0
Author: Mathieu Parent <math.parent at gmail.com>
Date: Tue May 1 20:35:52 2018 +0200
Improve vfs_linux_xfs_sgid manpage
- Add missing refpurpose and describe the "circumstances"
- Replace dangling link by archive.org backup
- Add fixed Linux version and commit link
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit d4bbff5ce5705f877be326f32631b466daec5aed
Author: Mathieu Parent <math.parent at gmail.com>
Date: Tue May 1 21:59:23 2018 +0200
Fix pidl manpage sections
.TH header should match file name (i.e 3pm and not 3 for Parse::Pidl::NDR).
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 15d2f4f8178e9cd10deaace19268b0659806340a
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:24:25 2018 +0200
Fix spelling s/unsuported/unsupported/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 5a0fd87b6bc04e4726d5cfea22c11d38386097b8
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:24:16 2018 +0200
Fix spelling s/unitialized/uninitialized/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 66a9b5345799846641069286b3db75feec1542b0
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:24:00 2018 +0200
Fix spelling s/succesfully/successfully/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit c55248bbbcd0c1f9fbdeccf508900fc0d1dc9ce9
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:23:54 2018 +0200
Fix spelling s/specfied/specified/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 8f7749cda72fd3d4a532fdd8f2c9ba99f48ca738
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:23:45 2018 +0200
Fix spelling s/retun/return/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 44ae08858e6e859f968456576a2b066f05382fcb
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:23:39 2018 +0200
Fix spelling s/retrive/retrieve/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 25ac1f192cd7361c7a7b068a8e86a5365c2a5256
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:23:01 2018 +0200
Fix spelling s/receving/receiving/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 43ec8c6bbdf95251908e6ba8e00092b04cb56ea3
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:22:53 2018 +0200
Fix spelling s/protcol/protocol/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 8ed2873400ffa10ed1abd745faa54a0fa8029a40
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:22:46 2018 +0200
Fix spelling s/propogate/propagate/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 6fa770fd546c87e588d75cc143be2b20f59f5602
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:22:38 2018 +0200
Fix spelling s/processs/process/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit e8a3a43649ea7235aa54be29018ec92f8de628ea
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:22:20 2018 +0200
Fix spelling s/ouput/output/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 7ad87bb43c72520bcf1dcf603b55f6fd0d95697c
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:22:00 2018 +0200
Fix spelling s/opions/options/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 1af896869007deb65d8228d492706185bd99ef65
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:21:53 2018 +0200
Fix spelling s/openened/opened/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit fab4fe9cb4409ba8d5d41bf93ddc3ffe167f09c9
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:21:41 2018 +0200
Fix spelling s/missmatch/mismatch/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 2bacc1ca42e23be60fd48c4a0ecabf6957dc106e
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:21:30 2018 +0200
Fix spelling s/malicous/malicious/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit fd46fd0941d8ad7a41c7e6823fcce08a331c6e6a
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:21:09 2018 +0200
Fix spelling s/fowarding/forwarding/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit f5b908d8186b18bb3ec86b4b0db488bf7c6af643
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:20:57 2018 +0200
Fix spelling s/formated/formatted/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 4e4764240bff063e1e9680117de66fd0519d916e
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:20:21 2018 +0200
Fix spelling s/Everytime/Every time/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 2bde81db39181ae190141ec26abdca29f4863fc6
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:19:08 2018 +0200
Fix spelling s/doens't/doesn't/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 3a7b12950ffa066d942a50142bb2cd69da28ecf6
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:18:54 2018 +0200
Fix spelling s/desriptor/descriptor/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 685f45280af8695c21800ad41230d05fd56c33ad
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:18:47 2018 +0200
Fix spelling s/coult/could/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit f74090c817085317ec299f94a8dba61d8d47bf7d
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:18:16 2018 +0200
Fix spelling s/conection/connection/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 8fc64d4569bf349757e1b09df92ec1d3fce2213a
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:14:34 2018 +0200
Fix spelling s/authenticaiton/authentication/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit b2a1dea09954b4ec12ceb76e25f789dfcf107667
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:13:58 2018 +0200
Fix spelling s/anwser/answer/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit fe53f0b3d699606f9f72791df40ead997e60af1c
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri May 4 22:12:14 2018 +0200
Fix spelling s/allows to/allows one to/
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 5ca89d84a7fb281e5d7301cc44a55c0acec5be04
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu Apr 19 17:05:21 2018 +1200
Fix typo for response
reponse --> response
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
auth/credentials/pycredentials.c | 12 +++
ctdb/client/client.h | 4 +-
ctdb/common/run_event.h | 2 +-
ctdb/common/run_proc.h | 2 +-
ctdb/common/sock_client.h | 2 +-
ctdb/common/sock_daemon.c | 2 +-
ctdb/common/sock_daemon.h | 4 +-
ctdb/doc/ctdb-tunables.7.xml | 2 +-
ctdb/server/ctdb_ltdb_server.c | 4 +-
docs-xml/manpages/ntlm_auth.1.xml | 6 +-
docs-xml/manpages/samba.7.xml | 2 +-
docs-xml/manpages/vfs_fruit.8.xml | 2 +-
docs-xml/manpages/vfs_linux_xfs_sgid.8.xml | 11 ++-
.../smbdotconf/winbind/winbindignoredomains.xml | 2 +-
examples/pcap2nbench/readandxresponse.hpp | 2 +-
lib/krb5_wrap/krb5_samba.c | 4 +-
lib/util/util_net.c | 2 +-
libcli/named_pipe_auth/npa_tstream.c | 4 +-
librpc/ndr/ndr_compression.c | 2 +-
nsswitch/pam_winbind.c | 2 +-
pidl/wscript | 5 +-
python/samba/emulate/traffic.py | 60 ++++++++------
python/samba/emulate/traffic_packets.py | 52 ++++++++++---
python/samba/netcmd/gpo.py | 6 +-
python/samba/netcmd/user.py | 2 +-
python/samba/samba3/__init__.py | 2 +-
python/samba/tests/credentials.py | 8 ++
python/samba/tests/emulate/traffic_packet.py | 6 ++
script/traffic_replay | 7 +-
source3/client/client.c | 2 +-
source3/lib/cbuf.h | 2 +-
source3/libsmb/clierror.c | 2 +-
source3/passdb/pdb_samba_dsdb.c | 6 +-
source3/passdb/pdb_smbpasswd.c | 4 +-
source3/rpc_server/rpc_ncacn_np.c | 2 +-
source3/rpc_server/rpc_server.c | 12 +--
source3/rpcclient/cmd_drsuapi.c | 91 ++++++++++++++++++++++
source3/smbd/filename.c | 2 +-
source3/smbd/open.c | 4 +-
source3/smbd/smbXsrv_open.c | 2 +-
source3/smbd/smbXsrv_session.c | 2 +-
source3/smbd/smbXsrv_tcon.c | 2 +-
source3/torture/torture.c | 8 +-
source3/utils/log2pcaphex.c | 2 +-
source3/utils/net_printing.c | 2 +-
source3/utils/ntlm_auth.c | 2 +-
source4/auth/kerberos/kerberos-notes.txt | 2 +-
.../kerberos/kerberos-porting-to-mit-notes.txt | 2 +-
source4/dsdb/samdb/ldb_modules/descriptor.c | 2 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 2 +-
source4/dsdb/samdb/ldb_modules/util.c | 2 +-
source4/kdc/hdb-samba4.c | 2 +-
source4/libcli/pysmb.c | 6 +-
source4/ntvfs/common/opendb_tdb.c | 2 +-
source4/rpc_server/dcerpc_server.c | 2 +-
source4/torture/basic/delaywrite.c | 2 +-
source4/torture/basic/locking.c | 6 +-
source4/torture/krb5/kdc-canon-heimdal.c | 2 +-
source4/torture/nbt/winsreplication.c | 4 +-
source4/torture/raw/notify.c | 4 +-
source4/torture/raw/setfileinfo.c | 2 +-
source4/torture/rpc/fsrvp.c | 4 +-
source4/torture/smb2/notify.c | 4 +-
third_party/cmocka/cmocka.c | 2 +-
third_party/cmocka/cmocka.h | 2 +-
third_party/dnspython/examples/zonediff.py | 2 +-
wintest/test-s4-howto.py | 12 +--
67 files changed, 307 insertions(+), 129 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/pycredentials.c b/auth/credentials/pycredentials.c
index 68bb306..c626e3f 100644
--- a/auth/credentials/pycredentials.c
+++ b/auth/credentials/pycredentials.c
@@ -680,6 +680,16 @@ static PyObject *py_creds_set_secure_channel_type(PyObject *self, PyObject *args
Py_RETURN_NONE;
}
+static PyObject *py_creds_get_secure_channel_type(PyObject *self, PyObject *args)
+{
+ enum netr_SchannelType channel_type = SEC_CHAN_NULL;
+
+ channel_type = cli_credentials_get_secure_channel_type(
+ PyCredentials_AsCliCredentials(self));
+
+ return PyInt_FromLong(channel_type);
+}
+
static PyObject *py_creds_encrypt_netr_crypt_password(PyObject *self,
PyObject *args)
{
@@ -815,6 +825,8 @@ static PyMethodDef py_creds_methods[] = {
"Get a new client NETLOGON_AUTHENTICATOR"},
{ "set_secure_channel_type", py_creds_set_secure_channel_type,
METH_VARARGS, NULL },
+ { "get_secure_channel_type", py_creds_get_secure_channel_type,
+ METH_VARARGS },
{ "encrypt_netr_crypt_password",
py_creds_encrypt_netr_crypt_password,
METH_VARARGS,
diff --git a/ctdb/client/client.h b/ctdb/client/client.h
index e792047..2eec3ea 100644
--- a/ctdb/client/client.h
+++ b/ctdb/client/client.h
@@ -31,7 +31,7 @@
*
* @brief Client api to talk to ctdb daemon
*
- * This API allows to connect to ctdb daemon, perform various database
+ * This API allows one to connect to ctdb daemon, perform various database
* operations, send controls to ctdb daemon and send messages to other ctdb
* clients.
*/
@@ -193,7 +193,7 @@ int ctdb_client_wait_timeout(struct tevent_context *ev, bool *done,
* @brief Async computation start to wait till recovery is completed
*
* CTDB daemon does not perform many operations while in recovery (especially
- * database operations). This computation allows to wait till ctdb daemon has
+ * database operations). This computation allows one to wait till ctdb daemon has
* finished recovery.
*
* @param[in] mem_ctx Talloc memory context
diff --git a/ctdb/common/run_event.h b/ctdb/common/run_event.h
index b726687..bd0f3e6 100644
--- a/ctdb/common/run_event.h
+++ b/ctdb/common/run_event.h
@@ -30,7 +30,7 @@
*
* @brief Run scripts in a directory with specific event arguments.
*
- * This abstraction allows to execute multiple scripts in a directory
+ * This abstraction allows one to execute multiple scripts in a directory
* (specified by script_dir) with given event and arguments.
*
* At one time, only one event can be run. Multiple run_event calls
diff --git a/ctdb/common/run_proc.h b/ctdb/common/run_proc.h
index 7de0c84..7b06dad 100644
--- a/ctdb/common/run_proc.h
+++ b/ctdb/common/run_proc.h
@@ -28,7 +28,7 @@
*
* @brief Run a process and capture the output
*
- * This abstraction allows to execute scripts with argumunts.
+ * This abstraction allows one to execute scripts with argumunts.
*/
/**
diff --git a/ctdb/common/sock_client.h b/ctdb/common/sock_client.h
index c5822a0..d661c85 100644
--- a/ctdb/common/sock_client.h
+++ b/ctdb/common/sock_client.h
@@ -28,7 +28,7 @@
*
* @brief A framework for a client based on unix-domain sockets.
*
- * This abstraction allows to build clients that communicate using
+ * This abstraction allows one to build clients that communicate using
* unix-domain sockets. It takes care of the common boilerplate.
*/
diff --git a/ctdb/common/sock_daemon.c b/ctdb/common/sock_daemon.c
index 7554cd6..a56057b 100644
--- a/ctdb/common/sock_daemon.c
+++ b/ctdb/common/sock_daemon.c
@@ -689,7 +689,7 @@ static void sock_daemon_run_startup_done(struct tevent_req *subreq)
return;
}
- D_NOTICE("startup completed succesfully\n");
+ D_NOTICE("startup completed successfully\n");
status = sock_daemon_run_socket_listen(req);
if (! status) {
diff --git a/ctdb/common/sock_daemon.h b/ctdb/common/sock_daemon.h
index a071833..aa40995 100644
--- a/ctdb/common/sock_daemon.h
+++ b/ctdb/common/sock_daemon.h
@@ -30,7 +30,7 @@
*
* @brief A framework for a server based on unix-domain sockets.
*
- * This abstraction allows to build simple servers that communicate using
+ * This abstraction allows one to build simple servers that communicate using
* unix-domain sockets. It takes care of the common boilerplate.
*/
@@ -110,7 +110,7 @@ struct sock_daemon_funcs {
*
* @param[in] client The new socket client context
* @param[in] private_data Private data set with the socket
- * @retun true if connection should be accepted, false otherwise
+ * @return true if connection should be accepted, false otherwise
*
*
* disconnect() is called when client closes connection
diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml
index bc4e1b2..da01d21 100644
--- a/ctdb/doc/ctdb-tunables.7.xml
+++ b/ctdb/doc/ctdb-tunables.7.xml
@@ -626,7 +626,7 @@ MonitorInterval=20
<para>
Some databases have seqnum tracking enabled, so that samba will
be able to detect asynchronously when there has been updates
- to the database. Everytime a database is updated its sequence
+ to the database. Every time a database is updated its sequence
number is increased.
</para>
<para>
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index c199aac..d94d942 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -1521,7 +1521,7 @@ int32_t ctdb_ltdb_update_seqnum(struct ctdb_context *ctdb, uint32_t db_id, uint3
}
/*
- timer to check for seqnum changes in a ltdb and propogate them
+ timer to check for seqnum changes in a ltdb and propagate them
*/
static void ctdb_ltdb_seqnum_check(struct tevent_context *ev,
struct tevent_timer *te,
@@ -1531,7 +1531,7 @@ static void ctdb_ltdb_seqnum_check(struct tevent_context *ev,
struct ctdb_context *ctdb = ctdb_db->ctdb;
uint32_t new_seqnum = tdb_get_seqnum(ctdb_db->ltdb->tdb);
if (new_seqnum != ctdb_db->seqnum) {
- /* something has changed - propogate it */
+ /* something has changed - propagate it */
TDB_DATA data;
data.dptr = (uint8_t *)&ctdb_db->db_id;
data.dsize = sizeof(uint32_t);
diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml
index 4f900d5..5545224 100644
--- a/docs-xml/manpages/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
@@ -253,7 +253,7 @@
<varlistentry>
<term>Request-User-Session-Key</term>
- <listitem><para>Upon successful authenticaiton, return
+ <listitem><para>Upon successful authentication, return
the user session key associated with the login.</para>
<varlistentry>
<term>Examples:</term>
@@ -264,7 +264,7 @@
<varlistentry>
<term>Request-LanMan-Session-Key</term>
- <listitem><para>Upon successful authenticaiton, return
+ <listitem><para>Upon successful authentication, return
the LANMAN session key associated with the login.
</para>
<varlistentry>
@@ -279,7 +279,7 @@
</varlistentry>
</variablelist>
<warning><para>Implementers should take care to base64 encode
- any data (such as usernames/passwords) that may contain malicous user data, such as
+ any data (such as usernames/passwords) that may contain malicious user data, such as
a newline. They may also need to decode strings from
the helper, which likewise may have been base64 encoded.</para></warning>
</listitem>
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index 761c8d3..5b72d65 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -26,7 +26,7 @@
<para>The Samba software suite is a collection of programs
that implements the Server Message Block (commonly abbreviated
as SMB) protocol for UNIX systems and provides Active Directory
- services. The first version of the SMB protcol is sometimes also
+ services. The first version of the SMB protocol is sometimes also
referred to as the Common Internet File System (CIFS). For a more
thorough description, see <ulink url="http://www.ubiqx.org/cifs/">
http://www.ubiqx.org/cifs/</ulink>. Samba also implements the NetBIOS
diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml
index 7f6a0e7..2583303 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -106,7 +106,7 @@
</itemizedlist>
<para>There's a set of per share options that come into play when
- <emphasis>fruit:aapl</emphasis> is enabled. These opions, listed
+ <emphasis>fruit:aapl</emphasis> is enabled. These options, listed
below, can be used to disable the computation of specific Mac
metadata in the directory enumeration context, all are enabled by
default:</para>
diff --git a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
index 21f7fab..2bc67e5 100644
--- a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
+++ b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
@@ -13,7 +13,7 @@
<refnamediv>
<refname>vfs_linux_xfs_sgid</refname>
- <refpurpose></refpurpose>
+ <refpurpose>Workaround XFS sgid bit not inherited during mkdir with default acl on Linux older than 3.1</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -31,9 +31,12 @@
<para>
<command>vfs_linux_xfs_sgid</command> is a VFS module to work around an
- old Linux XFS bug that still exists: Under certain circumstances the
- SGID bit is not inherited (<ulink url="http://oss.sgi.com/bugzilla/show_bug.cgi?id=280">
- http://oss.sgi.com/bugzilla/show_bug.cgi?id=280</ulink>).
+ old Linux XFS bug fixed in 3.11: the SGID bit is not inherited during mkdir
+ when a default ACL is set
+ (<ulink url="https://web.archive.org/web/20160320180937/http://oss.sgi.com/bugzilla/show_bug.cgi?id=280">
+ https://web.archive.org/web/20160320180937/http://oss.sgi.com/bugzilla/show_bug.cgi?id=280
+ </ulink> fixed by <ulink url="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=42c49d7f249c2487f36d3314753d5d8ebcee8249">
+ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=42c49d7f249c2487f36d3314753d5d8ebcee8249</ulink>).
The <command>vfs_linux_xfs_sgid</command> VFS module will work around this
bug by manually setting the SGID bit after a <command>mkdir</command>
if the parent directory had the SGID bit set.
diff --git a/docs-xml/smbdotconf/winbind/winbindignoredomains.xml b/docs-xml/smbdotconf/winbind/winbindignoredomains.xml
index 62a8f863..af99222 100644
--- a/docs-xml/smbdotconf/winbind/winbindignoredomains.xml
+++ b/docs-xml/smbdotconf/winbind/winbindignoredomains.xml
@@ -3,7 +3,7 @@
type="cmdlist"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>Allows to enter a list of trusted domains winbind should
+ <para>Allows one to enter a list of trusted domains winbind should
ignore (untrust). This can avoid the overhead of resources from
attempting to login to DCs that should not be communicated with.
</para>
diff --git a/examples/pcap2nbench/readandxresponse.hpp b/examples/pcap2nbench/readandxresponse.hpp
index 0a302cb..8ecb3a3 100644
--- a/examples/pcap2nbench/readandxresponse.hpp
+++ b/examples/pcap2nbench/readandxresponse.hpp
@@ -22,7 +22,7 @@
#define _READ_AND_X_RESPONSE_HPP
class ReadAndXResponse {
- ReadAndXReponse(const uint8_t *data, size_t size);
+ ReadAndXResponse(const uint8_t *data, size_t size);
uint8_t word_count;
uint8_t and_x_command;
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 1493d81..f49838c 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -1196,7 +1196,7 @@ krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
/**
* @brief Open a key table readonly or with readwrite access.
*
- * Allows to use a different keytab than the default one using a relative
+ * Allows one to use a different keytab than the default one using a relative
* path to the keytab.
*
* @param[in] context The library context
@@ -1334,7 +1334,7 @@ out:
/**
* @brief Open a key table readonly or with readwrite access.
*
- * Allows to use a different keytab than the default one. The path needs to be
+ * Allows one to use a different keytab than the default one. The path needs to be
* an absolute path or an error will be returned.
*
* @param[in] context The library context
diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index f0a3016..6cfb35c 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -869,7 +869,7 @@ char *print_canonical_sockaddr(TALLOC_CTX *ctx,
char *dest = NULL;
int ret;
- /* Linux getnameinfo() man pages says port is unitialized if
+ /* Linux getnameinfo() man pages says port is uninitialized if
service name is NULL. */
ret = sys_getnameinfo((const struct sockaddr *)pss,
diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c
index d333ce6..8ec52ed 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -1402,7 +1402,7 @@ int _tstream_npa_accept_existing_recv(struct tevent_req *req,
ret = tsocket_simple_int_recv(req, perrno);
if (ret != 0) {
- DEBUG(2, ("Failed to accept named pipe conection: %s\n",
+ DEBUG(2, ("Failed to accept named pipe connection: %s\n",
strerror(*perrno)));
tevent_req_received(req);
return -1;
@@ -1416,7 +1416,7 @@ int _tstream_npa_accept_existing_recv(struct tevent_req *req,
#else
*perrno = EINVAL;
#endif
- DEBUG(2, ("Failed to accept named pipe conection: %s => %s\n",
+ DEBUG(2, ("Failed to accept named pipe connection: %s => %s\n",
nt_errstr(state->accept_status),
strerror(*perrno)));
tevent_req_received(req);
diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c
index bdce431..f06a076 100644
--- a/librpc/ndr/ndr_compression.c
+++ b/librpc/ndr/ndr_compression.c
@@ -143,7 +143,7 @@ static enum ndr_err_code ndr_pull_compression_mszip_cab_chunk(struct ndr_pull *n
* happen
*/
return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION,
- "zlib inflate error not enough space for ouput (PULL)");
+ "zlib inflate error not enough space for output (PULL)");
}
if (z_ret != Z_STREAM_END) {
return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION,
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 63fede8..7ac5bb0 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1220,7 +1220,7 @@ static bool winbind_name_list_to_sid_string_list(struct pwb_context *ctx,
/*
* The lookup of the last name failed..
* It results in require_member_of_sid ends with ','
- * It is malformated parameter here, overwrite the last ','.
+ * It is malformatted parameter here, overwrite the last ','.
*/
len = strlen(sid_list_buffer);
if ((len != 0) && (sid_list_buffer[len - 1] == ',')) {
diff --git a/pidl/wscript b/pidl/wscript
index f4ff902..45cb17c 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import os, Logs
+import os, string, Logs
from samba_utils import MODE_755
# This function checks if a perl module is installed on the system.
@@ -67,7 +67,8 @@ def build(bld):
bld.SET_BUILD_GROUP('final')
if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
for src, manpage in pidl_manpages.iteritems():
- bld(rule='${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
+ section = string.rsplit(manpage, ".", 1)[1]
+ bld(rule='${POD2MAN} -c "Samba Documentation" -s %s ${SRC} ${TGT}' % section,
shell=True,
source=src,
install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index afb57da..503e1e4 100644
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -46,6 +46,7 @@ from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT, UF_PASSWD_NOTREQD
from samba.dsdb import UF_NORMAL_ACCOUNT
from samba.dcerpc.misc import SEC_CHAN_WKSTA
from samba import gensec
+from samba import sd_utils
SLEEP_OVERHEAD = 3e-4
@@ -272,13 +273,12 @@ class Packet(object):
return False
fn_name = 'packet_%s_%s' % (self.protocol, self.opcode)
- try:
- fn = getattr(traffic_packets, fn_name)
- if fn is traffic_packets.null_packet:
- return False
- except AttributeError:
+ fn = getattr(traffic_packets, fn_name, None)
+ if not fn:
print("missing packet %s" % fn_name, file=sys.stderr)
return False
+ if fn is traffic_packets.null_packet:
+ return False
return True
@@ -343,6 +343,7 @@ class ReplayContext(object):
res = db.search(db.domain_dn(),
scope=ldb.SCOPE_SUBTREE,
+ controls=["paged_results:1:1000"],
attrs=['dn'])
# find a list of dns for each pattern
@@ -455,6 +456,7 @@ class ReplayContext(object):
self.user_creds.set_workstation(self.netbios_name)
self.user_creds.set_password(self.userpass)
self.user_creds.set_username(self.username)
+ self.user_creds.set_domain(self.domain)
if self.prefer_kerberos:
self.user_creds.set_kerberos_state(MUST_USE_KERBEROS)
else:
@@ -512,6 +514,7 @@ class ReplayContext(object):
self.machine_creds.set_secure_channel_type(SEC_CHAN_WKSTA)
self.machine_creds.set_password(self.machinepass)
self.machine_creds.set_username(self.netbios_name + "$")
+ self.machine_creds.set_domain(self.domain)
if self.prefer_kerberos:
self.machine_creds.set_kerberos_state(MUST_USE_KERBEROS)
else:
@@ -643,6 +646,15 @@ class ReplayContext(object):
return self.ldap_connections[-1]
def simple_bind(creds):
+ """
+ To run simple bind against Windows, we need to run
+ following commands in PowerShell:
+
+ Install-windowsfeature ADCS-Cert-Authority
+ Install-AdcsCertificationAuthority -CAType EnterpriseRootCA
+ Restart-Computer
+
+ """
return SamDB('ldaps://%s' % self.server,
credentials=creds,
lp=self.lp)
@@ -669,7 +681,8 @@ class ReplayContext(object):
def get_samr_context(self, new=False):
if not self.samr_contexts or new:
- self.samr_contexts.append(SamrContext(self.server))
+ self.samr_contexts.append(
+ SamrContext(self.server, lp=self.lp, creds=self.creds))
return self.samr_contexts[-1]
def get_netlogon_connection(self):
@@ -706,7 +719,7 @@ class ReplayContext(object):
class SamrContext(object):
"""State/Context associated with a samr connection.
"""
- def __init__(self, server):
+ def __init__(self, server, lp=None, creds=None):
self.connection = None
self.handle = None
self.domain_handle = None
@@ -715,10 +728,16 @@ class SamrContext(object):
self.user_handle = None
self.rids = None
self.server = server
+ self.lp = lp
+ self.creds = creds
def get_connection(self):
if not self.connection:
- self.connection = samr.samr("ncacn_ip_tcp:%s" % (self.server))
+ self.connection = samr.samr(
+ "ncacn_ip_tcp:%s[seal]" % (self.server),
+ lp_ctx=self.lp,
+ credentials=self.creds)
+
return self.connection
def get_handle(self):
@@ -774,12 +793,12 @@ class Conversation(object):
if p.is_really_a_packet():
self.packets.append(p)
- def add_short_packet(self, timestamp, p, extra, client=True):
+ def add_short_packet(self, timestamp, protocol, opcode, extra,
+ client=True):
"""Create a packet from a timestamp, and 'protocol:opcode' pair, and a
(possibly empty) list of extra data. If client is True, assume
this packet is from the client to the server.
"""
- protocol, opcode = p.split(':', 1)
src, dest = self.guess_client_server()
if not client:
src, dest = dest, src
--
Samba Shared Repository
More information about the samba-cvs
mailing list