The branch, master has been updated via 906de70 docs: Add man page for vfs_linux_xfs_sgid. via c909c01 rpc_server3: Fix two const warnings via 7701053 librpc: Use tevent_req_simple_recv_ntstatus via a39c956 tevent: Add tevent_received to tevent_req_simple_recv_ntstatus from 6a081e9 tevent: Fix tutorial reference
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 906de702e641bb0da8ec9074b80d6e94bdb17cfe Author: Karolin Seeger <ksee...@samba.org> Date: Mon Aug 12 10:02:31 2013 +0200 docs: Add man page for vfs_linux_xfs_sgid. Signed-off-by: Karolin Seeger <ksee...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Tue Aug 13 02:06:30 CEST 2013 on sn-devel-104 commit c909c0131a6b4290d53c538c17cc3ae15591512b Author: Volker Lendecke <v...@samba.org> Date: Tue Jun 11 19:37:47 2013 +0200 rpc_server3: Fix two const warnings Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 7701053806e3cc98f8d7d4d9bd1d7b63c0b504e8 Author: Volker Lendecke <v...@samba.org> Date: Thu Jun 6 11:42:55 2013 +0200 librpc: Use tevent_req_simple_recv_ntstatus Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit a39c9563158cb15835f8a40fb9e79609440b5443 Author: Volker Lendecke <v...@samba.org> Date: Thu Jun 6 11:42:15 2013 +0200 tevent: Add tevent_received to tevent_req_simple_recv_ntstatus Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: ...s_fake_perms.8.xml => vfs_linux_xfs_sgid.8.xml} | 33 ++++++++++--------- docs-xml/wscript_build | 1 + lib/util/tevent_ntstatus.c | 13 +++++--- librpc/rpc/binding_handle.c | 10 +----- source3/rpc_server/rpc_sock_helper.c | 4 +- 5 files changed, 29 insertions(+), 32 deletions(-) copy docs-xml/manpages/{vfs_fake_perms.8.xml => vfs_linux_xfs_sgid.8.xml} (55%) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_fake_perms.8.xml b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml similarity index 55% copy from docs-xml/manpages/vfs_fake_perms.8.xml copy to docs-xml/manpages/vfs_linux_xfs_sgid.8.xml index 4e1b940..17ed1ac 100644 --- a/docs-xml/manpages/vfs_fake_perms.8.xml +++ b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> -<refentry id="vfs_fake_perms.8"> +<refentry id="vfs_linux_xfs_sgid.8"> <refmeta> - <refentrytitle>vfs_fake_perms</refentrytitle> + <refentrytitle>vfs_syncops</refentrytitle> <manvolnum>8</manvolnum> <refmiscinfo class="source">Samba</refmiscinfo> <refmiscinfo class="manual">System Administration tools</refmiscinfo> @@ -12,13 +12,13 @@ <refnamediv> - <refname>vfs_fake_perms</refname> - <refpurpose>enable read only Roaming Profiles</refpurpose> + <refname>vfs_linux_xfs_sgid</refname> + <refpurpose></refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> - <command>vfs objects = fake_perms</command> + <command>vfs objects = linux_xfs_sgid</command> </cmdsynopsis> </refsynopsisdiv> @@ -29,13 +29,14 @@ <citerefentry><refentrytitle>samba</refentrytitle> <manvolnum>7</manvolnum></citerefentry> suite.</para> - <para>The <command>vfs_fake_perms</command> VFS module was created - to allow Roaming Profile files and directories to be set (on - the Samba server under UNIX) as read only. This module will, - if installed on the Profiles share, report to the client that - the Profile files and directories are writeable. This satisfies - the client even though the files will never be overwritten as - the client logs out or shuts down. + <para> + <command>vfs_linux_xfs_sgid</command> is a VFS module to work around an + old Linux XFS bug that still exists: Under certain circumstances the + SGID bit is not inherited (<ulink url="http://oss.sgi.com/bugzilla/show_bug.cgi?id=280"> + http://oss.sgi.com/bugzilla/show_bug.cgi?id=280</ulink>). + The <command>vfs_linux_xfs_sgid</command> VFS module will work around this + bug by manually setting the SGID bit after a <command>mkdir</command> + if the parent directory had the SGID bit set. </para> <para>This module is stackable.</para> @@ -45,10 +46,10 @@ <refsect1> <title>EXAMPLES</title> + <para>Add syncops functionality for [share]:</para> <programlisting> - <smbconfsection name="[Profiles]"/> - <smbconfoption name="path">/profiles</smbconfoption> - <smbconfoption name="vfs objects">fake_perms</smbconfoption> + <smbconfsection name="[share]"/> + <smbconfoption name="vfs objects">linux_xfs_sgid</smbconfoption> </programlisting> </refsect1> @@ -56,7 +57,7 @@ <refsect1> <title>VERSION</title> - <para>This man page is correct for version 3.0.25 of the Samba suite. + <para>This man page is correct for version 4.1.0 of the Samba suite. </para> </refsect1> diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build index 588b0b9..f2d977a 100644 --- a/docs-xml/wscript_build +++ b/docs-xml/wscript_build @@ -61,6 +61,7 @@ manpages=''' manpages/vfs_fileid.8 manpages/vfs_full_audit.8 manpages/vfs_gpfs.8 + manpages/vfs_linux_xfs_sgid.8 manpages/vfs_media_harmony.8 manpages/vfs_netatalk.8 manpages/vfs_notify_fam.8 diff --git a/lib/util/tevent_ntstatus.c b/lib/util/tevent_ntstatus.c index cbbc698..7659f15 100644 --- a/lib/util/tevent_ntstatus.c +++ b/lib/util/tevent_ntstatus.c @@ -76,12 +76,15 @@ bool tevent_req_is_nterror(struct tevent_req *req, NTSTATUS *status) NTSTATUS tevent_req_simple_recv_ntstatus(struct tevent_req *req) { - NTSTATUS status; + NTSTATUS status = NT_STATUS_OK; - if (tevent_req_is_nterror(req, &status)) { - return status; - } - return NT_STATUS_OK; + /* + * Ignore result of tevent_req_is_nterror, we're only interested in + * the status + */ + tevent_req_is_nterror(req, &status); + tevent_req_received(req); + return status; } void tevent_req_simple_finish_ntstatus(struct tevent_req *subreq, diff --git a/librpc/rpc/binding_handle.c b/librpc/rpc/binding_handle.c index 9354bbd..3c74fdf 100644 --- a/librpc/rpc/binding_handle.c +++ b/librpc/rpc/binding_handle.c @@ -494,15 +494,7 @@ static void dcerpc_binding_handle_call_done(struct tevent_req *subreq) NTSTATUS dcerpc_binding_handle_call_recv(struct tevent_req *req) { - NTSTATUS error; - - if (tevent_req_is_nterror(req, &error)) { - tevent_req_received(req); - return error; - } - - tevent_req_received(req); - return NT_STATUS_OK; + return tevent_req_simple_recv_ntstatus(req); } NTSTATUS dcerpc_binding_handle_call(struct dcerpc_binding_handle *h, diff --git a/source3/rpc_server/rpc_sock_helper.c b/source3/rpc_server/rpc_sock_helper.c index dc88f25..650dd9d 100644 --- a/source3/rpc_server/rpc_sock_helper.c +++ b/source3/rpc_server/rpc_sock_helper.c @@ -73,7 +73,7 @@ NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface, if (bvec != NULL) { rc = tsocket_address_bsd_from_sockaddr(tmp_ctx, - (struct sockaddr *)ifss, + (const struct sockaddr *)ifss, sizeof(struct sockaddr_storage), &bind_addr); if (rc < 0) { @@ -197,7 +197,7 @@ NTSTATUS rpc_setup_tcpip_sockets(struct tevent_context *ev_ctx, if (bvec != NULL) { rc = tsocket_address_bsd_from_sockaddr(tmp_ctx, - (struct sockaddr*)ifss, + (const struct sockaddr*)ifss, sizeof(struct sockaddr_storage), &bind_addr); if (rc < 0) { -- Samba Shared Repository