diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/Makefile | 1 | ||||
| -rw-r--r-- | source4/libcli/security/config.mk | 4 | ||||
| -rw-r--r-- | source4/libcli/security/dom_sid.c | 306 | ||||
| -rw-r--r-- | source4/libcli/security/security.h | 3 | ||||
| -rw-r--r-- | source4/main.mk | 1 | ||||
| -rw-r--r-- | source4/torture/rpc/samba3rpc.c | 2 | ||||
| -rw-r--r-- | source4/winbind/idmap.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_cmd_getpwnam.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_sid2gid.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_sid2uid.c | 2 |
10 files changed, 12 insertions, 313 deletions
diff --git a/source4/Makefile b/source4/Makefile index b342d671f6..267e302c9f 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -98,6 +98,7 @@ ntvfssrcdir := ntvfs ntptrsrcdir := ntptr librpcsrcdir := librpc libclisrcdir := libcli +libclicommonsrcdir := ../libcli libclinbtsrcdir := ../libcli/nbt pyscriptsrcdir := $(srcdir)/scripting/python kdcsrcdir := kdc diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk index 4b35841507..cd5b75bb81 100644 --- a/source4/libcli/security/config.mk +++ b/source4/libcli/security/config.mk @@ -1,8 +1,8 @@ [SUBSYSTEM::LIBSECURITY] -PUBLIC_DEPENDENCIES = LIBNDR +PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY_COMMON LIBSECURITY_OBJ_FILES = $(addprefix $(libclisrcdir)/security/, \ security_token.o security_descriptor.o \ - dom_sid.o access_check.o privilege.o sddl.o) + access_check.o privilege.o sddl.o) $(eval $(call proto_header_template,$(libclisrcdir)/security/proto.h,$(LIBSECURITY_OBJ_FILES:.o=.c))) diff --git a/source4/libcli/security/dom_sid.c b/source4/libcli/security/dom_sid.c deleted file mode 100644 index e1a6b8e8ee..0000000000 --- a/source4/libcli/security/dom_sid.c +++ /dev/null @@ -1,306 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Samba utility functions - - Copyright (C) Stefan (metze) Metzmacher 2002-2004 - Copyright (C) Andrew Tridgell 1992-2004 - Copyright (C) Jeremy Allison 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/>. -*/ - -#include "includes.h" -#include "librpc/gen_ndr/security.h" -#include "libcli/security/security.h" - -/***************************************************************** - Compare the auth portion of two sids. -*****************************************************************/ - -static int dom_sid_compare_auth(const struct dom_sid *sid1, const struct dom_sid *sid2) -{ - int i; - - if (sid1 == sid2) - return 0; - if (!sid1) - return -1; - if (!sid2) - return 1; - - if (sid1->sid_rev_num != sid2->sid_rev_num) - return sid1->sid_rev_num - sid2->sid_rev_num; - - for (i = 0; i < 6; i++) - if (sid1->id_auth[i] != sid2->id_auth[i]) - return sid1->id_auth[i] - sid2->id_auth[i]; - - return 0; -} - -/***************************************************************** - Compare two sids. -*****************************************************************/ - -int dom_sid_compare(const struct dom_sid *sid1, const struct dom_sid *sid2) -{ - int i; - - if (sid1 == sid2) - return 0; - if (!sid1) - return -1; - if (!sid2) - return 1; - - /* Compare most likely different rids, first: i.e start at end */ - if (sid1->num_auths != sid2->num_auths) - return sid1->num_auths - sid2->num_auths; - - for (i = sid1->num_auths-1; i >= 0; --i) - if (sid1->sub_auths[i] != sid2->sub_auths[i]) - return sid1->sub_auths[i] - sid2->sub_auths[i]; - - return dom_sid_compare_auth(sid1, sid2); -} - -/***************************************************************** - Compare two sids. -*****************************************************************/ - -bool dom_sid_equal(const struct dom_sid *sid1, const struct dom_sid *sid2) -{ - return dom_sid_compare(sid1, sid2) == 0; -} - -bool dom_sid_parse(const char *sidstr, struct dom_sid *ret) -{ - uint_t rev, ia, num_sub_auths, i; - char *p; - - if (strncasecmp(sidstr, "S-", 2)) { - return false; - } - - sidstr += 2; - - rev = strtol(sidstr, &p, 10); - if (*p != '-') { - return false; - } - sidstr = p+1; - - ia = strtol(sidstr, &p, 10); - if (p == sidstr) { - return false; - } - sidstr = p; - - num_sub_auths = 0; - for (i=0;sidstr[i];i++) { - if (sidstr[i] == '-') num_sub_auths++; - } - - ret->sid_rev_num = rev; - ret->id_auth[0] = 0; - ret->id_auth[1] = 0; - ret->id_auth[2] = ia >> 24; - ret->id_auth[3] = ia >> 16; - ret->id_auth[4] = ia >> 8; - ret->id_auth[5] = ia; - ret->num_auths = num_sub_auths; - - for (i=0;i<num_sub_auths;i++) { - if (sidstr[0] != '-') { - return false; - } - sidstr++; - ret->sub_auths[i] = strtoul(sidstr, &p, 10); - if (p == sidstr) { - return false; - } - sidstr = p; - } - - return true; -} - -/* - convert a string to a dom_sid, returning a talloc'd dom_sid -*/ -struct dom_sid *dom_sid_parse_talloc(TALLOC_CTX *mem_ctx, const char *sidstr) -{ - struct dom_sid *ret; - ret = talloc(mem_ctx, struct dom_sid); - if (!ret) { - return NULL; - } - if (!dom_sid_parse(sidstr, ret)) { - talloc_free(ret); - return NULL; - } - - return ret; -} - -/* - convert a string to a dom_sid, returning a talloc'd dom_sid -*/ -struct dom_sid *dom_sid_parse_length(TALLOC_CTX *mem_ctx, const DATA_BLOB *sid) -{ - struct dom_sid *ret; - char *p = talloc_strndup(mem_ctx, (char *)sid->data, sid->length); - if (!p) { - return NULL; - } - ret = dom_sid_parse_talloc(mem_ctx, p); - talloc_free(p); - return ret; -} - -/* - copy a dom_sid structure -*/ -struct dom_sid *dom_sid_dup(TALLOC_CTX *mem_ctx, const struct dom_sid *dom_sid) -{ - struct dom_sid *ret; - int i; - - if (!dom_sid) { - return NULL; - } - - ret = talloc(mem_ctx, struct dom_sid); - if (!ret) { - return NULL; - } - - ret->sid_rev_num = dom_sid->sid_rev_num; - ret->id_auth[0] = dom_sid->id_auth[0]; - ret->id_auth[1] = dom_sid->id_auth[1]; - ret->id_auth[2] = dom_sid->id_auth[2]; - ret->id_auth[3] = dom_sid->id_auth[3]; - ret->id_auth[4] = dom_sid->id_auth[4]; - ret->id_auth[5] = dom_sid->id_auth[5]; - ret->num_auths = dom_sid->num_auths; - - for (i=0;i<dom_sid->num_auths;i++) { - ret->sub_auths[i] = dom_sid->sub_auths[i]; - } - - return ret; -} - -/* - add a rid to a domain dom_sid to make a full dom_sid. This function - returns a new sid in the supplied memory context -*/ -struct dom_sid *dom_sid_add_rid(TALLOC_CTX *mem_ctx, - const struct dom_sid *domain_sid, - uint32_t rid) -{ - struct dom_sid *sid; - - sid = talloc(mem_ctx, struct dom_sid); - if (!sid) return NULL; - - *sid = *domain_sid; - - sid->sub_auths[sid->num_auths] = rid; - sid->num_auths++; - - return sid; -} - -/* - Split up a SID into its domain and RID part -*/ -NTSTATUS dom_sid_split_rid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, - struct dom_sid **domain, uint32_t *rid) -{ - if (sid->num_auths == 0) { - return NT_STATUS_INVALID_PARAMETER; - } - - if (domain) { - if (!(*domain = dom_sid_dup(mem_ctx, sid))) { - return NT_STATUS_NO_MEMORY; - } - - (*domain)->num_auths -= 1; - } - - if (rid) { - *rid = sid->sub_auths[sid->num_auths - 1]; - } - - return NT_STATUS_OK; -} - -/* - return true if the 2nd sid is in the domain given by the first sid -*/ -bool dom_sid_in_domain(const struct dom_sid *domain_sid, - const struct dom_sid *sid) -{ - int i; - - if (!domain_sid || !sid) { - return false; - } - - if (domain_sid->num_auths > sid->num_auths) { - return false; - } - - for (i = domain_sid->num_auths-1; i >= 0; --i) { - if (domain_sid->sub_auths[i] != sid->sub_auths[i]) { - return false; - } - } - - return dom_sid_compare_auth(domain_sid, sid) == 0; -} - -/* - convert a dom_sid to a string -*/ -char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid) -{ - int i, ofs, maxlen; - uint32_t ia; - char *ret; - - if (!sid) { - return talloc_strdup(mem_ctx, "(NULL SID)"); - } - - maxlen = sid->num_auths * 11 + 25; - ret = talloc_array(mem_ctx, char, maxlen); - if (!ret) return talloc_strdup(mem_ctx, "(SID ERR)"); - - ia = (sid->id_auth[5]) + - (sid->id_auth[4] << 8 ) + - (sid->id_auth[3] << 16) + - (sid->id_auth[2] << 24); - - ofs = snprintf(ret, maxlen, "S-%u-%lu", - (unsigned int)sid->sid_rev_num, (unsigned long)ia); - - for (i = 0; i < sid->num_auths; i++) { - ofs += snprintf(ret + ofs, maxlen - ofs, "-%lu", (unsigned long)sid->sub_auths[i]); - } - - return ret; -} diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h index 46ef6186b8..517f3e8ebe 100644 --- a/source4/libcli/security/security.h +++ b/source4/libcli/security/security.h @@ -28,4 +28,7 @@ enum security_user_level { struct auth_session_info; +/* Moved the dom_sid functions to the top level dir with manual proto header */ +#include "libcli/security/dom_sid.h" + #include "libcli/security/proto.h" diff --git a/source4/main.mk b/source4/main.mk index bfff04d13c..04f7a36a5f 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -49,3 +49,4 @@ mkinclude scripting/python/config.mk mkinclude kdc/config.mk mkinclude ../lib/smbconf/config.mk mkinclude ../lib/async_req/config.mk +mkinclude ../libcli/security/config.mk diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 2207786f17..a1e52ba80e 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -49,7 +49,7 @@ #include "libcli/auth/libcli_auth.h" #include "../lib/crypto/crypto.h" #include "auth/ntlmssp/ntlmssp.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "param/param.h" #include "lib/registry/registry.h" #include "libcli/resolve/resolve.h" diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c index f7be59136c..d0efbb159b 100644 --- a/source4/winbind/idmap.c +++ b/source4/winbind/idmap.c @@ -29,7 +29,7 @@ #include "lib/ldb_wrap.h" #include "param/param.h" #include "winbind/idmap.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "libcli/ldap/ldap_ndr.h" /** diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c index 7d821537f0..be43684f82 100644 --- a/source4/winbind/wb_cmd_getpwnam.c +++ b/source4/winbind/wb_cmd_getpwnam.c @@ -27,7 +27,7 @@ #include "winbind/wb_helper.h" #include "smbd/service_task.h" #include "libnet/libnet_proto.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" struct cmd_getpwnam_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_sid2gid.c b/source4/winbind/wb_sid2gid.c index d68956ce85..282d10c9c9 100644 --- a/source4/winbind/wb_sid2gid.c +++ b/source4/winbind/wb_sid2gid.c @@ -24,7 +24,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "winbind/wb_helper.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "winbind/idmap.h" struct sid2gid_state { diff --git a/source4/winbind/wb_sid2uid.c b/source4/winbind/wb_sid2uid.c index b65e41978c..151f39906b 100644 --- a/source4/winbind/wb_sid2uid.c +++ b/source4/winbind/wb_sid2uid.c @@ -24,7 +24,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "winbind/wb_helper.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "winbind/idmap.h" struct sid2uid_state { |