diff options
-rw-r--r-- | source3/Makefile.in | 2 | ||||
-rw-r--r-- | source3/include/proto.h | 9 | ||||
-rw-r--r-- | source3/lib/util_wellknown.c (renamed from source3/passdb/util_wellknown.c) | 9 | ||||
-rw-r--r-- | source3/passdb/proto.h | 9 | ||||
-rwxr-xr-x | source3/wscript_build | 2 |
5 files changed, 15 insertions, 16 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 36951a7ca5..ace5bbbba6 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -759,7 +759,7 @@ PRIVILEGES_OBJ = lib/privileges.o PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \ - passdb/util_wellknown.o passdb/util_builtin.o passdb/pdb_compat.o \ + lib/util_wellknown.o passdb/util_builtin.o passdb/pdb_compat.o \ passdb/util_unixsids.o passdb/lookup_sid.o \ passdb/login_cache.o @PDB_STATIC@ \ passdb/account_pol.o $(PRIVILEGES_OBJ) \ diff --git a/source3/include/proto.h b/source3/include/proto.h index 76694a346f..01ec4bb4c1 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4701,4 +4701,13 @@ void map_max_allowed_access(const struct security_token *nt_token, const struct security_unix_token *unix_token, uint32_t *pacc_requested); +/* The following definitions come from lib/util_wellknown.c */ + +bool sid_check_is_wellknown_domain(const struct dom_sid *sid, const char **name); +bool sid_check_is_in_wellknown_domain(const struct dom_sid *sid); +bool lookup_wellknown_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, + const char **domain, const char **name); +bool lookup_wellknown_name(TALLOC_CTX *mem_ctx, const char *name, + struct dom_sid *sid, const char **domain); + #endif /* _PROTO_H_ */ diff --git a/source3/passdb/util_wellknown.c b/source3/lib/util_wellknown.c index 1810efac17..f2f99af2d0 100644 --- a/source3/passdb/util_wellknown.c +++ b/source3/lib/util_wellknown.c @@ -1,27 +1,26 @@ -/* +/* Unix SMB/CIFS implementation. Lookup routines for well-known SIDs Copyright (C) Andrew Tridgell 1992-1998 Copyright (C) Luke Kenneth Caseson Leighton 1998-1999 Copyright (C) Jeremy Allison 1999 Copyright (C) Volker Lendecke 2005 - + 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 "passdb.h" #include "../libcli/security/security.h" struct rid_name_map { diff --git a/source3/passdb/proto.h b/source3/passdb/proto.h index 2f7776b796..8680a09704 100644 --- a/source3/passdb/proto.h +++ b/source3/passdb/proto.h @@ -309,15 +309,6 @@ bool sid_check_is_in_unix_groups(const struct dom_sid *sid); const char *unix_groups_domain_name(void); bool lookup_unix_group_name(const char *name, struct dom_sid *sid); -/* The following definitions come from passdb/util_wellknown.c */ - -bool sid_check_is_wellknown_domain(const struct dom_sid *sid, const char **name); -bool sid_check_is_in_wellknown_domain(const struct dom_sid *sid); -bool lookup_wellknown_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, - const char **domain, const char **name); -bool lookup_wellknown_name(TALLOC_CTX *mem_ctx, const char *name, - struct dom_sid *sid, const char **domain); - /* The following definitions come from passdb/pdb_util.c */ NTSTATUS create_builtin_users(const struct dom_sid *sid); diff --git a/source3/wscript_build b/source3/wscript_build index 9e3c7eeb43..933dcf6105 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -227,7 +227,7 @@ PRIVILEGES_SRC = '''lib/privileges.c''' PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c''' PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c - passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c + lib/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c passdb/util_unixsids.c passdb/lookup_sid.c passdb/login_cache.c passdb/account_pol.c ${PRIVILEGES_SRC} |