/* functions moved from auth/auth_util.c to minimize linker deps */
#include "includes.h"
+#include "auth.h"
#include "secrets.h"
#include "memcache.h"
#include "../librpc/gen_ndr/netlogon.h"
#include "../libcli/security/security.h"
+#include "../lib/util/util_pw.h"
+#include "lib/winbind_util.h"
+#include "passdb.h"
+#include "lib/privileges.h"
/****************************************************************************
Check for a SID in an struct security_token
return NT_STATUS_OK;
}
-/**
- * Create the requested BUILTIN if it doesn't already exist. This requires
- * winbindd to be running.
- *
- * @param[in] rid BUILTIN rid to create
- * @return Normal NTSTATUS return.
- */
-static NTSTATUS create_builtin(uint32 rid)
-{
- NTSTATUS status = NT_STATUS_OK;
- struct dom_sid sid;
- gid_t gid;
-
- if (!sid_compose(&sid, &global_sid_Builtin, rid)) {
- return NT_STATUS_NO_SUCH_ALIAS;
- }
-
- if (!sid_to_gid(&sid, &gid)) {
- if (!lp_winbind_nested_groups() || !winbind_ping()) {
- return NT_STATUS_PROTOCOL_UNREACHABLE;
- }
- status = pdb_create_builtin_alias(rid);
- }
- return status;
-}
-
-/**
- * Add sid as a member of builtin_sid.
- *
- * @param[in] builtin_sid An existing builtin group.
- * @param[in] dom_sid sid to add as a member of builtin_sid.
- * @return Normal NTSTATUS return
- */
-static NTSTATUS add_sid_to_builtin(const struct dom_sid *builtin_sid,
- const struct dom_sid *dom_sid)
-{
- NTSTATUS status = NT_STATUS_OK;
-
- if (!dom_sid || !builtin_sid) {
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- status = pdb_add_aliasmem(builtin_sid, dom_sid);
-
- if (NT_STATUS_EQUAL(status, NT_STATUS_MEMBER_IN_ALIAS)) {
- DEBUG(5, ("add_sid_to_builtin %s is already a member of %s\n",
- sid_string_dbg(dom_sid),
- sid_string_dbg(builtin_sid)));
- return NT_STATUS_OK;
- }
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(4, ("add_sid_to_builtin %s could not be added to %s: "
- "%s\n", sid_string_dbg(dom_sid),
- sid_string_dbg(builtin_sid), nt_errstr(status)));
- }
- return status;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-NTSTATUS create_builtin_users(const struct dom_sid *dom_sid)
-{
- NTSTATUS status;
- struct dom_sid dom_users;
-
- status = create_builtin(BUILTIN_RID_USERS);
- if ( !NT_STATUS_IS_OK(status) ) {
- DEBUG(5,("create_builtin_users: Failed to create Users\n"));
- return status;
- }
-
- /* add domain users */
- if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER))
- && sid_compose(&dom_users, dom_sid, DOMAIN_RID_USERS))
- {
- status = add_sid_to_builtin(&global_sid_Builtin_Users,
- &dom_users);
- }
-
- return status;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-NTSTATUS create_builtin_administrators(const struct dom_sid *dom_sid)
-{
- NTSTATUS status;
- struct dom_sid dom_admins, root_sid;
- fstring root_name;
- enum lsa_SidType type;
- TALLOC_CTX *ctx;
- bool ret;
-
- status = create_builtin(BUILTIN_RID_ADMINISTRATORS);
- if ( !NT_STATUS_IS_OK(status) ) {
- DEBUG(5,("create_builtin_administrators: Failed to create Administrators\n"));
- return status;
- }
-
- /* add domain admins */
- if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER))
- && sid_compose(&dom_admins, dom_sid, DOMAIN_RID_ADMINS))
- {
- status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
- &dom_admins);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
- }
-
- /* add root */
- if ( (ctx = talloc_init("create_builtin_administrators")) == NULL ) {
- return NT_STATUS_NO_MEMORY;
- }
- fstr_sprintf( root_name, "%s\\root", get_global_sam_name() );
- ret = lookup_name(ctx, root_name, LOOKUP_NAME_DOMAIN, NULL, NULL,
- &root_sid, &type);
- TALLOC_FREE( ctx );
-
- if ( ret ) {
- status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
- &root_sid);
- }
-
- return status;
-}
-
static NTSTATUS finalize_local_nt_token(struct security_token *result,
bool is_guest);
struct dom_sid *group_sids;
struct dom_sid unix_group_sid;
uint32_t num_group_sids;
- size_t num_gids;
- size_t i;
+ uint32_t num_gids;
+ uint32_t i;
if (!lookup_name_smbconf(tmp_ctx, username, LOOKUP_NAME_ALL,
NULL, NULL, &user_sid, &type)) {
if (sid_check_is_in_our_domain(&user_sid)) {
bool ret;
- size_t pdb_num_group_sids;
+ uint32_t pdb_num_group_sids;
/* This is a passdb user, so ask passdb */
struct samu *sam_acct = NULL;
* about the mapping of guest sid to lp_guestaccount()
* username and will return the unix_pw info for a guest
* user. Use it if it's there, else lookup the *uid details
- * using getpwnam_alloc(). See bug #6291 for details. JRA.
+ * using Get_Pwnam_alloc(). See bug #6291 for details. JRA.
*/
/* We must always assign the *uid. */
if (sam_acct->unix_pw == NULL) {
- struct passwd *pwd = getpwnam_alloc(sam_acct, *found_username );
+ struct passwd *pwd = Get_Pwnam_alloc(sam_acct, *found_username );
if (!pwd) {
- DEBUG(10, ("getpwnam_alloc failed for %s\n",
+ DEBUG(10, ("Get_Pwnam_alloc failed for %s\n",
*found_username));
result = NT_STATUS_NO_SUCH_USER;
goto done;
*uid = sam_acct->unix_pw->pw_uid;
} else if (sid_check_is_in_unix_users(&user_sid)) {
- size_t getgroups_num_group_sids;
+ uint32_t getgroups_num_group_sids;
/* This is a unix user not in passdb. We need to ask nss
* directly, without consulting passdb */
* correct info. AD might prohibit winbind looking up that
* information. */
- uint32 dummy;
-
/* We must always assign the *uid. */
if (!sid_to_uid(&user_sid, uid)) {
DEBUG(1, ("winbindd case, sid_to_uid for %s (%s) failed\n",
}
sid_copy(&group_sids[0], &user_sid);
- sid_split_rid(&group_sids[0], &dummy);
+ sid_split_rid(&group_sids[0], NULL);
sid_append_rid(&group_sids[0], DOMAIN_RID_USERS);
if (!sid_to_gid(&group_sids[0], gid)) {