summaryrefslogtreecommitdiff
path: root/source3/auth/server_info_sam.c
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-27 03:41:56 -0400
committerGünther Deschner <gd@samba.org>2010-05-28 00:55:53 +0200
commitd9cffc01be58184312a6a7b55bd523cf8daefa78 (patch)
treea7037d21510273479d752c9c7964264ac12524a1 /source3/auth/server_info_sam.c
parent6713f3d945f09a732e620641771d9ff403aca9ef (diff)
downloadsamba-d9cffc01be58184312a6a7b55bd523cf8daefa78.tar.gz
samba-d9cffc01be58184312a6a7b55bd523cf8daefa78.tar.bz2
samba-d9cffc01be58184312a6a7b55bd523cf8daefa78.zip
s3:auth use info3 in auth_serversupplied_info
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/auth/server_info_sam.c')
-rw-r--r--source3/auth/server_info_sam.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c
index c6e7522011..4dd3156fe5 100644
--- a/source3/auth/server_info_sam.c
+++ b/source3/auth/server_info_sam.c
@@ -77,7 +77,13 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
return NT_STATUS_NO_SUCH_USER;
}
- result->sam_account = sampass;
+ status = samu_to_SamInfo3(result, sampass,
+ global_myname(), &result->info3);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(result);
+ return status;
+ }
+
result->unix_name = pwd->pw_name;
/* Ensure that we keep pwd->pw_name, because we will free pwd below */
talloc_steal(result, pwd->pw_name);
@@ -128,7 +134,6 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("pdb_enum_group_memberships failed: %s\n",
nt_errstr(status)));
- result->sam_account = NULL; /* Don't free on error exit. */
TALLOC_FREE(result);
return status;
}