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

got rid of FILE* in the unix name mapping code

Browse Source
This commit is contained in:
Andrew Tridgell -
parent ad56e3d791
commit 92f85cef8b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/rpc_server/srv_samr.c
View File

@ -116,24 +116,24 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
static char *unmap_unixname(char *unix_user_name, int name_idx)
{
FILE *f;
char *mapfile = lp_username_map();
char *s;
pstring buf;
char **lines;
static pstring tok;
int i;
if (!*unix_user_name) return NULL;
if (!*mapfile) return NULL;
f = sys_fopen(mapfile,"r");
if (!f) {
lines = file_lines_load(mapfile, NULL);
if (!lines) {
DEBUG(0,("unmap_unixname: can't open username map %s\n", mapfile));
return NULL;
}
DEBUG(5,("unmap_unixname: scanning username map %s, index: %d\n", mapfile, name_idx));
while((s=fgets_slash(buf,sizeof(buf),f))!=NULL) {
for (i=0; lines[i]; i++) {
char *unixname = s;
char *dosname = strchr(unixname,'=');
@ -169,16 +169,16 @@ static char *unmap_unixname(char *unix_user_name, int name_idx)
if (name_idx >= 0) {
DEBUG(0,("unmap_unixname: index too high - not that many DOS names\n"));
fclose(f);
file_lines_free(lines);
return NULL;
} else {
fclose(f);
file_lines_free(lines);
return tok;
}
}
DEBUG(0,("unmap_unixname: Couldn't find the UNIX user name\n"));
fclose(f);
file_lines_free(lines);
return NULL;
}