[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Mon Oct 29 08:07:04 MDT 2012
The branch, v4-0-test has been updated
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)
from 02bef9d libcli/smb: fix unitialized padding in smb2_create_blob_push_one() (bug #9209)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 6bd30662d7ad4b7b2eaf14fa7dcd3dc3f04149b1
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Oct 29 12:43:43 2012 +0100
WHATSNEW: Update changes since rc3.
Karolin
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Mon Oct 29 15:06:00 CET 2012 on sn-devel-104
commit 1c597684117a8f3f1b8551dfd97fc8a464e94543
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Oct 18 15:35:39 2012 +0200
docs-xml:smbd.8: document new smbXsrv_*_global.tdb files
metze
Signed-off-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Fri Oct 19 14:00:39 CEST 2012 on sn-devel-104
(cherry picked from commit 81d0b8aebf8e7dee73907fabf408f0b2c3145207)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
The last 39 patches address bug 9304 - remove unused sessionid.tdb and
connections.tdb related code.
commit b36f3510f6fee1de996cadc0bb6125a16260207d
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 5 19:05:32 2012 +0200
s3:lib: remove unused connections_fetch_entry*() and connections_init()
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit a144911958d7bcd291a8f42a40832ffc0187279a)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit e4c581839ff705ace9fc7e11807c1ad20f3e1d41
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 5 19:13:39 2012 +0200
s3:smbd: remove unused claim_connection/yield_connection
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d4f369c470ec1c8c7986a73e4ee6e18a97edd834)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 3278e88beda39def545d5479e10b5ee22224fe25
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 5 19:11:31 2012 +0200
s3:smbd: don't call claim/yield_connection() in make_connection_snum/close_cnum()
This was used to maintain the connections.tdb database which is being removed.
We use info from the smbXsrv_tcon instead.
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 3eff70087005ffdee2ca579e65846ba1c33ec17f)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 23426dd1b594decf19a3c6dbfff37425f6f6380c
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Sep 3 11:13:16 2012 +0200
s3:lib/conn_tdb: implement connections_forall_read() based on smbXsrv_*_global_traverse()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 0ccbf89bda71cdbe8d216bab0aa6aacd98cf95df)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 6cec42799d17839168a69c90e9803c1dda4136d9
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Oct 18 13:40:08 2012 +0200
s3:smbd: fill tcon->global->session_global_id
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit f76436c6ea7867fb60d6ac6b65cffc502a018467)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit fbb99149cc2f3b34375d0cf421369599a790d598
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Oct 18 13:38:34 2012 +0200
s3:smbXsrv.idl: add session_global_id to smbXsrv_tcon_global
This is required for some debugging tools like smbstatus.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 7be7ec803f88de68ef9a5e2b14994a13589ff441)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 182bd9dcc38cc752f2ce4789e06e06a0912b0833
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Aug 27 15:21:42 2012 +0200
s3:lib: remove function connections_forall()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit b74ed25a9999c0029ddf2771f729c497c20b9c30)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 8ac1f07d672e5ffcea61940dea3c1748dc8c8e10
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Oct 18 10:13:59 2012 +0200
doc-xml: remove "net connections" documentation
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 3b61c605d6815a8033d70f367a69e876f63bc5de)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit f502bb637f122f12efaa326b302ac9c4352c45cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 5 19:20:45 2012 +0200
s3:utils/net: remove unused "net connections"
The connections.tdb will go away.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 4a7a8ecb0b69b3b79823aab7504e75451d20e5a0)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit ec1fa2b6bf1134f0f6efa1141fc0b560564e17df
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Aug 23 14:02:22 2012 +0200
s3:net_serverid: remove connections_forall from "net serverid wipedbs"
This tdb will go away.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 5a4ffb20ffe387fa5bb373778ba84d24a7e5b74f)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit a577e8a8248d245c83b5751db6d1026347be06da
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Aug 23 10:36:59 2012 +0200
s3:lib: remove unused sessionid_*() functions
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit ac5c8909a94228cec47067188036f1c2a42378aa)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 775eb87904b4b191f286d7196919a7c71c1830a1
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Aug 23 14:02:22 2012 +0200
s3:net_serverid: remove sessionid_traverse from "net serverid wipedbs"
This tdb will go away.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 2f2cb2f6894c94f375310661e7c40c167a784eda)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit eb4cfb1d5a45bcdef582e4f3fbf9349b72ef8d5d
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Aug 23 16:15:25 2012 +0200
s3:smbd: don't use (fill) sessionid.tdb in session_claim/yield any more.
We use data from new smbXsrv_session instead.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit dbff58228e5d05d9799322973aee950951d23fb8)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 7d97e8444383d0459634fa8ac3d7172267db181f
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Aug 23 10:36:59 2012 +0200
s3:lib: implement sessionid_traverse_read with smb2srv_session_traverse_read
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit f2714318ae7358abd328e264dc80821c2749bcc6)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 4ac8f738dbb19d9cc9e43bb66a95b66f90865673
Author: Gregor Beck <gbeck at sernet.de>
Date: Tue Aug 28 15:53:28 2012 +0200
s3:smbd/connection: use smbXsrv_tcon_traverse to count connections
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d9ea786c86d6bc42df60881ff703213ef3bd9319)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 4ed2c32070cc2ff8143e43cee43f2b739e41113d
Author: Gregor Beck <gbeck at sernet.de>
Date: Tue Aug 28 14:29:51 2012 +0200
s3:smbd:setup_new_vc_session: traverse sessions instead of connections to shutdown other smbds
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit f588704640868a003d901b57045511623e6a1f69)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 1f8b5758bae76a42d9ec3c9ee969a263b2c492f4
Author: Gregor Beck <gbeck at sernet.de>
Date: Fri Sep 7 15:18:39 2012 +0200
s3:build: move sessionid_tdb.o and conn_tdb.o to SMBD_OBJ_BASE
and use SMBD_OBJ_BASE for a couple of targets where sessionid_tdb and conn_tdb
were used.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit bcfa721a36269d4390ae5ce747cfd3dff6a255ac)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit d8b829e8612e1f9fa5a07a9adf22911f20040da1
Author: Gregor Beck <gbeck at sernet.de>
Date: Tue Aug 28 15:35:58 2012 +0200
s3:smbXsrv_tcon: add smbXsrv_tcon_global_traverse()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 89cc865cabdf7f7fd7c26d3da784c1d7f9e1d6b0)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 989b8f5c623dd0de80cffbb5b715c8494882daba
Author: Gregor Beck <gbeck at sernet.de>
Date: Wed Aug 22 14:28:31 2012 +0200
s3:smbXsrv_session: add smbXsrv_session_global_traverse()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c3a658f59578899215920a42f5cb568f9368ce13)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit d9f04702a24706277f2ae1c39b97cf80be378e71
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Aug 23 15:21:06 2012 +0200
s3:smbd: use session_global_id as session number for pam and utmp
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit b288ddd5c0ee7524e30a4fce3ec4f03c19a1764a)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit e520d6686df4169c30034c535cde76e9c7318db2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 8 11:15:50 2012 +0200
s3:configure: check that struct utmp.ut_line is large enough for our use case
We use "smb/%u" with a 32-bit number, "smb/4294967295\0" requires
15 chars (including the '\0').
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 92d53dd7dc8ca71ae28d2a8762524396cd3c6f58)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit a683d492081ed1d4bdd52aba0b0308587a90426c
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Aug 27 11:03:25 2012 +0200
s3:smbd: initialize session->global before calling session_claim
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit e24b1041b1f6e5b1c5a258a2cbe058f134a45ed9)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 5c363cce75959db931a4cb6e58d72f46ccf825e7
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Aug 27 09:21:58 2012 +0200
s3:smbd: remove smbd_server_connection argument from session_claim()
retrieve the server connection from the smbXsrv_session argument instead.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 02b9b79447be46835adf963cca14c618d0c435e6)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 5a9fc8cb6e55cb25a410a11686c30cc740a25eb0
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Aug 23 14:47:33 2012 +0200
s3:smbd: pass smbXsrv_session instead of user_struct to session_claim() and session_yield()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 4878769f8e6763fbb8347f2ea674c7a861d95564)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit b37667ca86d17982d6612fb1551c4d028d737174
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Aug 27 15:18:07 2012 +0200
s3:net_status_shares: use connections_forall_read for a read only traversal
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 77f99ece482a11aad50219e64d231b27dbbccbba)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit cd07d665cb826e6bfd5c04df74b427683000184b
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Aug 27 15:12:36 2012 +0200
s3:count_current_connections: do not clear orphaned entries from connections.tdb
This removes one of the last callers of connetions_forall.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 77906e7cdf4c40ab860af8bb42e2c5f3b5501e7d)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit dda754dd10ee29f0c080376aac0a30d1baf6c455
Author: Gregor Beck <gbeck at sernet.de>
Date: Tue Aug 28 09:31:59 2012 +0200
s3:smbcontrol: don't do stack_trace by connection but by server_id.
Inparticular use serverid_traverse_read instead of connections_foralli
to enumerate processes.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit b237bbc0d1afdfea3b6b6335854f92d6fe80a151)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 2ac2fbd0426a453fcbf3b66dfa2b41b903ad17c3
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Aug 27 15:07:08 2012 +0200
s3:lib: remove unused function connections_traverse()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d5c273919d129f884d5fb13e06ad73e01c7176e1)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 9df3318210778d50bc5f4e20c04542b61c532077
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Aug 27 14:46:22 2012 +0200
s3:rpc_server/srvsvc: remove function net_enum_pipes()
The relevant records are not written to connections.tdb since commit
a781b78417b6d7b875230dd2edcb932445aa4197
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 611e30ea233f0e5dab1439e930ea8544b85ca3b2)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit e2666f584e996239f6c3c9e26d0ecae296a2a96a
Author: Gregor Beck <gbeck at sernet.de>
Date: Mon Sep 3 13:55:50 2012 +0200
s3:auth: use const in smb_pam_xxx_session()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c9a2111b0025156ba70c6eb9fa857e5d639f62b7)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 946231535bfd4d5e01005847d8bf70dfb933c729
Author: Michael Adam <obnox at samba.org>
Date: Thu Oct 18 16:14:19 2012 +0200
s3:auth: remove duplicate propotypes for smb_pam_claim_session and smb_pam_close_session
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 7aa0d7c55f9cbb3ed96beaf7c4891cadc9bc00ae)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit eedf1090010354697772be967d1d7e06379f5534
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Oct 9 09:38:36 2012 +0200
s3:smbd/utmp: remove ip address from utmp record
1. This was broken since Samba 3.2. when ipv6 support was
added, it only worked for ipv6 addresses.
2. userspace tools only display the hostname field.
3. This is not really portable
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 9b2a3ebf5cfb4613b117ebb83abe92b93e759381)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit f580f3c8616ad027fa90b9b1049d9635bd69a0d3
Author: Michael Adam <obnox at samba.org>
Date: Thu Oct 18 16:06:42 2012 +0200
s3:smbd: remove duplicate prototypes for sys_utmp_claim() an sys_utmp_yield()
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 42b0398bdeae8fd7e8ae92ab3a464c3eba9fb0da)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit da878ceda5a4058ab54e1f2a9b2f96738720f8d0
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Oct 9 08:35:04 2012 -0400
s3:smbd: add exit_server to the smbd_shim hooks
This is in preparation of moving sessionid_tdb and conn_tdb
to smbd exclusively.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 8a1c7a0a660d78786adac483ecafa157c3a3dc2e)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 42c46f9ff1312d50136fccf43e8ffa4779f249d7
Author: Michael Adam <obnox at samba.org>
Date: Thu Oct 18 15:59:55 2012 +0200
s3:smbd: move initialization of the smbd_shim from smbd_init_globals() to main()
This is in preparation of adding server exit hooks to the shim.
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 8eab264470ee7adea1e448fc29bc8111902a83b0)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 6bb0dbdae07ca55350936654237b4d27026e0c52
Author: Michael Adam <obnox at samba.org>
Date: Thu Oct 18 15:58:01 2012 +0200
s3: fix comment header description for smbd_shim
This was copy'n'pasted from "RPC pipe client"...
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 781db9d1e564797546009aa5a49378b6e70502d7)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 4f9cfe7334732e8ae02500be77335a709dba7874
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Oct 17 14:59:30 2012 +0200
s3:smbd: update sconn->remote_hostname after the netbios session request
Also update the info in the new smbXsrv structure.
This way we can log the remote name in status outputs.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 980191d189ee1f5a25e74a6bdf141d4c7e4455d5)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 5f6433e034022b033a31733b81cfdaacdd3afb9d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 8 11:18:03 2012 +0200
buildtools/wafsamba: only display 'ok' if the result is True
Otherwise we print the raw value.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 1de9e714756b65b1e15fae044bde065bb2572b16)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 7b20e56f07922547b55d23bd7b419491a7d28da1
Author: Christian Ambach <ambi at samba.org>
Date: Fri Sep 21 13:58:29 2012 -0700
s3:utils/net fix a compiler warning
ret might be used uninitialized in out-of-memory condition
(cherry picked from commit f480b44430520f998fea867aa4c2cf9e93cb8d51)
commit 5d82300031a314fe5ccd370fc631f2132cbcca15
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Oct 29 12:22:17 2012 +0100
WHATSNEW: Prepare release notes for Samba 4.0.0rc4.
Karolin
commit 0cd45fdc23d26c0a8f5fa1475829db6430a2cfe6
Author: Andreas Schneider <asn at samba.org>
Date: Wed Oct 17 18:25:41 2012 +0200
packaging: Move smbprint to a comman location.
This also removes all the duplicate smbprint scripts.
This fixes bug #9301.
Signed-off-by: Andreas Schneider <asn at samba.org>
commit 6afa48e72c702aa94bb443d2504b5e5a2e2f4078
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Oct 2 12:20:26 2012 +0200
lib/tsocket: fix loop in tdgram_bsd_recvfrom() (bug #9184)
If the socket is not readable yet, we need to retry
if tsocket_bsd_pending() returns 0.
See also
https://lists.samba.org/archive/samba-technical/2012-October/087164.html
metze
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Oct 23 14:44:21 CEST 2012 on sn-devel-104
(cherry picked from commit d2aa785290a283e06624f22a381a7ea02baae5ad)
commit a5327b06b56376ce834259d135f5d82242b9b60a
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Oct 8 10:42:34 2012 +0200
docs: fix opening and ending tag mismatch: para
in forcedirectorysecuritymode.xml.
The last 2 patches are part of a fix for bug #9190 - Regression (change in
behavior) of default acl masks.
commit 59d68df62718ea8ec90b1211897baf7c336a161a
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Oct 8 10:42:34 2012 +0200
docs: fix opening and ending tag mismatch: para
in directorysecuritymask.xml.
(cherry picked from commit 903a37c23b30dff3d0f9c546a2e238252b3be583)
commit 29d608cd5b1e4c71ebe32c64e8c5b0698bfe815e
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 4 13:55:58 2012 -0700
Ensure the masks don't conflict with the ACL checks.
The last 8 patches address bug #9190 - Regression (change in behavior) of
default acl masks.
commit c2b3ed2243a80c7029bf2d4881a632645700c28b
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 4 12:08:03 2012 -0700
Update WHATSNEW.txt with removed parameters.
commit e61d88a98c852d325d95b7cc62beb463ee468678
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 3 16:04:18 2012 -0700
Remove the parameters:
security mask
force security mode
directory security mask
force directory security mode
and update the docs.
commit 6adc7dad96b8c7366da042f0d93b28c1ecb092eb
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 3 14:49:01 2012 -0700
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.
commit aaa0daa369ce761e610b665171b576f9b04d253c
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 2 10:15:54 2012 -0700
When setting a non-default ACL, don't forget to apply masks to SMB_ACL_USER and SMB_ACL_GROUP entries.
commit a5a254057075820df1ff5abf87841a27a347ab5e
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 2 10:12:45 2012 -0700
Only apply masks on non-default ACL entries when setting the ACL.
commit 35347d76099254fb825f15aa8845f333aed628ad
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 2 09:55:09 2012 -0700
Use is_default_acl variable in canonicalise_acl().
commit f98ba894b503577a23860d5198537ddaa28b5d8d
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 2 09:21:17 2012 -0700
Reformat spacing to be even.
commit e9f2dc13981de7dbef97fc91eba514ebd6003d88
Author: David Disseldorp <ddiss at suse.de>
Date: Wed Nov 2 18:39:03 2011 +0100
pam_winbind: fix segfault in pam_sm_authenticate()
Ensure the potentially null winbind context is not dereferenced on
cleanup.
https://bugzilla.samba.org/show_bug.cgi?id=8564
commit 9f70587c265093047f8569a6746cdd0933b1b725
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 11:57:33 2012 -0700
ldb: bump version to 1.1.13 so the 4.0 release can get the isprint fix
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Sep 17 23:47:57 CEST 2012 on sn-devel-104
(cherry picked from commit ac6deb30fd61b9746c46ab6b69e3ea1c8f762db5)
Fix bug #9322 - backport ldb version update.
commit e733084e4355218d427fcc364cbca52168e7bd1d
Author: Michael Adam <obnox at samba.org>
Date: Tue Oct 23 13:00:02 2012 +0200
s3:smbd:durable: factor stat checks out into vfs_default_durable_reconnect_check_stat()
This makes vfs_default_durable_reconnect() simpler to read
and it reduces code duplication in the failure case handling.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Oct 25 23:03:13 CEST 2012 on sn-devel-104
(cherry picked from commit 52ace6767fddb389e3393c4b19685e59782c6a90)
The last 4 patches address bug #9319 - validate stat(2) information before
reconnect durable handles.
commit 5593fc7213328001654f48c0781f965e6f32c9fc
Author: Michael Adam <obnox at samba.org>
Date: Fri Oct 19 16:00:05 2012 +0200
s3:smbd:durable: store stat info for disconnected durables and check at reconnect.
At durable reconnect, we check the stat info stored in the cookie against the
current stat data from the file we just opened. If any detail differs, we deny
the durable reconnect, because in that case it is very likely that someone
opened the file while the handle was disconnected, which has to be interpreted
as an oplock break.
Pair-programmed-with: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Fri Oct 19 18:56:19 CEST 2012 on sn-devel-104
(cherry picked from commit 7d05ff77264cf48d1ee82ca19c8c7e6951e64cf5)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit b024d2aa11ac367eacc4a145ca322cd7fadeef1f
Author: Michael Adam <obnox at samba.org>
Date: Fri Oct 19 15:57:24 2012 +0200
s3:open_files.idl: add stat-info to vfs_default_durable_cookie.
Pair-programmed-with: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit a6726f9023c899415441a619473ea9a7819d7c36)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 67d77cde3f07f2f7fc00e5d30041ade345cb41df
Author: Michael Adam <obnox at samba.org>
Date: Fri Oct 19 15:53:50 2012 +0200
s3:smbd/durable: remove an extra blank line from vfs_default_durable_reconnect()
Pair-programmed-with: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 660e90d39174fbfea0e93f40adfe03fefb86916f)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 7a4901fbba020f2663f4f5a9abc2e8a813ae1387
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 19 11:12:05 2012 +0200
s3:smbd/durable: add write_time specific stuff to vfs_default_durable_cookie
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Fri Oct 19 17:12:29 CEST 2012 on sn-devel-104
(cherry picked from commit 24d225f44ee4958ed5e2bd934125a9b0c4fc3323)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
The last 4 patches address bug 9318 - fix write time updates for durable handles
commit c16aeeb7c2825db3b2e0353c8e55b6ef8fac7940
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 19 11:12:05 2012 +0200
s3:open_files.idl: add write_time specific stuff to vfs_default_durable_cookie
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 506249b86382331c39676b8632ad33b535f9fb03)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit bedc1aa5aaba6d2540dfeda631af998920b79c0a
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 19 10:58:47 2012 +0200
s3:smbd/durable: update the low level write_time before disconnecting the file.
If we close the low level FD, we should better update the write_time
if needed.
It's not unlikely that the client doesn't reclaim the durable handle,
in that case we may not close the after the durable timeout.
In such a case we should make sure that we at least update the write time
on disconnect, this makes sure backup applications notice that
the file was changed.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 137376391d5642c0a18ff70a5184dac4b402fa42)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 19987bdc541f263d3c218a32feb6799c1b8e4de6
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 19 10:54:27 2012 +0200
s3:smbd/durable: trigger pending write_time updates before disconnecting the file
We need to call the pending write time update handler immediately.
Which means we don't wait exactly 2 seconds before updating the write time
after the first write.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 9e7bce53707732700928eaf2bb53a5f1cc5d7784)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 6e7b1ce595d0b6da7a88eb9ce84ad3f5940552a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Oct 20 11:08:19 2012 +0200
s3:rpc_server: avoid a level 0 DEBUG if tstream_npa_connect_recv fails (bug #9309)
metze
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Sat Oct 20 12:56:23 CEST 2012 on sn-devel-104
(cherry picked from commit d18591c97e1856bb48fd6d288db59065530f3a9b)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 53 +++-
buildtools/wafsamba/samba_autoconf.py | 4 +-
docs-xml/manpages/net.8.xml | 39 --
docs-xml/manpages/smbd.8.xml | 14 +-
docs-xml/smbdotconf/security/createmask.xml | 5 +-
docs-xml/smbdotconf/security/directorymask.xml | 8 +-
.../smbdotconf/security/directorysecuritymask.xml | 38 +--
docs-xml/smbdotconf/security/forcecreatemode.xml | 6 +
.../smbdotconf/security/forcedirectorymode.xml | 6 +
.../security/forcedirectorysecuritymode.xml | 46 +--
docs-xml/smbdotconf/security/forcesecuritymode.xml | 38 +--
docs-xml/smbdotconf/security/securitymask.xml | 33 +--
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 +-
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/printing/README | 3 +
packaging/{RHEL/setup => printing}/smbprint | 14 +-
selftest/target/Samba3.pm | 3 +-
selftest/target/Samba4.pm | 3 +-
source3/Makefile.in | 84 ++---
source3/auth/pampass.c | 8 +-
source3/auth/proto.h | 6 +-
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/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 | 28 +-
source3/smbd/reply.c | 13 +
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/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 | 12 +-
source3/wscript_build | 14 +-
source4/rpc_server/wscript_build | 2 +-
73 files changed, 1116 insertions(+), 1816 deletions(-)
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
create mode 100644 packaging/printing/README
rename packaging/{RHEL/setup => printing}/smbprint (91%)
delete mode 100644 source3/utils/net_connections.c
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d1e36ec..856a864 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,51 @@ 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.
+
+
+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.
+
+
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/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/smbdotconf/security/createmask.xml b/docs-xml/smbdotconf/security/createmask.xml
index cf6864c..59e208d 100644
--- a/docs-xml/smbdotconf/security/createmask.xml
+++ b/docs-xml/smbdotconf/security/createmask.xml
@@ -28,9 +28,8 @@
</para>
<para>
- Note that this parameter does not apply to permissions set by Windows NT/2000 ACL editors. If the
- administrator wishes to enforce a mask on access control lists also, they need to set the <smbconfoption
- name="security mask"/>.
+ New in Samba 4.0.0. This mask is applied whenever permissions are changed on a file. To allow clients full control
+ over permission changes it should be set to 0777.
</para>
</description>
diff --git a/docs-xml/smbdotconf/security/directorymask.xml b/docs-xml/smbdotconf/security/directorymask.xml
index 7b67f79..2ebfc16 100644
--- a/docs-xml/smbdotconf/security/directorymask.xml
+++ b/docs-xml/smbdotconf/security/directorymask.xml
@@ -24,14 +24,14 @@
created from this parameter with the value of the <smbconfoption name="force directory mode"/> parameter.
This parameter is set to 000 by default (i.e. no extra mode bits are added).</para>
- <para>Note that this parameter does not apply to permissions
- set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
- a mask on access control lists also, they need to set the <smbconfoption name="directory security mask"/>.</para>
+ <para>
+ New in Samba 4.0.0. This mask is applied whenever permissions are changed on a directory. To allow clients full control
+ over permission changes it should be set to 0777.
+ </para>
</description>
<related>force directory mode</related>
<related>create mask</related>
-<related>directory security mask</related>
<related>inherit permissions</related>
<value type="default">0755</value>
<value type="example">0775</value>
diff --git a/docs-xml/smbdotconf/security/directorysecuritymask.xml b/docs-xml/smbdotconf/security/directorysecuritymask.xml
index 5ed85ae..47feaf0 100644
--- a/docs-xml/smbdotconf/security/directorysecuritymask.xml
+++ b/docs-xml/smbdotconf/security/directorysecuritymask.xml
@@ -1,39 +1,13 @@
<samba:parameter name="directory security mask"
- context="S"
- type="string"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ context="S"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This parameter controls what UNIX permission bits
- will be set when a Windows NT client is manipulating the UNIX
- permission on a directory using the native NT security dialog
- box.</para>
-
- <para>
- This parameter is applied as a mask (AND'ed with) to the incoming permission bits, thus resetting
- any bits not in this mask. Make sure not to mix up this parameter with <smbconfoption name="force
- directory security mode"/>, which works similar like this one but uses logical OR instead of AND.
- Essentially, zero bits in this mask are a set of bits that will always be set to zero.
- </para>
-
<para>
- Essentially, all bits set to zero in this mask will result in setting to zero the corresponding bits on the
- file permissions regardless of the previous status of this bits on the file.
+ This parameter has been removed for Samba 4.0.0. The parameter
+ <smbconfoption name="directory mask"/> is now used instead to mask
+ any permission bit changes on directories.
</para>
-
- <para>If not set explicitly this parameter is set to 0777
- meaning a user is allowed to set all the user/group/world
- permissions on a directory.</para>
-
- <para><emphasis>Note</emphasis> that users who can access the
- Samba server through other means can easily bypass this restriction,
- so it is primarily useful for standalone "appliance" systems.
- Administrators of most normal systems will probably want to leave
- it as the default of <constant>0777</constant>.</para>
</description>
-<related>force directory security mode</related>
-<related>security mask</related>
-<related>force security mode</related>
-<value type="default">0777</value>
-<value type="example">0700</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/forcecreatemode.xml b/docs-xml/smbdotconf/security/forcecreatemode.xml
index a3f1c2c..5a57a29 100644
--- a/docs-xml/smbdotconf/security/forcecreatemode.xml
+++ b/docs-xml/smbdotconf/security/forcecreatemode.xml
@@ -10,6 +10,12 @@
mode after the mask set in the <parameter moreinfo="none">create mask</parameter>
parameter is applied.</para>
+ <para>
+ New in Samba 4.0.0. This mode is also 'OR'ed into the mode bits whenever
+ permissions are changed on a file, not just when the file is created.
+ This replaces the now removed <parameter moreinfo="none">force security mode</parameter>.
+ </para>
+
<para>The example below would force all newly created files to have read and execute
permissions set for 'group' and 'other' as well as the
read/write/execute bits set for the 'user'.</para>
diff --git a/docs-xml/smbdotconf/security/forcedirectorymode.xml b/docs-xml/smbdotconf/security/forcedirectorymode.xml
index 7effc0e..e5b37ea 100644
--- a/docs-xml/smbdotconf/security/forcedirectorymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorymode.xml
@@ -12,6 +12,12 @@
mask in the parameter <parameter moreinfo="none">directory mask</parameter> is
applied.</para>
+ <para>
+ New in Samba 4.0.0. This mode is also 'OR'ed into the mode bits whenever
+ permissions are changed on a directory, not just when the file is created.
+ This replaces the now removed <parameter moreinfo="none">force directory security mode</parameter>.
+ </para>
+
<para>The example below would force all created directories to have read and execute
permissions set for 'group' and 'other' as well as the
read/write/execute bits set for the 'user'.</para>
diff --git a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
index 2c15ec2..51c5de1 100644
--- a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
@@ -1,43 +1,13 @@
<samba:parameter name="force directory security mode"
- context="S"
- type="string"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ context="S"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating
- the UNIX permission on a directory using the native NT security dialog box.
- </para>
-
- <para>
- This parameter is applied as a mask (OR'ed with) to the changed permission bits, thus forcing any bits in this
- mask that the user may have modified to be on. Make sure not to mix up this parameter with <smbconfoption
- name="directory security mask"/>, which works in a similar manner to this one, but uses a logical AND instead
- of an OR.
- </para>
-
- <para>
- Essentially, this mask may be treated as a set of bits that, when modifying security on a directory,
- to will enable (1) any flags that are off (0) but which the mask has set to on (1).
- </para>
-
- <para>
- If not set explicitly this parameter is 0000, which allows a user to modify all the user/group/world
- permissions on a directory without restrictions.
- </para>
-
- <note><para>
- Users who can access the Samba server through other means can easily bypass this restriction, so it is
- primarily useful for standalone "appliance" systems. Administrators of most normal systems will
- probably want to leave it set as 0000.
- </para></note>
-
+ This parameter has been removed for Samba 4.0.0. The parameter
+ <smbconfoption name="force directory mode"/> is now used instead to
+ force any permission changes on directories to include specific UNIX
+ permission bits.
+ </para>
</description>
-
-<value type="default">0</value>
-<value type="example">700</value>
-
-<related>directory security mask</related>
-<related>security mask</related>
-<related>force security mode</related>
-
</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/forcesecuritymode.xml b/docs-xml/smbdotconf/security/forcesecuritymode.xml
index 7451ef9..b6713b1 100644
--- a/docs-xml/smbdotconf/security/forcesecuritymode.xml
+++ b/docs-xml/smbdotconf/security/forcesecuritymode.xml
@@ -4,38 +4,10 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating
- the UNIX permission on a file using the native NT security dialog box.
- </para>
-
- <para>
- This parameter is applied as a mask (OR'ed with) to the changed permission bits, thus forcing any bits in this
- mask that the user may have modified to be on. Make sure not to mix up this parameter with <smbconfoption
- name="security mask"/>, which works similar like this one but uses logical AND instead of OR.
- </para>
-
- <para>
- Essentially, one bits in this mask may be treated as a set of bits that, when modifying security on a file,
- the user has always set to be on.
- </para>
-
- <para>
- If not set explicitly this parameter is set to 0, and allows a user to modify all the user/group/world
- permissions on a file, with no restrictions.
- </para>
-
- <para><emphasis>
- Note</emphasis> that users who can access the Samba server through other means can easily bypass this
- restriction, so it is primarily useful for standalone "appliance" systems. Administrators of most
- normal systems will probably want to leave this set to 0000.
- </para>
-
+ This parameter has been removed for Samba 4.0.0. The parameter
+ <smbconfoption name="force create mode"/> is now used instead to
+ force any permission changes on files to include specific UNIX
+ permission bits.
+ </para>
</description>
-
-<value type="default">0</value>
-<value type="example">700</value>
-
-<related>force directory security mode</related>
-<related>directory security mask</related>
-<related>security mask</related>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/securitymask.xml b/docs-xml/smbdotconf/security/securitymask.xml
index 23bc280..d1e78be 100644
--- a/docs-xml/smbdotconf/security/securitymask.xml
+++ b/docs-xml/smbdotconf/security/securitymask.xml
@@ -4,36 +4,9 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- This parameter controls what UNIX permission bits will be set when a Windows NT client is manipulating the
- UNIX permission on a file using the native NT security dialog box.
- </para>
-
- <para>
- This parameter is applied as a mask (AND'ed with) to the incoming permission bits, thus resetting
- any bits not in this mask. Make sure not to mix up this parameter with <smbconfoption name="force
- security mode"/>, which works in a manner similar to this one but uses a logical OR instead of an AND.
- </para>
-
- <para>
- Essentially, all bits set to zero in this mask will result in setting to zero the corresponding bits on the
- file permissions regardless of the previous status of this bits on the file.
- </para>
-
- <para>
- If not set explicitly this parameter is 0777, allowing a user to set all the user/group/world permissions on a file.
+ This parameter has been removed for Samba 4.0.0. The parameter
+ <smbconfoption name="create mask"/> is now used instead to mask
+ any permission bit changes on files.
</para>
-
- <para><emphasis>
- Note</emphasis> that users who can access the Samba server through other means can easily bypass this
- restriction, so it is primarily useful for standalone "appliance" systems. Administrators of
- most normal systems will probably want to leave it set to <constant>0777</constant>.
- </para>
</description>
-
-<related>force directory security mode</related>
-<related>directory security mask</related>
-<related>force security mode</related>
-
-<value type="default">0777</value>
-<value type="example">0770</value>
</samba:parameter>
diff --git a/examples/printing/smbprint b/examples/printing/smbprint
deleted file mode 100755
index 375f29f..0000000
--- a/examples/printing/smbprint
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/bash
-
-# This script is an input filter for printcap printing on a unix machine. It
-# uses the smbclient program to print the file to the specified smb-based
-# server and service.
-# For example you could have a printcap entry like this
-#
-# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/local/samba/smbprint
-#
-# which would create a unix printer called "smb" that will print via this
-# script. You will need to create the spool directory /usr/spool/smb with
-# appropriate permissions and ownerships for your system.
-
-# Set these to the server and service you wish to print to
-# In this example I have a WfWg PC called "lapland" that has a printer
-# exported called "printer" with no password.
-
-#
-# Script further altered by hamiltom at ecnz.co.nz (Michael Hamilton)
-# so that the server, service, and password can be read from
-# a /usr/var/spool/lpd/PRINTNAME/.config file.
-#
-# Script further modified by Richard Sharpe to fix some things.
-# Get rid of the -x on the first line, and add parameters
-#
-# -t now causes translate to be used when sending files
-#
-# Further modifications by Alfred Perlstein to fix some problems and
--
Samba Shared Repository
More information about the samba-cvs
mailing list