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

passdb: Call with correct backend methods instead of default methods

Browse Source 
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Amitay Isaacs 2011-08-10 17:32:32 +10:00 committed by Andrew Bartlett
parent 2e0ccc4772
commit ae9a3274bc
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/passdb/passdb.c
View File

@ -146,7 +146,8 @@ static int count_commas(const char *str)
attributes and a user SID.
*********************************************************************/
static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *pwd, bool create)
static NTSTATUS samu_set_unix_internal(struct pdb_methods *methods,
struct samu *user, const struct passwd *pwd, bool create)
{
const char *guest_account = lp_guestaccount();
const char *domain = lp_netbios_name();
@ -246,11 +247,11 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
initialized and will fill in these fields later (such as from a
netr_SamInfo3 structure) */
if ( create && (pdb_capabilities() & PDB_CAP_STORE_RIDS)) {
if ( create && (methods->capabilities(methods) & PDB_CAP_STORE_RIDS)) {
uint32_t user_rid;
struct dom_sid user_sid;
if ( !pdb_new_rid( &user_rid ) ) {
if ( !methods->new_rid(methods, &user_rid) ) {
DEBUG(3, ("Could not allocate a new RID\n"));
return NT_STATUS_ACCESS_DENIED;
}
@ -282,12 +283,13 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
NTSTATUS samu_set_unix(struct samu *user, const struct passwd *pwd)
{
return samu_set_unix_internal( user, pwd, False );
return samu_set_unix_internal( NULL, user, pwd, False );
}
NTSTATUS samu_alloc_rid_unix(struct samu *user, const struct passwd *pwd)
NTSTATUS samu_alloc_rid_unix(struct pdb_methods *methods,
struct samu *user, const struct passwd *pwd)
{
return samu_set_unix_internal( user, pwd, True );
return samu_set_unix_internal( methods, user, pwd, True );
}
/**********************************************************

8
source3/passdb/pdb_interface.c
View File

@ -496,7 +496,7 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
/* we have a valid SID coming out of this call */
status = samu_alloc_rid_unix( sam_pass, pwd );
status = samu_alloc_rid_unix(methods, sam_pass, pwd);
TALLOC_FREE( pwd );
@ -521,7 +521,7 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
pdb_set_acct_ctrl(sam_pass, acb_info, PDB_CHANGED);
status = pdb_add_sam_account(sam_pass);
status = methods->add_sam_account(methods, sam_pass);
TALLOC_FREE(sam_pass);
@ -579,7 +579,9 @@ static NTSTATUS pdb_default_delete_user(struct pdb_methods *methods,
NTSTATUS status;
fstring username;
status = pdb_delete_sam_account(sam_acct);
memcache_flush(NULL, PDB_GETPWSID_CACHE);
status = methods->delete_sam_account(methods, sam_acct);
if (!NT_STATUS_IS_OK(status)) {
return status;
}

3
source3/passdb/proto.h
View File

@ -66,7 +66,8 @@ bool login_cache_delentry(const struct samu *sampass);
const char *my_sam_name(void);
struct samu *samu_new( TALLOC_CTX *ctx );
NTSTATUS samu_set_unix(struct samu *user, const struct passwd *pwd);
NTSTATUS samu_alloc_rid_unix(struct samu *user, const struct passwd *pwd);
NTSTATUS samu_alloc_rid_unix(struct pdb_methods *methods,
struct samu *user, const struct passwd *pwd);
char *pdb_encode_acct_ctrl(uint32_t acct_ctrl, size_t length);
uint32_t pdb_decode_acct_ctrl(const char *p);
void pdb_sethexpwd(char p[33], const unsigned char *pwd, uint32_t acct_ctrl);