The branch, master has been updated via 1ded80ae6f0 s3/rpc_server: remove unnecessary srv_fss_agent.h header from c14a95dc1ac smbd: simplify uid_entry_in_group()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1ded80ae6f00eade7caf67ed1c4c4435e4680f14 Author: David Disseldorp <dd...@samba.org> Date: Thu May 28 18:40:26 2020 +0200 s3/rpc_server: remove unnecessary srv_fss_agent.h header The srv_fssa_start() / _cleanup() functions are called via the DCESRV_INTERFACE_FILESERVERVSSAGENT_INIT / SHUTDOWN_SERVER hooks, so needn't be public. Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Reviewed-by: Samuel Cabrero <scabr...@samba.org> Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Wed Jun 3 03:57:12 UTC 2020 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/fss/srv_fss_agent.c | 6 ++---- source3/rpc_server/fss/srv_fss_agent.h | 26 -------------------------- source3/rpc_server/fssd.c | 1 - 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 source3/rpc_server/fss/srv_fss_agent.h Changeset truncated at 500 lines: diff --git a/source3/rpc_server/fss/srv_fss_agent.c b/source3/rpc_server/fss/srv_fss_agent.c index 9a15c419ac7..0cc3a5d0fbb 100644 --- a/source3/rpc_server/fss/srv_fss_agent.c +++ b/source3/rpc_server/fss/srv_fss_agent.c @@ -32,7 +32,6 @@ #include "librpc/gen_ndr/ndr_fsrvp.h" #include "rpc_server/rpc_server.h" #include "srv_fss_private.h" -#include "srv_fss_agent.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV @@ -388,14 +387,14 @@ static struct fss_sc_smap *sc_smap_lookup(struct fss_sc_smap *smaps_head, return NULL; } -void srv_fssa_cleanup(void) +static void srv_fssa_cleanup(void) { talloc_free(fss_global.db_path); talloc_free(fss_global.mem_ctx); ZERO_STRUCT(fss_global); } -NTSTATUS srv_fssa_start(struct messaging_context *msg_ctx) +static NTSTATUS srv_fssa_start(struct messaging_context *msg_ctx) { NTSTATUS status; fss_global.mem_ctx = talloc_named_const(NULL, 0, @@ -1733,7 +1732,6 @@ static NTSTATUS FileServerVssAgent__op_shutdown_server( #define DCESRV_INTERFACE_FILESERVERVSSAGENT_SHUTDOWN_SERVER \ fileservervssagent_shutdown_server - static NTSTATUS fileservervssagent_shutdown_server( struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server) diff --git a/source3/rpc_server/fss/srv_fss_agent.h b/source3/rpc_server/fss/srv_fss_agent.h deleted file mode 100644 index f44a91545e4..00000000000 --- a/source3/rpc_server/fss/srv_fss_agent.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * File Server Remote VSS Protocol (FSRVP) server - * - * Copyright (C) David Disseldorp 2012-2015 - * - * 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/>. - */ - -#ifndef _SRV_FSS_AGENT_H_ -#define _SRV_FSS_AGENT_H_ - -NTSTATUS srv_fssa_start(struct messaging_context *msg_ctx); -void srv_fssa_cleanup(void); - -#endif /*_SRV_FSS_AGENT_H_ */ diff --git a/source3/rpc_server/fssd.c b/source3/rpc_server/fssd.c index 3c8ae01b424..eaec70d230f 100644 --- a/source3/rpc_server/fssd.c +++ b/source3/rpc_server/fssd.c @@ -33,7 +33,6 @@ #include "rpc_server/rpc_server.h" #include "rpc_server/rpc_service_setup.h" #include "rpc_server/rpc_sock_helper.h" -#include "rpc_server/fss/srv_fss_agent.h" #include "rpc_server/fssd.h" #undef DBGC_CLASS -- Samba Shared Repository