diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-18 02:56:17 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 12:30:11 +0200 |
| commit | 8bc9c343c4fe4e6f6c0283fd15e86caf6b8c1085 (patch) | |
| tree | 1c2806f95b74e6ad567d177ee558e3f576f0bed9 /source3/include | |
| parent | f6445d8f860fa8f771e6c8986b8eda6cc00c7793 (diff) | |
| download | samba-8bc9c343c4fe4e6f6c0283fd15e86caf6b8c1085.tar.gz samba-8bc9c343c4fe4e6f6c0283fd15e86caf6b8c1085.tar.bz2 samba-8bc9c343c4fe4e6f6c0283fd15e86caf6b8c1085.zip | |
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF".
Guenther
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/nt_printing.h | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 12 | ||||
| -rw-r--r-- | source3/include/rpc_secdes.h | 6 |
3 files changed, 7 insertions, 13 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index 713443a4fa..0241a54b79 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -100,7 +100,7 @@ typedef struct nt_printer_info_level_2 fstring datatype; fstring parameters; NT_PRINTER_DATA *data; - SEC_DESC_BUF *secdesc_buf; + struct sec_desc_buf *secdesc_buf; uint32 changeid; uint32 c_setprinter; uint32 setuptime; diff --git a/source3/include/proto.h b/source3/include/proto.h index eb9c63c5ac..69e64d71f0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -694,7 +694,7 @@ ssize_t drain_socket(int sockfd, size_t count); uint32_t get_sec_info(const SEC_DESC *sd); SEC_DESC *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC *new_sdb, SEC_DESC *old_sdb); -SEC_DESC_BUF *sec_desc_merge_buf(TALLOC_CTX *ctx, SEC_DESC_BUF *new_sdb, SEC_DESC_BUF *old_sdb); +struct sec_desc_buf *sec_desc_merge_buf(TALLOC_CTX *ctx, struct sec_desc_buf *new_sdb, struct sec_desc_buf *old_sdb); SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, enum security_descriptor_revision revision, uint16 type, @@ -713,8 +713,8 @@ NTSTATUS unmarshall_sec_desc_buf(TALLOC_CTX *mem_ctx, uint8_t *data, size_t len, struct sec_desc_buf **psecdesc_buf); SEC_DESC *make_standard_sec_desc(TALLOC_CTX *ctx, const DOM_SID *owner_sid, const DOM_SID *grp_sid, SEC_ACL *dacl, size_t *sd_size); -SEC_DESC_BUF *make_sec_desc_buf(TALLOC_CTX *ctx, size_t len, SEC_DESC *sec_desc); -SEC_DESC_BUF *dup_sec_desc_buf(TALLOC_CTX *ctx, SEC_DESC_BUF *src); +struct sec_desc_buf *make_sec_desc_buf(TALLOC_CTX *ctx, size_t len, SEC_DESC *sec_desc); +struct sec_desc_buf *dup_sec_desc_buf(TALLOC_CTX *ctx, struct sec_desc_buf *src); NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, uint32 mask, size_t *sd_size); NTSTATUS sec_desc_mod_sid(SEC_DESC *sd, DOM_SID *sid, uint32 mask); NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, size_t *sd_size); @@ -727,7 +727,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, const DOM_SID *group_sid, bool container); NTSTATUS se_create_child_secdesc_buf(TALLOC_CTX *ctx, - SEC_DESC_BUF **ppsdb, + struct sec_desc_buf **ppsdb, const SEC_DESC *parent_ctr, bool container); @@ -4793,8 +4793,8 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx, WERROR delete_printer_driver(struct pipes_struct *rpc_pipe, const struct spoolss_DriverInfo8 *r, uint32 version, bool delete_files ); -WERROR nt_printing_setsec(const char *sharename, SEC_DESC_BUF *secdesc_ctr); -bool nt_printing_getsec(TALLOC_CTX *ctx, const char *sharename, SEC_DESC_BUF **secdesc_ctr); +WERROR nt_printing_setsec(const char *sharename, struct sec_desc_buf *secdesc_ctr); +bool nt_printing_getsec(TALLOC_CTX *ctx, const char *sharename, struct sec_desc_buf **secdesc_ctr); void map_printer_permissions(SEC_DESC *sd); void map_job_permissions(SEC_DESC *sd); bool print_access_check(struct auth_serversupplied_info *server_info, int snum, diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 6db3f2d7c7..0d3db799f4 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -91,12 +91,6 @@ typedef struct security_descriptor SEC_DESC; #define _SEC_DESC #endif -#ifndef _SEC_DESC_BUF -/* SEC_DESC_BUF */ -typedef struct sec_desc_buf SEC_DESC_BUF; -#define _SEC_DESC_BUF -#endif - /* A type to describe the mapping of generic access rights to object specific access rights. */ |