diff options
| -rw-r--r-- | libcli/security/display_sec.c | 1 | ||||
| -rw-r--r-- | libcli/security/display_sec.h | 34 | ||||
| -rw-r--r-- | libcli/security/security.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 10 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_spoolss.c | 1 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_srvsvc.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_registry.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_rpc_registry.c | 1 |
8 files changed, 40 insertions, 10 deletions
diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c index 0aa89b4983..de8bb8b685 100644 --- a/libcli/security/display_sec.c +++ b/libcli/security/display_sec.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libcli/security/security.h" #include "librpc/ndr/libndr.h" +#include "libcli/security/display_sec.h" /**************************************************************************** convert a security permissions into a string diff --git a/libcli/security/display_sec.h b/libcli/security/display_sec.h new file mode 100644 index 0000000000..336e04c6fe --- /dev/null +++ b/libcli/security/display_sec.h @@ -0,0 +1,34 @@ +/* + Unix SMB/CIFS implementation. + Samba utility functions + Copyright (C) Andrew Tridgell 1992-1999 + Copyright (C) Luke Kenneth Casson Leighton 1996 - 1999 + + 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 _LIBCLI_SECURITY_DISPLAY_SEC_H +#define _LIBCLI_SECURITY_DISPLAY_SEC_H + +/* The following definitions come from libcli/security/display_sec.c */ + +char *get_sec_mask_str(TALLOC_CTX *ctx, uint32_t 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_t type); +void display_sec_desc(struct security_descriptor *sec); + +#endif /* _LIBCLI_SECURITY_DISPLAY_SEC_H */ diff --git a/libcli/security/security.h b/libcli/security/security.h index bb7bc7208a..1a9f4fa386 100644 --- a/libcli/security/security.h +++ b/libcli/security/security.h @@ -106,5 +106,6 @@ struct object_tree { #include "libcli/security/privileges.h" #include "libcli/security/access_check.h" #include "libcli/security/session.h" +#include "libcli/security/display_sec.h" #endif 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 <assert.h> +#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 <assert.h> +#include "../libcli/security/display_sec.h" /******************************************************************* |