diff options
author | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 03:47:48 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 03:47:48 +0000 |
commit | 2044d60bbe0043cdbb9aba931115672bde975d2f (patch) | |
tree | 221fd2f2f9caa4f66b5c8d0881aaaaf802c7d541 /source/smbd | |
parent | dcaf21efc5b48ddb0cbe70ce17e45c035ef525ad (diff) | |
download | samba-2044d60bbe0043cdbb9aba931115672bde975d2f.tar.gz samba-2044d60bbe0043cdbb9aba931115672bde975d2f.tar.xz samba-2044d60bbe0043cdbb9aba931115672bde975d2f.zip |
Merge passdb from HEAD -> 3.0
The work here includes:
- metze' set/changed patch, which avoids making changes to ldap on unmodified
attributes.
- volker's group mapping in passdb patch
- volker's samsync stuff
- volkers SAMR changes.
- mezte's connection caching patch
- my recent changes (fix magic root check, ldap ssl)
Andrew Bartlett
Diffstat (limited to 'source/smbd')
-rw-r--r-- | source/smbd/chgpasswd.c | 4 | ||||
-rw-r--r-- | source/smbd/lanman.c | 2 | ||||
-rw-r--r-- | source/smbd/password.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c index 9e593b022ef..a5274862fc3 100644 --- a/source/smbd/chgpasswd.c +++ b/source/smbd/chgpasswd.c @@ -707,11 +707,11 @@ BOOL change_lanman_password(SAM_ACCOUNT *sampass, uchar * pass1, D_P16(pwd, pass2, unenc_new_pw); } - if (!pdb_set_lanman_passwd(sampass, unenc_new_pw)) { + if (!pdb_set_lanman_passwd(sampass, unenc_new_pw, PDB_CHANGED)) { return False; } - if (!pdb_set_nt_passwd (sampass, NULL)) { + if (!pdb_set_nt_passwd (sampass, NULL, PDB_CHANGED)) { return False; /* We lose the NT hash. Sorry. */ } diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c index d8c1cc6f609..7ab1be9dd9d 100644 --- a/source/smbd/lanman.c +++ b/source/smbd/lanman.c @@ -1651,7 +1651,7 @@ static BOOL api_RNetGroupEnum(connection_struct *conn,uint16 vuid, char *param,c return False; /* get list of domain groups SID_DOMAIN_GRP=2 */ - if(!enum_group_mapping(SID_NAME_DOM_GRP , &group_list, &num_entries, False, False)) { + if(!pdb_enum_group_mapping(SID_NAME_DOM_GRP , &group_list, &num_entries, False, False)) { DEBUG(3,("api_RNetGroupEnum:failed to get group list")); return False; } diff --git a/source/smbd/password.c b/source/smbd/password.c index f2956237dd2..1e87065e313 100644 --- a/source/smbd/password.c +++ b/source/smbd/password.c @@ -134,7 +134,7 @@ int register_vuid(auth_serversupplied_info *server_info, const char *smb_name) * the new real sam db won't have reference to unix uids or gids */ if (!IS_SAM_UNIX_USER(server_info->sam_account)) { - DEBUG(0,("Attempted session setup with invalid user. No uid/gid in SAM_ACCOUNT (flags:%x)\n", pdb_get_init_flag(server_info->sam_account))); + DEBUG(0,("Attempted session setup with invalid user. No uid/gid in SAM_ACCOUNT\n")); free(vuser); return UID_FIELD_INVALID; } |