From e1f84330baa544ebaef42492a7ea2d69cb844fea Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 24 Feb 2011 10:47:16 +0100 Subject: libcli/security: move display_sec headers to own header file and add to security.h grouping header. Guenther --- source3/include/proto.h | 10 ---------- source3/rpcclient/cmd_spoolss.c | 1 + source3/rpcclient/cmd_srvsvc.c | 1 + source3/utils/net_registry.c | 1 + source3/utils/net_rpc_registry.c | 1 + 5 files changed, 4 insertions(+), 10 deletions(-) (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index e8971c3721..233866e2af 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -502,16 +502,6 @@ int connections_forall_read(int (*fn)(const struct connections_key *key, void *private_data); bool connections_init(bool rw); -/* The following definitions come from lib/display_sec.c */ - -char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type); -void display_sec_access(uint32_t *info); -void display_sec_ace_flags(uint8_t flags); -void display_sec_ace(struct security_ace *ace); -void display_sec_acl(struct security_acl *sec_acl); -void display_acl_type(uint16 type); -void display_sec_desc(struct security_descriptor *sec); - /* The following definitions come from lib/dmallocmsg.c */ void register_dmalloc_msgs(struct messaging_context *msg_ctx); diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 4eda9951b9..48eb73351a 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -31,6 +31,7 @@ #include "registry.h" #include "registry/reg_objects.h" #include "nt_printing.h" +#include "../libcli/security/display_sec.h" #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \ { \ diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c index 685cdd6a3b..0c243d7650 100644 --- a/source3/rpcclient/cmd_srvsvc.c +++ b/source3/rpcclient/cmd_srvsvc.c @@ -24,6 +24,7 @@ #include "rpcclient.h" #include "../librpc/gen_ndr/ndr_srvsvc.h" #include "../librpc/gen_ndr/ndr_srvsvc_c.h" +#include "../libcli/security/display_sec.h" /* Display server query info */ diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c index 1e87e809fb..10486b0250 100644 --- a/source3/utils/net_registry.c +++ b/source3/utils/net_registry.c @@ -31,6 +31,7 @@ #include "registry/reg_import.h" #include "registry/reg_format.h" #include +#include "../libcli/security/display_sec.h" /* * diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index 17c5d5a4b6..de9bbddeba 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -29,6 +29,7 @@ #include "registry/reg_format.h" #include "registry/reg_import.h" #include +#include "../libcli/security/display_sec.h" /******************************************************************* -- cgit