r1869: Rename "fallback_XXXX" mapping to "algorithmic_XXX" as

[garming/samba-autobuild/.git] / source3 / passdb / pdb_smbpasswd.c

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 562d50f89e36fb44b746b4ed1e31dba8364e0480..6ebac1c01a5a4b3f6d929c1a6ac9b27a50d5cdaa 100644 (file)
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -1144,8 +1144,8 @@ static BOOL build_smb_pass (struct smb_passwd *smb_pw, const SAM_ACCOUNT *sampas
                        smb_pw->smb_userid=passwd->pw_uid;
                        passwd_free(&passwd);
 
-               } else if (fallback_pdb_rid_is_user(rid)) {
-                       smb_pw->smb_userid=fallback_pdb_user_rid_to_uid(rid);
+               } else if (algorithmic_pdb_rid_is_user(rid)) {
+                       smb_pw->smb_userid=algorithmic_pdb_user_rid_to_uid(rid);
                } else {
                        DEBUG(0,("build_sam_pass: Failing attempt to store user with non-uid based user RID. \n"));
                        return False;
@@ -1366,7 +1366,7 @@ static NTSTATUS smbpasswd_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUN
                return nt_status;
        }
 
-       while ( ((smb_pw=getsmbfilepwent(smbpasswd_state, fp)) != NULL) && (fallback_pdb_uid_to_user_rid(smb_pw->smb_userid) != rid) )
+       while ( ((smb_pw=getsmbfilepwent(smbpasswd_state, fp)) != NULL) && (algorithmic_pdb_uid_to_user_rid(smb_pw->smb_userid) != rid) )
                /* do nothing */ ;
 
        endsmbfilepwent(fp, &(smbpasswd_state->pw_file_lock_depth));