sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Commit the auth associated changes I missed from the last commit.

Browse Source 
Also set the default value of all the allocated strings to "" to avoid changing
the interface (becouse pdb_get...() would point to a null string, rather than a
null pointer and parts of samba rely on that).

Andrew Bartlett
(This used to be commit 5b4079f748)
This commit is contained in:
Andrew Bartlett 2002-01-15 01:14:58 +00:00
parent dbee612f71
commit 90558370ab
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/auth/auth_sam.c
View File

@ -353,8 +353,10 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
return NT_STATUS_UNSUCCESSFUL;
}
if (!pdb_init_sam(&sampass)) {
return NT_STATUS_NO_MEMORY;
/* Can't use the talloc version here, becouse the returned struct gets
kept on the server_info */
if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(&sampass))) {
return nt_status;
}
/* get the account information */

2
source3/auth/auth_util.c
View File

@ -501,7 +501,7 @@ BOOL make_server_info_sam(auth_serversupplied_info **server_info, SAM_ACCOUNT *s
BOOL make_server_info_pw(auth_serversupplied_info **server_info, const struct passwd *pwd)
{
SAM_ACCOUNT *sampass = NULL;
if (!pdb_init_sam_pw(&sampass, pwd)) {
if (!NT_STATUS_IS_OK(pdb_init_sam_pw(&sampass, pwd))) {
return False;
}
return make_server_info_sam(server_info, sampass);

15
source3/passdb/passdb.c
View File

@ -80,6 +80,21 @@ static void pdb_fill_default_sam(SAM_ACCOUNT *user)
memset(user->private.hours, 0xff, user->private.hours_len); /* available at all hours */
user->private.unknown_5 = 0x00000000; /* don't know */
user->private.unknown_6 = 0x000004ec; /* don't know */
/* Some parts of samba strlen their pdb_get...() returns,
so this keeps the interface unchanged for now. */
user->private.username = "";
user->private.domain = "";
user->private.nt_username = "";
user->private.full_name = "";
user->private.home_dir = "";
user->private.logon_script = "";
user->private.profile_path = "";
user->private.acct_desc = "";
user->private.workstations = "";
user->private.unknown_str = "";
user->private.munged_dial = "";
}
static void destroy_pdb_talloc(SAM_ACCOUNT **user)

1
source3/passdb/pdb_get_set.c
View File

@ -28,6 +28,7 @@
* @todo Redefine this to NULL, but this changes the API becouse
* much of samba assumes that the pdb_get...() funtions
* return pstrings. (ie not null-pointers).
* See also pdb_fill_default_sam().
*/
#define PDB_NOT_QUITE_NULL ""