diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 13 | ||||
| -rw-r--r-- | source3/lib/util_unixsids.c (renamed from source3/passdb/util_unixsids.c) | 3 | ||||
| -rw-r--r-- | source3/passdb/proto.h | 13 | ||||
| -rwxr-xr-x | source3/wscript_build | 2 |
5 files changed, 16 insertions, 17 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ace5bbbba6..e6d2d249bc 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -760,7 +760,7 @@ PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \ lib/util_wellknown.o passdb/util_builtin.o passdb/pdb_compat.o \ - passdb/util_unixsids.o passdb/lookup_sid.o \ + lib/util_unixsids.o passdb/lookup_sid.o \ passdb/login_cache.o @PDB_STATIC@ \ passdb/account_pol.o $(PRIVILEGES_OBJ) \ lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ) \ diff --git a/source3/include/proto.h b/source3/include/proto.h index 01ec4bb4c1..c359728064 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4710,4 +4710,17 @@ bool lookup_wellknown_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, bool lookup_wellknown_name(TALLOC_CTX *mem_ctx, const char *name, struct dom_sid *sid, const char **domain); +/* The following definitions come from lib/util_unixsids.c */ + +bool sid_check_is_unix_users(const struct dom_sid *sid); +bool sid_check_is_in_unix_users(const struct dom_sid *sid); +void uid_to_unix_users_sid(uid_t uid, struct dom_sid *sid); +void gid_to_unix_groups_sid(gid_t gid, struct dom_sid *sid); +const char *unix_users_domain_name(void); +bool lookup_unix_user_name(const char *name, struct dom_sid *sid); +bool sid_check_is_unix_groups(const struct dom_sid *sid); +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); + #endif /* _PROTO_H_ */ diff --git a/source3/passdb/util_unixsids.c b/source3/lib/util_unixsids.c index e6f73a1443..8db66d6e89 100644 --- a/source3/passdb/util_unixsids.c +++ b/source3/lib/util_unixsids.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. Translate unix-defined names to SIDs and vice versa Copyright (C) Volker Lendecke 2005 @@ -18,7 +18,6 @@ */ #include "includes.h" -#include "passdb.h" #include "system/passwd.h" #include "../libcli/security/security.h" #include "../lib/util/util_pw.h" diff --git a/source3/passdb/proto.h b/source3/passdb/proto.h index 8680a09704..a64985c709 100644 --- a/source3/passdb/proto.h +++ b/source3/passdb/proto.h @@ -296,19 +296,6 @@ NTSTATUS pdb_wbc_sam_init(void); NTSTATUS pdb_tdbsam_init(void); -/* The following definitions come from passdb/util_unixsids.c */ - -bool sid_check_is_unix_users(const struct dom_sid *sid); -bool sid_check_is_in_unix_users(const struct dom_sid *sid); -void uid_to_unix_users_sid(uid_t uid, struct dom_sid *sid); -void gid_to_unix_groups_sid(gid_t gid, struct dom_sid *sid); -const char *unix_users_domain_name(void); -bool lookup_unix_user_name(const char *name, struct dom_sid *sid); -bool sid_check_is_unix_groups(const struct dom_sid *sid); -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/pdb_util.c */ NTSTATUS create_builtin_users(const struct dom_sid *sid); diff --git a/source3/wscript_build b/source3/wscript_build index 933dcf6105..c03a6737bb 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -228,7 +228,7 @@ PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c''' PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c lib/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c - passdb/util_unixsids.c passdb/lookup_sid.c + lib/util_unixsids.c passdb/lookup_sid.c passdb/login_cache.c passdb/account_pol.c ${PRIVILEGES_SRC} lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC} |