[SCM] Samba Shared Repository - branch v4-0-stable updated
Karolin Seeger
kseeger at samba.org
Tue Oct 30 02:36:36 MDT 2012
The branch, v4-0-stable has been updated
via 8c72009 VERSION: Disable GIT snapshot to prepare rc4 release.
via f6b8919 WHATSNEW: Update changes since rc3.
via e83ad06 source3.selftest: Move last variables to selftesthelpers.
via ff52138 source3.selftest: Move more variables to be in common. (cherry picked from commit 66980989e5b28490cd7b04b576cf39d26f183b90)
via 23a6320 selftesthelpers: Fix detection of tap2subunit.
via d1deda0 selftest: Add --random-order option. (cherry picked from commit 67dd28f3605db4cbdc5feacc1121ec3d7dd075a6)
via cf1ede2 source4.selftest.tests: Add FIXME about database verification. (cherry picked from commit 1190f385f72f68f22277c8b380f2d4c461c413a4)
via 2008f37 selftesthelpers: Simplify detection of tap2subunit. (cherry picked from commit 05dc5a39a6ad4b1ffafc904faea3e8e40f6f5cde)
via 85bf826 source3.selftests.tests: Use common plansmbtorture4testsuite() function. (cherry picked from commit fd607e0a9eefb79130941e244435980afbbb4bf7)
via 81c796d source3.selftest.tests: Add suffix for smbclient3/ntlm_auth3. (cherry picked from commit efb27e29dadf58d2dec651ca3a0c108b4cf515ae)
via 020f3f4 source3.selftest.tests: Remove tabs. (cherry picked from commit a841f0fced7abfb0f6d98390c07becdf49a91af5)
via 5abde61 source4.selftest.tests: Add suffix for smbclient4/nmblookup4. (cherry picked from commit ea5e2b56c14072eeaa785d05f1da4d439667e8b6)
via a3d1446 selftesthelpers: Add function for printing smbtorture4 version. (cherry picked from commit 58345820c078f79fe7f67b8e6f947691f7237641)
via 4d2fc2a selftest: Move determining of smbtorture4 options to selftesthelpers. (cherry picked from commit 8237e2727da0d04b82cb3cf644dd337a4c77fe34)
via 244ca61 selftest/selftesthelpers: Share environment handling for extra smbtorture options. (cherry picked from commit fcb7926ce544a8d4b0e5aa6577fe21712b38bb53)
via e2adfe7 selftest/selftesthelpers.py: Share configuration variable, strip whitespace. (cherry picked from commit 6bcb25673bdc249f5a49ded912d90bc84b13809d)
via 5cdec48 selftesthelpers: Share code for listing smbtorture4 tests. (cherry picked from commit 4c4d3c86f0430d38f78d16dcb5d365b577ef4227)
via af3f83a source4.selftest.tests: Rename plansmbtorturesuite() to plansmbtorture4suite(). (cherry picked from commit 868c8c058306b66fb3baa4a36bfe91d6461805d5)
via 220b98d source4.selftest.tests: Consistent naming of smbtorture binary. (cherry picked from commit 55507d0612ecf2db34867eb6065fc5038ea81aa0)
via 76bbf16 samba.tests.docs: Ignore removed parameters. (cherry picked from commit 364ed82d22bbcd69ae237098ba8d6946969bd390)
via 7461d45 smb.conf(5): Mark four removed parameters as such. (cherry picked from commit 4b4e8e21235615af94788fa0ebfa0b0bc09f14fd)
via c7e9ab5 samba.tests.docs: Assume docs are generated by waf. (cherry picked from commit ed37b8ad14d496114654017d394fa18d63456aee)
via 87f45c8 samba.tests.docs: Write error output from xsltproc to standard out. (cherry picked from commit cfa72bcc5e93a840fc07f5d419216443ef8f7599)
via f31db3e samba.tests.docs: Skip tests if xsltproc is not present. (cherry picked from commit 8412b57f5ce40901a0a4e2e66c5f9bcbdcb4b46e)
via afd55f7 smb.conf(5): Consistent spelling of parameter names.
via a23aa34 samba.tests.docs: Support spaces before synonyms. (cherry picked from commit 32fad2b910a9e4f9b753b43cb818c72829236a88)
via 6a34a8a samba.tests.docs: Support synonyms. (cherry picked from commit be4dea45daca51a817a7c383a4092bf69650c6cd)
via a05c65f samba.tests.docs: Distinguish between unknown and undocumened parameters. (cherry picked from commit d0e644e0c83636b4e4c6b52ce0f861ffe38cedeb)
via 97ddb5c tests: Convert find_missing_doc into a unit test. (cherry picked from commit d2f8fe855d0705faf216714cf147038563c0ba7e)
via ccec37c smb.conf(5): Fix mixing of tabs and spaces. (cherry picked from commit 47902702b3e6390de05f8fca2bc457936af9f5c1)
via 6461f02 smb.conf(5): Add basic documentation for 'nsupdate command'. (cherry picked from commit aad30c062fd176fa15994a44a0178d51764cdbf7)
via d6bb051 smb.conf(5): Add basic documentation for 'afs token lifetime'. (cherry picked from commit 0cea6daffe42f5b9b6ee61eb430da3f86bea31df)
via 2a2efb9 smb.conf(5): Add 'ldap password sync' as synonym for 'ldap passwd sync'. (cherry picked from commit 695df863eddd6ee323229fe29a4a40712f3553b4)
via 2059769 smb.conf(5): Add 'socket address' as alias for 'nbt client socket address'. (cherry picked from commit 6c160e3892eea219c50bbb2d1113460817bfad08)
via b4eb7ff smb.conf(5): Add basic documentation for 'tls dh params file'. (cherry picked from commit 03b48e2bdbea30afad9b414fbab5dae67e57b5cf)
via b0cd55e smb.conf(5): Add basic documentation for 'tls enabled'. (cherry picked from commit 946a873e470ed4309bf56dae574b8f48a4dc629f)
via dbb47f3 smb.conf(5): Add basic documentation for 'tls crlfile'. (cherry picked from commit 2e4f054e16aa9f67ec6bfb8ec7af6ebbba26db1d)
via 43492de smb.conf(5): Add basic documentation for 'tls certfile'. (cherry picked from commit 008dfb9a2167603c65fb4db56c8bd62cdd2447d0)
via 3affc93 smb.conf(5): Add basic documentation for 'tls keyfile'. (cherry picked from commit 0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878)
via 3341ad3 smb.conf(5): Add basic documentation for 'tls cafile'. (cherry picked from commit 4e1a06dc238c31a3b2343fcf4983c78fdc52f758)
via 2a7d50a smb.conf(5): Add basic documentation for 'log nt token command'. (cherry picked from commit e27e8f4f88dac6c938272ced6ca4b0fd3b20f8e0)
via 819815e smb.conf(5): Add basic documentation for 'ntp signd socket directory'. (cherry picked from commit 7341dcac105baad0d06d112578fa3f12826bd4ef)
via 3c880b0 smb.conf(5): Add basic documentation for 'spn update command'. (cherry picked from commit 6f36bde82f4a6329b97b400564e69928dffa0173)
via a2090ad smb.conf(5): Add basic documentation for 'allow dns updates'. (cherry picked from commit 68fdcaa6b7f69c622df958413ee3809e56861c04)
via b484ad5 smb.conf(5): Add basic documentation for 'rndc command'. (cherry picked from commit b0b0266aa70721ebfea8dbc2602e81984a3b6023)
via 20e41e6 smb.conf(5): Add basic documentation for 'dns update command'. (cherry picked from commit 4ccea7f86796070ae6dbf404aa93ad4e5a7ae66e)
via 08f35a1 smb.conf(5): Add basic documentation for 'server services'. (cherry picked from commit 3cc61af7ff3b90026fdc6fc84ad905041154bfaf)
via 932a919 smb.conf(5): Add basic documentation for 'samba kcc command'. (cherry picked from commit a63d6a909406c2d0e04f6142f9614c3543ae2d1b)
via c947d2e samba-tool user: Fix typos, improve messages. (cherry picked from commit d09f15163843c5a027476e9087ae96700f6de003)
via 74406c9 smb.conf(5): Add basic documentation 'winbind sealed pipes'. (cherry picked from commit e7c8fcaea5b06897603abb6f4f38ce39b400c9a7)
via 7a1584e smb.conf(5): Add basic documentation for 'dns forwarder'. (cherry picked from commit e9d91cd4a133d7acb377341282230f99f5e10a12)
via 14f4d98 smb.conf(5): Add basic documentation for 'ntvfs handler'. (cherry picked from commit 394258ad4c3413388e800800b2b1b941de037fa3)
via 35298b2 smb.conf(5): Add : to idmap config description to mark it as parametric. (cherry picked from commit c6ba8575ea7fe8b0fdc49d4f823ca441ae99070a)
via fab2bfb smb.conf(5): Add basic documentation for 'winbindd privileged socket directory'. (cherry picked from commit 3cea6257a9e4a3e1dc46e6c555d57992a73d6e6c)
via 0c93527 smb.conf(5): Add basic documentation for 'winbindd socket directory'. (cherry picked from commit d0b38752471dd870ad640fd39076bc51f84c57d1)
via 9193547 smb.conf(5): Extend 'server min protocol' description. (cherry picked from commit dfe75c2f3591652a370a36f73f70e8055bda9d11)
via 6d748c3 samba-tool user test: Fix expected output.
via e009ed6 selftest: Move more tests to common list script.
via d3f1efc samba.join: Fix multiple spaces.
via d57812b selftest: Move some tests to common test script. (cherry picked from commit 1aa291c331c29c2f5ee4572b660c4c2061755856)
via a6f33d7 selftests.tests: Remove reference to Samba 4. (cherry picked from commit 1080b6c2caf1191fd896f3caf38e576a00b01982)
via b74f803 samba4-tests: Move 'samba.tests.source' up.
via 66c8c1b samba.provision.sambadns: Use == to compare strings, not 'is'. (cherry picked from commit 2adf27a99b999a4fd0329d9fa398a9208b60e367)
via e0c3a50 wafsamba: Ignore some more symbols when checking for dupes. (cherry picked from commit 276460cf8afb4894fe1e980c7a75e866c14ba144)
via bcbf56c Fix bug #9329 - Directory listing with SeBackup can crash smbd.
via 6bd3066 WHATSNEW: Update changes since rc3.
via 1c59768 docs-xml:smbd.8: document new smbXsrv_*_global.tdb files
via b36f351 s3:lib: remove unused connections_fetch_entry*() and connections_init()
via e4c5818 s3:smbd: remove unused claim_connection/yield_connection
via 3278e88 s3:smbd: don't call claim/yield_connection() in make_connection_snum/close_cnum()
via 23426dd s3:lib/conn_tdb: implement connections_forall_read() based on smbXsrv_*_global_traverse()
via 6cec427 s3:smbd: fill tcon->global->session_global_id
via fbb9914 s3:smbXsrv.idl: add session_global_id to smbXsrv_tcon_global
via 182bd9d s3:lib: remove function connections_forall()
via 8ac1f07 doc-xml: remove "net connections" documentation
via f502bb6 s3:utils/net: remove unused "net connections"
via ec1fa2b s3:net_serverid: remove connections_forall from "net serverid wipedbs"
via a577e8a s3:lib: remove unused sessionid_*() functions
via 775eb87 s3:net_serverid: remove sessionid_traverse from "net serverid wipedbs"
via eb4cfb1 s3:smbd: don't use (fill) sessionid.tdb in session_claim/yield any more.
via 7d97e84 s3:lib: implement sessionid_traverse_read with smb2srv_session_traverse_read
via 4ac8f73 s3:smbd/connection: use smbXsrv_tcon_traverse to count connections
via 4ed2c32 s3:smbd:setup_new_vc_session: traverse sessions instead of connections to shutdown other smbds
via 1f8b575 s3:build: move sessionid_tdb.o and conn_tdb.o to SMBD_OBJ_BASE
via d8b829e s3:smbXsrv_tcon: add smbXsrv_tcon_global_traverse()
via 989b8f5 s3:smbXsrv_session: add smbXsrv_session_global_traverse()
via d9f0470 s3:smbd: use session_global_id as session number for pam and utmp
via e520d66 s3:configure: check that struct utmp.ut_line is large enough for our use case
via a683d49 s3:smbd: initialize session->global before calling session_claim
via 5c363cc s3:smbd: remove smbd_server_connection argument from session_claim()
via 5a9fc8c s3:smbd: pass smbXsrv_session instead of user_struct to session_claim() and session_yield()
via b37667c s3:net_status_shares: use connections_forall_read for a read only traversal
via cd07d66 s3:count_current_connections: do not clear orphaned entries from connections.tdb
via dda754d s3:smbcontrol: don't do stack_trace by connection but by server_id.
via 2ac2fbd s3:lib: remove unused function connections_traverse()
via 9df3318 s3:rpc_server/srvsvc: remove function net_enum_pipes()
via e2666f5 s3:auth: use const in smb_pam_xxx_session()
via 9462315 s3:auth: remove duplicate propotypes for smb_pam_claim_session and smb_pam_close_session
via eedf109 s3:smbd/utmp: remove ip address from utmp record
via f580f3c s3:smbd: remove duplicate prototypes for sys_utmp_claim() an sys_utmp_yield()
via da878ce s3:smbd: add exit_server to the smbd_shim hooks
via 42c46f9 s3:smbd: move initialization of the smbd_shim from smbd_init_globals() to main()
via 6bb0dbd s3: fix comment header description for smbd_shim
via 4f9cfe7 s3:smbd: update sconn->remote_hostname after the netbios session request
via 5f6433e buildtools/wafsamba: only display 'ok' if the result is True
via 7b20e56f s3:utils/net fix a compiler warning
via 5d82300 WHATSNEW: Prepare release notes for Samba 4.0.0rc4.
via 0cd45fd packaging: Move smbprint to a comman location.
via 6afa48e lib/tsocket: fix loop in tdgram_bsd_recvfrom() (bug #9184)
via a5327b0 docs: fix opening and ending tag mismatch: para
via 59d68df docs: fix opening and ending tag mismatch: para
via 29d608c Ensure the masks don't conflict with the ACL checks.
via c2b3ed2 Update WHATSNEW.txt with removed parameters.
via e61d88a Remove the parameters:
via 6adc7da Remove all uses of lp_security_mask/lp_force_security_mode/lp_dir_security_mask/lp_force_dir_security_mode and replace with the normal masks. Now these parameters can be removed.
via aaa0daa When setting a non-default ACL, don't forget to apply masks to SMB_ACL_USER and SMB_ACL_GROUP entries.
via a5a2540 Only apply masks on non-default ACL entries when setting the ACL.
via 35347d7 Use is_default_acl variable in canonicalise_acl().
via f98ba89 Reformat spacing to be even.
via e9f2dc1 pam_winbind: fix segfault in pam_sm_authenticate()
via 9f70587 ldb: bump version to 1.1.13 so the 4.0 release can get the isprint fix
via e733084 s3:smbd:durable: factor stat checks out into vfs_default_durable_reconnect_check_stat()
via 5593fc7 s3:smbd:durable: store stat info for disconnected durables and check at reconnect.
via b024d2a s3:open_files.idl: add stat-info to vfs_default_durable_cookie.
via 67d77cd s3:smbd/durable: remove an extra blank line from vfs_default_durable_reconnect()
via 7a4901f s3:smbd/durable: add write_time specific stuff to vfs_default_durable_cookie
via c16aeeb s3:open_files.idl: add write_time specific stuff to vfs_default_durable_cookie
via bedc1aa s3:smbd/durable: update the low level write_time before disconnecting the file.
via 19987bd s3:smbd/durable: trigger pending write_time updates before disconnecting the file
via 6e7b1ce s3:rpc_server: avoid a level 0 DEBUG if tstream_npa_connect_recv fails (bug #9309)
via 02bef9d libcli/smb: fix unitialized padding in smb2_create_blob_push_one() (bug #9209)
via 3955a6a build: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind are builtin
via b3b4b45 BUG #9295: Build standard auth modules as internal modules.
via 1318eab Merge commit 'samba-4.0.0rc3' into v4-0-test
via 35bfa14 VERSION: Bump version number up to 4.0.0rc4.
from fa4b3c9 VERSION: Set valid value for SAMBA_VERSION_IS_SVN_SNAPSHOT.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 58 +++-
buildtools/wafsamba/samba_autoconf.py | 4 +-
buildtools/wafsamba/symbols.py | 2 +-
docs-xml/Makefile | 3 +-
docs-xml/manpages/net.8.xml | 39 --
docs-xml/manpages/smbd.8.xml | 14 +-
docs-xml/scripts/find_missing_doc | 83 -----
docs-xml/smbdotconf/base/serverservices.xml | 18 +
docs-xml/smbdotconf/domain/allowdnsupdates.xml | 18 +
docs-xml/smbdotconf/domain/dnsforwarder.xml | 17 +
docs-xml/smbdotconf/domain/dnsupdatecommand.xml | 15 +
docs-xml/smbdotconf/domain/nsupdatecommand.xml | 13 +
docs-xml/smbdotconf/domain/rndccommand.xml | 17 +
docs-xml/smbdotconf/domain/spnupdatecommand.xml | 14 +
docs-xml/smbdotconf/ldap/ldappasswdsync.xml | 1 +
docs-xml/smbdotconf/misc/afstokenlifetime.xml | 15 +
.../smbdotconf/misc/nbtclientsocketaddress.xml | 1 +
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 9 +-
docs-xml/smbdotconf/security/createmask.xml | 5 +-
docs-xml/smbdotconf/security/directorymask.xml | 8 +-
.../smbdotconf/security/directorysecuritymask.xml | 39 +--
docs-xml/smbdotconf/security/forcecreatemode.xml | 6 +
.../smbdotconf/security/forcedirectorymode.xml | 6 +
.../security/forcedirectorysecuritymode.xml | 47 +--
docs-xml/smbdotconf/security/forcesecuritymode.xml | 41 +--
docs-xml/smbdotconf/security/lognttokencommand.xml | 14 +
.../security/ntpsigndsocketdirectory.xml | 17 +
docs-xml/smbdotconf/security/sambakcccommand.xml | 19 +
docs-xml/smbdotconf/security/securitymask.xml | 36 +--
docs-xml/smbdotconf/security/tlscafile.xml | 18 +
docs-xml/smbdotconf/security/tlscertfile.xml | 17 +
docs-xml/smbdotconf/security/tlscrlfile.xml | 17 +
docs-xml/smbdotconf/security/tlsdhparamsfile.xml | 18 +
docs-xml/smbdotconf/security/tlsenabled.xml | 11 +
docs-xml/smbdotconf/security/tlskeyfile.xml | 18 +
docs-xml/smbdotconf/vfs/ntvfshandler.xml | 16 +
docs-xml/smbdotconf/winbind/idmapconfig.xml | 4 +-
.../winbind/winbinddprivilegedsocketdirectory.xml | 14 +
.../smbdotconf/winbind/winbinddsocketdirectory.xml | 13 +
docs-xml/smbdotconf/winbind/winbindsealedpipes.xml | 16 +
examples/printing/smbprint | 176 ----------
examples/scripts/shares/python/smbparm.py | 4 -
lib/ldb/ABI/{ldb-1.1.12.sigs => ldb-1.1.13.sigs} | 0
...ldb-util-1.1.10.sigs => pyldb-util-1.1.13.sigs} | 0
lib/ldb/wscript | 2 +-
lib/param/param_functions.c | 4 -
lib/param/param_table.c | 36 --
lib/tsocket/tsocket_bsd.c | 10 +-
libcli/smb/smb2_create_blob.c | 2 +-
nsswitch/pam_winbind.c | 7 +-
packaging/RHEL-CTDB/samba.spec.tmpl | 2 +-
packaging/RHEL-CTDB/setup/smbprint | 84 -----
packaging/RHEL/samba.spec.tmpl | 2 +-
packaging/RHEL/setup/smbprint | 84 -----
packaging/printing/README | 3 +
packaging/printing/smbprint | 84 +++++
selftest/selftest.pl | 10 +-
selftest/selftesthelpers.py | 79 ++++-
selftest/target/Samba3.pm | 3 +-
selftest/target/Samba4.pm | 3 +-
selftest/tests.py | 52 +++
selftest/wscript | 7 +-
source3/Makefile.in | 84 ++---
source3/auth/pampass.c | 8 +-
source3/auth/proto.h | 6 +-
source3/auth/wscript_build | 12 +-
source3/configure.in | 37 +-
source3/include/local.h | 20 -
source3/include/proto.h | 10 -
source3/lib/conn_tdb.c | 232 +++++--------
source3/lib/conn_tdb.h | 25 +--
source3/lib/sessionid_tdb.c | 141 ++------
source3/lib/smbd_shim.c | 18 +-
source3/lib/smbd_shim.h | 6 +-
source3/librpc/idl/open_files.idl | 27 ++
source3/librpc/idl/smbXsrv.idl | 4 +
source3/param/loadparm.c | 4 -
source3/rpc_server/rpc_ncacn_np.c | 6 +-
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 97 ------
source3/selftest/tests.py | 259 ++++++--------
source3/smbd/connection.c | 132 +-------
source3/smbd/durable.c | 365 +++++++++++++++++++-
source3/smbd/globals.c | 16 -
source3/smbd/globals.h | 8 +
source3/smbd/password.c | 2 +-
source3/smbd/posix_acls.c | 74 +++--
source3/smbd/proto.h | 29 +-
source3/smbd/reply.c | 13 +
source3/smbd/sec_ctx.c | 25 ++
source3/smbd/server.c | 24 +-
source3/smbd/server_exit.c | 4 +-
source3/smbd/service.c | 18 +-
source3/smbd/session.c | 193 ++---------
source3/smbd/sesssetup.c | 67 ++--
source3/smbd/smb2_sesssetup.c | 14 +-
source3/smbd/smb2_tcon.c | 2 +
source3/smbd/smbXsrv_session.c | 71 ++++
source3/smbd/smbXsrv_tcon.c | 70 ++++
source3/smbd/trans2.c | 14 +-
source3/smbd/uid.c | 12 +-
source3/smbd/utmp.c | 54 +---
source3/torture/vfstest.c | 14 +-
source3/utils/net.c | 7 -
source3/utils/net_connections.c | 273 ---------------
source3/utils/net_proto.h | 4 -
source3/utils/net_serverid.c | 54 +---
source3/utils/net_status.c | 5 +-
source3/utils/smbcontrol.c | 13 +-
source3/wscript | 18 +-
source3/wscript_build | 14 +-
source4/rpc_server/wscript_build | 2 +-
source4/scripting/python/samba/join.py | 2 +-
source4/scripting/python/samba/netcmd/user.py | 16 +-
.../scripting/python/samba/provision/sambadns.py | 2 +-
source4/scripting/python/samba/tests/docs.py | 127 +++++++
.../python/samba/tests/samba_tool/user.py | 2 +-
source4/selftest/tests.py | 255 ++++++--------
118 files changed, 2100 insertions(+), 2308 deletions(-)
delete mode 100755 docs-xml/scripts/find_missing_doc
create mode 100644 docs-xml/smbdotconf/base/serverservices.xml
create mode 100644 docs-xml/smbdotconf/domain/allowdnsupdates.xml
create mode 100644 docs-xml/smbdotconf/domain/dnsforwarder.xml
create mode 100644 docs-xml/smbdotconf/domain/dnsupdatecommand.xml
create mode 100644 docs-xml/smbdotconf/domain/nsupdatecommand.xml
create mode 100644 docs-xml/smbdotconf/domain/rndccommand.xml
create mode 100644 docs-xml/smbdotconf/domain/spnupdatecommand.xml
create mode 100644 docs-xml/smbdotconf/misc/afstokenlifetime.xml
create mode 100644 docs-xml/smbdotconf/security/lognttokencommand.xml
create mode 100644 docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
create mode 100644 docs-xml/smbdotconf/security/sambakcccommand.xml
create mode 100644 docs-xml/smbdotconf/security/tlscafile.xml
create mode 100644 docs-xml/smbdotconf/security/tlscertfile.xml
create mode 100644 docs-xml/smbdotconf/security/tlscrlfile.xml
create mode 100644 docs-xml/smbdotconf/security/tlsdhparamsfile.xml
create mode 100644 docs-xml/smbdotconf/security/tlsenabled.xml
create mode 100644 docs-xml/smbdotconf/security/tlskeyfile.xml
create mode 100644 docs-xml/smbdotconf/vfs/ntvfshandler.xml
create mode 100644 docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
create mode 100644 docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
create mode 100644 docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
delete mode 100755 examples/printing/smbprint
copy lib/ldb/ABI/{ldb-1.1.12.sigs => ldb-1.1.13.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.1.13.sigs} (100%)
delete mode 100644 packaging/RHEL-CTDB/setup/smbprint
delete mode 100644 packaging/RHEL/setup/smbprint
create mode 100644 packaging/printing/README
create mode 100644 packaging/printing/smbprint
create mode 100644 selftest/tests.py
delete mode 100644 source3/utils/net_connections.c
create mode 100644 source4/scripting/python/samba/tests/docs.py
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 9d8878e..09a4a0f 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=3
+SAMBA_VERSION_RC_RELEASE=4
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d1e36ec..dc3b1e4 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
Release Announcements
=====================
-This is the third release candidate of Samba 4.0. This is *not*
+This is the fourth release candidate of Samba 4.0. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
@@ -58,7 +58,7 @@ Samba3-like logon services provided over CIFS. We correctly generate
the infamous Kerberos PAC, and include it with the Kerberos tickets we
issue.
-Samba 4.0.0rc3 ships with two distinct file servers. We now use the
+Samba 4.0.0rc4 ships with two distinct file servers. We now use the
file server from the Samba 3.x series 'smbd' for all file serving by
default.
@@ -114,9 +114,12 @@ smb.conf changes
client signing Changed default
dcerpc endpoint servers New
dgram port New
+ directory security mask Removed
display charset Removed
dns forwarder New
dns update command New
+ force security mode Removed
+ force directory security mode Removed
homedir map Changed default
kernel oplocks Changed default
kernel share modes New
@@ -135,6 +138,7 @@ smb.conf changes
rndc command New
rpc big endian New
samba kcc command New
+ security mask Removed
send spnego principal Removed
server max protocol New
server min protocol New
@@ -162,6 +166,56 @@ smb.conf changes
winbindd socket directory New
+CHANGES SINCE 4.0.0rc3
+======================
+
+o Michael Adam <obnox at samba.org>
+ * BUG 9304: Remove unused sessionid.tdb and connections.tdb related code.
+ * BUG 9319: validate stat(2) information before reconnect durable handles.
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 9190: Fix regression (change in behavior) of default acl masks.
+ Remove "security mask", "force security mode", "directory security mask"
+ "force directory" and "security mode" parameters.
+ * BUG 9329: Directory listing with SeBackup can crash smbd.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 9295: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind
+ are builtin.
+ * BUG 9322: Backport ldb version update.
+
+
+o Björn Baumbach <bb at sernet.de>
+ * BUG 9190: docs: Fix opening and ending tag mismatch: para.
+
+
+o Gregor Beck <gbeck at sernet.de>
+ * BUG 9304: Remove unused sessionid.tdb and connections.tdb related code.
+
+
+o David Disseldorp <ddiss at suse.de>
+ * BUG 8564: Fix segfault in pam_sm_authenticate().
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 9184: Fix loop in tdgram_bsd_recvfrom().
+ * BUG 9209: Fix unitialized padding in smb2_create_blob_push_one().
+ * BUG 9304: Remove unused sessionid.tdb and connections.tdb related code.
+ * BUG 9309: Avoid a level 0 DEBUG if tstream_npa_connect_recv fails.
+ * BUG 9318: Fix write time updates for durable handles.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 9295: Build standard auth modules as internal modules.
+ * BUG 9301: Move 'smbprint' to a common location.
+
+
+o Jelmer Vernooij <jelmer at samba.org>
+ * BUG 9274: Add documentation and selftest fixes.
+
+
CHANGES SINCE 4.0.0rc2
======================
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 5d3cc5a..76316d2 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -62,8 +62,8 @@ def COMPOUND_END(conf, result):
conf.check_message_1 = conf.saved_check_message_1
conf.check_message_2 = conf.saved_check_message_2
p = conf.check_message_2
- if result:
- p('ok ')
+ if result is True:
+ p('ok')
elif not result:
p('not found', 'YELLOW')
else:
diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 13d84b9..daa18b9 100644
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -569,7 +569,7 @@ def symbols_whyneeded(task):
def report_duplicate(bld, binname, sym, libs, fail_on_error):
'''report duplicated symbols'''
- if sym in ['_init', '_fini']:
+ if sym in ['_init', '_fini', '_edata', '_end', '__bss_start']:
return
libnames = []
for lib in libs:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0b4e880..6cb069f 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -260,8 +260,7 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
# Find undocumented parameters
-undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc scripts/find_missing_manpages
- $(PERL) scripts/find_missing_doc $(SRCDIR)
+undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_manpages
$(PERL) scripts/find_missing_manpages $(SRCDIR)/source3
samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 322aa88..3765af9 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -2112,45 +2112,6 @@ string.</member>
</refsect2>
<refsect2>
-<title>CONNECTIONS</title>
-<para>
-Manipulate Samba's connections database.
-</para>
-
-<para>The registry commands are:
-<simplelist>
-<member>net connections cleanup - Remove orphaned entries from the connections database.</member>
-</simplelist>
-</para>
-
-<refsect3>
- <title>CONNECTIONS CLEANUP [-avT]</title>
- <para> Remove orphaned entries from the connections database. This may be necessary if restarting smbd isn't an option.
- <variablelist>
- <varlistentry><term>-a|--auto</term>
- <listitem><para>
- Noninteractive mode, don't ask.
- </para></listitem>
- </varlistentry>
-
- <varlistentry><term>-v|--verbose</term>
- <listitem><para>
- Produce more output.
- </para></listitem>
- </varlistentry>
-
- <varlistentry><term>-T|--test</term>
- <listitem><para>
- Dry run, show what changes would be made but don't touch anything.
- </para></listitem>
- </varlistentry>
- </variablelist>
- </para>
-</refsect3>
-
-</refsect2>
-
-<refsect2>
<title>EVENTLOG</title>
<para>Starting with version 3.4.0 net can read, dump, import and export native
diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml
index ae34ce2..98e76fb 100644
--- a/docs-xml/manpages/smbd.8.xml
+++ b/docs-xml/manpages/smbd.8.xml
@@ -309,10 +309,6 @@
<listitem><para>browse lists</para></listitem>
</varlistentry>
-<varlistentry><term>connections.tdb</term>
-<listitem><para>share connections (used to enforce max connections, etc...)</para></listitem>
-</varlistentry>
-
<varlistentry><term>gencache.tdb</term>
<listitem><para>generic caching db</para></listitem>
</varlistentry>
@@ -357,10 +353,18 @@
<listitem><para>Windows registry skeleton (connect via regedit.exe)</para></listitem>
</varlistentry>
-<varlistentry><term>sessionid.tdb</term>
+<varlistentry><term>smbXsrv_session_global.tdb</term>
<listitem><para>session information (e.g. support for 'utmp = yes')</para></listitem>
</varlistentry>
+<varlistentry><term>smbXsrv_tcon_global.tdb</term>
+<listitem><para>share connections (used to enforce max connections, etc...)</para></listitem>
+</varlistentry>
+
+<varlistentry><term>smbXsrv_open_global.tdb</term>
+<listitem><para>open file handles (used durable handles, etc...)</para></listitem>
+</varlistentry>
+
<varlistentry><term>share_info.tdb*</term>
<listitem><para>share acls</para></listitem>
</varlistentry>
diff --git a/docs-xml/scripts/find_missing_doc b/docs-xml/scripts/find_missing_doc
deleted file mode 100755
index d75ef8d..0000000
--- a/docs-xml/scripts/find_missing_doc
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2007,2012 Jelmer Vernooij <jelmer at samba.org>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-import optparse
-import os
-import re
-
-parser = optparse.OptionParser("source_dir")
-
-(opts, args) = parser.parse_args()
-
-if len(args) == 1:
- topdir = args[0]
-else:
- topdir = "."
-
-# Reading links from manpage
-
-curdir = os.getcwd()
-doc = {}
-
-os.chdir("smbdotconf");
-
-f = os.popen("xsltproc --xinclude --param smb.context ALL generate-context.xsl parameters.all.xml", "r")
-try:
- for l in f.readlines():
- m = re.match('<samba:parameter .*?name="([^"]*?)"', l)
- if m:
- name = m.group(1).replace(" ", "")
- doc[name] = False
-finally:
- f.close()
-
-os.chdir(curdir)
-
-# Reading entries from source code
-
-f = open(os.path.join(topdir, "lib/param/param_table.c"), "r")
-
-# burn through the preceding lines
-while True:
- l = f.readline()
- if l.startswith("static struct parm_struct parm_table"):
- break
-
-for l in f.readlines():
- if re.match("^\s*\}\;\s*$", l):
- break
- # pull in the param names only
- if re.match(".*P_SEPARATOR.*", l):
- continue
- m = re.match("\s*\.label\s*=\s*\"(.*)\".*", l)
- if not m:
- continue
-
- name = m.group(1)
- name = name.replace(" ", "")
-
- if name.lower() in doc:
- doc[name.lower()] = True
- else:
- print "'%s' is not documented" % name
-f.close()
-
-# Try to find missing references
-for key in doc.keys():
- if doc[key] == "FOUND":
- print "'$_' is documented but is not a configuration option"
diff --git a/docs-xml/smbdotconf/base/serverservices.xml b/docs-xml/smbdotconf/base/serverservices.xml
new file mode 100644
index 0000000..503938a
--- /dev/null
+++ b/docs-xml/smbdotconf/base/serverservices.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="server services"
+ context="G"
+ type="list"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option contains the services that the Samba daemon will
+ run.</para>
+
+ <para>An entry in the <filename>smb.conf</filename> file can either
+ override the previous value completely or entries can be removed from
+ or added to it by prefixing them with <constant>+</constant> or
+ <constant>-</constant>. </para>
+</description>
+
+<value type="default">s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate dns</value>
+<value type="example">-s3fs +smb</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/allowdnsupdates.xml b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
new file mode 100644
index 0000000..fc7d3e8
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="allow dns updates"
+ context="G"
+ type="enum"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option determines what kind of updates to the DNS are allowed.
+ </para>
+
+ <para>DNS updates can either be disallowed completely by setting it to
+ <constant>disabled</constant>, enabled over secure connections only by
+ setting it to <constant>secure</constant> or allowed in all cases
+ by setting it to <constant>enabled</constant> or <constant>nonsecure</constant>.
+ </para>
+</description>
+
+<value type="default">secure only</value>
+<value type="example">disabled</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/dnsforwarder.xml b/docs-xml/smbdotconf/domain/dnsforwarder.xml
new file mode 100644
index 0000000..23a3886
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/dnsforwarder.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="dns forwarder"
+ context="G"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option specifies the DNS server that DNS requests will be
+ forwarded to if they can not be handled by Samba itself.
+ </para>
+
+ <para>The DNS forwarder is only used if the internal DNS server
+ in Samba is used.
+ </para>
+</description>
+
+<value type="default"></value>
+<value type="example">192.168.0.1</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
new file mode 100644
index 0000000..08ff90a
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="dns update command"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option sets the command that is called when there are
+ DNS updates. It should update the local machines DNS names using
+ TSIG-GSS.
+ </para>
+</description>
+
+<value type="default">$prefix/sbin/samba_dnsupdate</value>
+<value type="example">/usr/local/sbin/dnsupdate</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/nsupdatecommand.xml b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
new file mode 100644
index 0000000..3cf02f1
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
@@ -0,0 +1,13 @@
+<samba:parameter name="nsupdate command"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option sets the path to the <filename>nsupdate</filename>
+ command which is used for GSS-TSIG dynamic DNS updates.
+ </para>
+</description>
+
+<value type="default">$prefix/sbin/nsupdate -g</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/rndccommand.xml b/docs-xml/smbdotconf/domain/rndccommand.xml
new file mode 100644
index 0000000..b407ff2
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/rndccommand.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="rndc command"
+ context="G"
+ type="string"
+ advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option specifies the path to the name server control utility.
+ </para>
+
+ <para>The <filename>rndc</filename> utility should be a part of the
+ bind installation.
+ </para>
+</description>
+
+<value type="default">/usr/sbin/rndc</value>
+<value type="example">/usr/local/bind9/sbin/rndc</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/spnupdatecommand.xml b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
new file mode 100644
index 0000000..f63be84
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="spn update command"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option sets the command that for updating
+ servicePrincipalName names from <filename>spn_update_list</filename>.
+ </para>
+</description>
+
+<value type="default">$prefix/sbin/samba_spnupdate</value>
+<value type="example">/usr/local/sbin/spnupdate</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
index 864bfc4..8c7dea6 100644
--- a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
+++ b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
@@ -5,6 +5,7 @@
type="enum"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>ldap password sync</synonym>
<description>
<para>
This option is used to define whether or not Samba should sync the LDAP password with the NT
diff --git a/docs-xml/smbdotconf/misc/afstokenlifetime.xml b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
new file mode 100644
index 0000000..cbf9574
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
--
Samba Shared Repository
More information about the samba-cvs
mailing list