sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

BUG 9139: Fix the username map optimization.

Browse Source 
If we successfully map a user. We call

set_last_from_to(user_in, unixname);

in the while loop reading the map file. After a successfull map we don't
stop and continue the loop to check all other mappings in the username
mapfile. But when we hit the end of the file and leave the loop we call:

set_last_from_to(user_in, user_in);

This overwrites the successful mapping, and the next time we call
map_username() we skip the username and no mapping is done.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Andreas Schneider 2013-04-05 14:07:37 +02:00 committed by Günther Deschner
parent 243278a2c5
commit b7c0330b74
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/auth/user_util.c
View File

@ -427,12 +427,16 @@ bool map_username(TALLOC_CTX *ctx, const char *user_in, char **p_user_out)
x_fclose(f);
/*
* Setup the last_from and last_to as an optimization so
* If we didn't successfully map a user in the loop above,
* setup the last_from and last_to as an optimization so
* that we don't scan the file again for the same user.
*/
set_last_from_to(user_in, user_in);
store_map_in_gencache(ctx, user_in, user_in);
if (!mapped_user) {
DEBUG(8, ("The user '%s' has no mapping. "
"Skip it next time.\n", user_in));
set_last_from_to(user_in, user_in);
store_map_in_gencache(ctx, user_in, user_in);
}
return mapped_user;
}