diff options
author | Stefan Metzmacher <metze@samba.org> | 2005-08-11 13:12:45 +0000 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2005-08-11 13:12:45 +0000 |
commit | 155eafc4820e0e76abd5d47fd166e3ea8674c7bf (patch) | |
tree | 9ab2145ab9703d1f8625d4594f882d576b052eff /source/libcli | |
parent | ca4c646b2b77d55e75fed1a9a08f6fa9ee1bfffe (diff) | |
download | samba-155eafc4820e0e76abd5d47fd166e3ea8674c7bf.tar.gz samba-155eafc4820e0e76abd5d47fd166e3ea8674c7bf.tar.xz samba-155eafc4820e0e76abd5d47fd166e3ea8674c7bf.zip |
r9240: - move struct security_token to the idl file, with this we can
the ndr_pull/push/print functions for it in the ntacl-lsm module
- fix compiler warnings in the ldap_encode_ndr_* code
metze
Diffstat (limited to 'source/libcli')
-rw-r--r-- | source/libcli/ldap/ldap_ndr.c | 10 | ||||
-rw-r--r-- | source/libcli/security/access_check.c | 2 | ||||
-rw-r--r-- | source/libcli/security/dom_sid.c | 2 | ||||
-rw-r--r-- | source/libcli/security/privilege.c | 2 | ||||
-rw-r--r-- | source/libcli/security/security.h | 36 | ||||
-rw-r--r-- | source/libcli/security/security_descriptor.c | 2 | ||||
-rw-r--r-- | source/libcli/security/security_token.c | 2 |
7 files changed, 10 insertions, 46 deletions
diff --git a/source/libcli/ldap/ldap_ndr.c b/source/libcli/ldap/ldap_ndr.c index bc19e49535c..0cccdbe9719 100644 --- a/source/libcli/ldap/ldap_ndr.c +++ b/source/libcli/ldap/ldap_ndr.c @@ -29,7 +29,7 @@ /* encode a NDR uint32 as a ldap filter element */ -const char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value) +char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value) { uint8_t buf[4]; struct ldb_val val; @@ -42,11 +42,11 @@ const char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value) /* encode a NDR dom_sid as a ldap filter element */ -const char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid) +char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid) { DATA_BLOB blob; NTSTATUS status; - const char *ret; + char *ret; status = ndr_push_struct_blob(&blob, mem_ctx, sid, (ndr_push_flags_fn_t)ndr_push_dom_sid); if (!NT_STATUS_IS_OK(status)) { @@ -61,11 +61,11 @@ const char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *s /* encode a NDR GUID as a ldap filter element */ -const char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid) +char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid) { DATA_BLOB blob; NTSTATUS status; - const char *ret; + char *ret; status = ndr_push_struct_blob(&blob, mem_ctx, guid, (ndr_push_flags_fn_t)ndr_push_GUID); if (!NT_STATUS_IS_OK(status)) { diff --git a/source/libcli/security/access_check.c b/source/libcli/security/access_check.c index 632b9bdf325..c10751abce8 100644 --- a/source/libcli/security/access_check.c +++ b/source/libcli/security/access_check.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "libcli/security/security.h" +#include "librpc/gen_ndr/ndr_security.h" /* diff --git a/source/libcli/security/dom_sid.c b/source/libcli/security/dom_sid.c index 80e481c3e44..f457900efc0 100644 --- a/source/libcli/security/dom_sid.c +++ b/source/libcli/security/dom_sid.c @@ -22,7 +22,7 @@ */ #include "includes.h" -#include "libcli/security/security.h" +#include "librpc/gen_ndr/ndr_security.h" /***************************************************************** Compare the auth portion of two sids. diff --git a/source/libcli/security/privilege.c b/source/libcli/security/privilege.c index ed98e9ce325..aa01dc2c657 100644 --- a/source/libcli/security/privilege.c +++ b/source/libcli/security/privilege.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "libcli/security/security.h" +#include "librpc/gen_ndr/ndr_security.h" static const struct { diff --git a/source/libcli/security/security.h b/source/libcli/security/security.h deleted file mode 100644 index b11d10f6f6c..00000000000 --- a/source/libcli/security/security.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - security utility functions - - Copyright (C) Andrew Tridgell 2004 - - 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 2 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, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifndef _SAMBA_SECURITY_H -#define _SAMBA_SECURITY_H - -#include "librpc/gen_ndr/ndr_security.h" - -struct security_token { - struct dom_sid *user_sid; - struct dom_sid *group_sid; - uint32_t num_sids; - struct dom_sid **sids; - uint64_t privilege_mask; -}; - -#endif /* _SAMBA_SECURITY_H */ diff --git a/source/libcli/security/security_descriptor.c b/source/libcli/security/security_descriptor.c index d1978fd795c..703abf79701 100644 --- a/source/libcli/security/security_descriptor.c +++ b/source/libcli/security/security_descriptor.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "libcli/security/security.h" +#include "librpc/gen_ndr/ndr_security.h" /* return a blank security descriptor (no owners, dacl or sacl) diff --git a/source/libcli/security/security_token.c b/source/libcli/security/security_token.c index 663c4f28bce..ea1fae0c33e 100644 --- a/source/libcli/security/security_token.c +++ b/source/libcli/security/security_token.c @@ -22,7 +22,7 @@ */ #include "includes.h" -#include "libcli/security/security.h" +#include "librpc/gen_ndr/ndr_security.h" /* return a blank security token |