sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s3-auth: Pass talloc context to make_server_info_pw().

Browse Source 
Pair-Programmed-With: Guenther Deschner <gd@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2013-12-13 19:11:01 +01:00 committed by Andrew Bartlett
parent 1bb11c7744
commit 1b59c9743c
4 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/auth/auth_unix.c
View File

@ -67,8 +67,11 @@ static NTSTATUS check_unix_security(const struct auth_context *auth_context,
unbecome_root();
if (NT_STATUS_IS_OK(nt_status)) {
if (pass) {
make_server_info_pw(server_info, pass->pw_name, pass);
if (pass != NULL) {
nt_status = make_server_info_pw(mem_ctx,
pass->pw_name,
pass,
server_info);
} else {
/* we need to do somthing more useful here */
nt_status = NT_STATUS_NO_SUCH_USER;

52
source3/auth/auth_util.c
View File

@ -639,14 +639,15 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
to a struct samu
***************************************************************************/
NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
char *unix_username,
struct passwd *pwd)
NTSTATUS make_server_info_pw(TALLOC_CTX *mem_ctx,
const char *unix_username,
const struct passwd *pwd,
struct auth_serversupplied_info **server_info)
{
NTSTATUS status;
struct samu *sampass = NULL;
char *qualified_name = NULL;
TALLOC_CTX *mem_ctx = NULL;
TALLOC_CTX *tmp_ctx;
struct dom_sid u_sid;
enum lsa_SidType type;
struct auth_serversupplied_info *result;
@ -664,27 +665,27 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
* plaintext passwords were used with no SAM backend.
*/
mem_ctx = talloc_init("make_server_info_pw_tmp");
if (!mem_ctx) {
tmp_ctx = talloc_stackframe();
if (tmp_ctx == NULL) {
return NT_STATUS_NO_MEMORY;
}
qualified_name = talloc_asprintf(mem_ctx, "%s\\%s",
qualified_name = talloc_asprintf(tmp_ctx, "%s\\%s",
unix_users_domain_name(),
unix_username );
if (!qualified_name) {
TALLOC_FREE(mem_ctx);
TALLOC_FREE(tmp_ctx);
return NT_STATUS_NO_MEMORY;
}
if (!lookup_name(mem_ctx, qualified_name, LOOKUP_NAME_ALL,
if (!lookup_name(tmp_ctx, qualified_name, LOOKUP_NAME_ALL,
NULL, NULL,
&u_sid, &type)) {
TALLOC_FREE(mem_ctx);
TALLOC_FREE(tmp_ctx);
return NT_STATUS_NO_SUCH_USER;
}
TALLOC_FREE(mem_ctx);
TALLOC_FREE(tmp_ctx);
if (type != SID_NAME_USER) {
return NT_STATUS_NO_SUCH_USER;
@ -707,7 +708,7 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
/* set the user sid to be the calculated u_sid */
pdb_set_user_sid(sampass, &u_sid, PDB_SET);
result = make_server_info(NULL);
result = make_server_info(mem_ctx);
if (result == NULL) {
TALLOC_FREE(sampass);
return NT_STATUS_NO_MEMORY;
@ -992,25 +993,36 @@ NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
struct passwd *pwd;
NTSTATUS status;
struct auth_serversupplied_info *result;
TALLOC_CTX *tmp_ctx;
pwd = Get_Pwnam_alloc(talloc_tos(), username);
if (pwd == NULL) {
return NT_STATUS_NO_SUCH_USER;
tmp_ctx = talloc_stackframe();
if (tmp_ctx == NULL) {
return NT_STATUS_NO_MEMORY;
}
status = make_server_info_pw(&result, pwd->pw_name, pwd);
pwd = Get_Pwnam_alloc(tmp_ctx, username);
if (pwd == NULL) {
status = NT_STATUS_NO_SUCH_USER;
goto done;
}
status = make_server_info_pw(tmp_ctx, pwd->pw_name, pwd, &result);
if (!NT_STATUS_IS_OK(status)) {
return status;
goto done;
}
result->nss_token = true;
result->guest = is_guest;
/* Now turn the server_info into a session_info with the full token etc */
status = create_local_token(mem_ctx, result, NULL, pwd->pw_name, session_info);
TALLOC_FREE(result);
TALLOC_FREE(pwd);
status = create_local_token(mem_ctx,
result,
NULL,
pwd->pw_name,
session_info);
done:
talloc_free(tmp_ctx);
return status;
}

7
source3/auth/proto.h
View File

@ -206,9 +206,10 @@ bool user_in_group_sid(const char *username, const struct dom_sid *group_sid);
bool user_sid_in_group_sid(const struct dom_sid *sid, const struct dom_sid *group_sid);
bool user_in_group(const char *username, const char *groupname);
struct passwd;
NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
char *unix_username,
struct passwd *pwd);
NTSTATUS make_server_info_pw(TALLOC_CTX *mem_ctx,
const char *unix_username,
const struct passwd *pwd,
struct auth_serversupplied_info **server_info);
NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
const char *username,
bool is_guest,

5
source3/auth/user_krb5.c
View File

@ -242,7 +242,7 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
*/
DEBUG(10, ("didn't find user %s in passdb, calling "
"make_server_info_pw\n", username));
status = make_server_info_pw(&tmp, username, pw);
status = make_server_info_pw(mem_ctx, username, pw, &tmp);
}
TALLOC_FREE(sampass);
@ -253,9 +253,6 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
return status;
}
/* Steal tmp server info into the server_info pointer. */
server_info = talloc_move(mem_ctx, &tmp);
/* make_server_info_pw does not set the domain. Without this
* we end up with the local netbios name in substitutions for
* %D. */