sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3: Move init_lsa_ref_domain_list to lib

Browse Source 
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>
This commit is contained in:
Christof Schmitt 2014-09-11 16:11:06 -07:00 committed by Volker Lendecke
parent f3ce6b4d35
commit 16594e7fc0
5 changed files with 98 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/include/lsa.h Normal file
View File

@ -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

67
source3/lib/lsa.c Normal file
View File

@ -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;
}

48
source3/rpc_server/lsa/srv_lsa_nt.c
View File

@ -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
@ -97,53 +98,6 @@ const struct generic_mapping lsa_trusted_domain_mapping = {
LSA_TRUSTED_DOMAIN_ALL_ACCESS
};
/***************************************************************************
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.
***************************************************************************/

2
source3/rpc_server/wscript_build
View File

@ -64,7 +64,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN',
bld.SAMBA3_SUBSYSTEM('RPC_LSARPC',
source='''lsa/srv_lsa_nt.c
../../librpc/gen_ndr/srv_lsa.c''',
deps='SRV_ACCESS_CHECK')
deps='SRV_ACCESS_CHECK LIBLSA')
bld.SAMBA3_SUBSYSTEM('RPC_NETDFS',
source='''dfs/srv_dfs_nt.c

4
source3/wscript_build
View File

@ -827,6 +827,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',
@ -971,6 +974,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
WB_REQTRANS
TDB_VALIDATE
MESSAGING
LIBLSA
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}')