diff options
author | Christof Schmitt <cs@samba.org> | 2014-09-11 16:11:06 -0700 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2014-10-09 21:23:05 +0200 |
commit | a0eb3ddd761235e0308fa8f8982ef027ea179805 (patch) | |
tree | 46af4fee9bf9e53520a613b4f97698f455360bf6 /source3 | |
parent | 2cd2490f356fcb3642aa1bd60729f69906ffca81 (diff) | |
download | samba-a0eb3ddd761235e0308fa8f8982ef027ea179805.tar.gz |
s3: Move init_lsa_ref_domain_list to lib
This will be used in the next patch in winbind.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit 16594e7fc0a46249a48d0d0635de0c1050ecd340)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/include/lsa.h | 25 | ||||
-rw-r--r-- | source3/lib/lsa.c | 67 | ||||
-rw-r--r-- | source3/rpc_server/lsa/srv_lsa_nt.c | 48 | ||||
-rwxr-xr-x | source3/rpc_server/wscript_build | 2 | ||||
-rwxr-xr-x | source3/wscript_build | 4 |
5 files changed, 98 insertions, 48 deletions
diff --git a/source3/include/lsa.h b/source3/include/lsa.h new file mode 100644 index 0000000000..7681aed4c7 --- /dev/null +++ b/source3/include/lsa.h @@ -0,0 +1,25 @@ +/* + * Helper functions related to the LSA server + * + * 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 LSA_H +#define LSA_H + +int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx, + struct lsa_RefDomainList *ref, + const char *dom_name, + struct dom_sid *dom_sid); + +#endif diff --git a/source3/lib/lsa.c b/source3/lib/lsa.c new file mode 100644 index 0000000000..0046fdac58 --- /dev/null +++ b/source3/lib/lsa.c @@ -0,0 +1,67 @@ +/* + * Helper functions related to the LSA server + * + * 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/>. + */ + +/*************************************************************************** + init_lsa_ref_domain_list - adds a domain if it's not already in, returns index. +***************************************************************************/ + +#include "includes.h" +#include "libcli/security/dom_sid.h" +#include "librpc/gen_ndr/lsa.h" +#include "lsa.h" + +int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx, + struct lsa_RefDomainList *ref, + const char *dom_name, + struct dom_sid *dom_sid) +{ + int num = 0; + + if (dom_name != NULL) { + for (num = 0; num < ref->count; num++) { + if (dom_sid_equal(dom_sid, ref->domains[num].sid)) { + return num; + } + } + } else { + num = ref->count; + } + + if (num >= LSA_REF_DOMAIN_LIST_MULTIPLIER) { + /* index not found, already at maximum domain limit */ + return -1; + } + + ref->count = num + 1; + ref->max_size = LSA_REF_DOMAIN_LIST_MULTIPLIER; + + ref->domains = talloc_realloc(mem_ctx, ref->domains, + struct lsa_DomainInfo, ref->count); + if (!ref->domains) { + return -1; + } + + ZERO_STRUCT(ref->domains[num]); + + ref->domains[num].name.string = dom_name; + ref->domains[num].sid = dom_sid_dup(mem_ctx, dom_sid); + if (!ref->domains[num].sid) { + return -1; + } + + return num; +} diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c index f4dc4afd57..46f42d5320 100644 --- a/source3/rpc_server/lsa/srv_lsa_nt.c +++ b/source3/rpc_server/lsa/srv_lsa_nt.c @@ -49,6 +49,7 @@ #include "../librpc/gen_ndr/ndr_wkssvc.h" #include "../libcli/auth/libcli_auth.h" #include "../libcli/lsarpc/util_lsarpc.h" +#include "lsa.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV @@ -98,53 +99,6 @@ const struct generic_mapping lsa_trusted_domain_mapping = { }; /*************************************************************************** - init_lsa_ref_domain_list - adds a domain if it's not already in, returns the index. -***************************************************************************/ - -static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx, - struct lsa_RefDomainList *ref, - const char *dom_name, - struct dom_sid *dom_sid) -{ - int num = 0; - - if (dom_name != NULL) { - for (num = 0; num < ref->count; num++) { - if (dom_sid_equal(dom_sid, ref->domains[num].sid)) { - return num; - } - } - } else { - num = ref->count; - } - - if (num >= LSA_REF_DOMAIN_LIST_MULTIPLIER) { - /* index not found, already at maximum domain limit */ - return -1; - } - - ref->count = num + 1; - ref->max_size = LSA_REF_DOMAIN_LIST_MULTIPLIER; - - ref->domains = talloc_realloc(mem_ctx, ref->domains, - struct lsa_DomainInfo, ref->count); - if (!ref->domains) { - return -1; - } - - ZERO_STRUCT(ref->domains[num]); - - init_lsa_StringLarge(&ref->domains[num].name, dom_name); - ref->domains[num].sid = dom_sid_dup(mem_ctx, dom_sid); - if (!ref->domains[num].sid) { - return -1; - } - - return num; -} - - -/*************************************************************************** initialize a lsa_DomainInfo structure. ***************************************************************************/ diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index bd96b92b25..65daec4adb 100755 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -68,7 +68,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_SAMR', bld.SAMBA3_SUBSYSTEM('RPC_LSARPC', source=RPC_LSARPC_SRC, - deps='SRV_ACCESS_CHECK', + deps='SRV_ACCESS_CHECK LIBLSA', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_WINREG', diff --git a/source3/wscript_build b/source3/wscript_build index 9461b05d32..c849604c6c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1171,6 +1171,9 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR', source='rpc_client/init_samr.c', deps='samba-util') +bld.SAMBA3_SUBSYSTEM('LIBLSA', + source='lib/lsa.c') + ########################## BINARIES ################################# bld.SAMBA3_BINARY('smbd/smbd', @@ -1214,6 +1217,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd', RPC_NCACN_NP RPC_PIPE_REGISTER WB_REQTRANS + LIBLSA ''', enabled=bld.env.build_winbind, install_path='${SBINDIR}', |