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

- sorry, forgot to test a pointer

Browse Source
This commit is contained in:
Simo Sorce 0001-01-01 00:00:00 +00:00
parent 1ab31e5db5
commit 1aef522452
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/nmbd/nmbd.c
View File

@ -569,8 +569,10 @@ static BOOL init_structs(void)
*/
/* Work out the max number of netbios aliases that we have */
ptr = lp_netbios_aliases();
for( namecount=0; *ptr; namecount++,ptr++ )
;
namecount = 0;
if (ptr)
for( ; *ptr; namecount++,ptr++ )
;
if ( *global_myname )
namecount++;
@ -588,28 +590,31 @@ static BOOL init_structs(void)
my_netbios_names[namecount++] = global_myname;
ptr = lp_netbios_aliases();
while ( *ptr )
if (ptr)
{
nbname = strdup(*ptr);
if (nbname == NULL)
while ( *ptr )
{
DEBUG(0,("init_structs: malloc fail when allocating names.\n"));
return False;
}
strupper( nbname );
/* Look for duplicates */
nodup=1;
for( n=0; n<namecount; n++ )
{
if( 0 == strcmp( nbname, my_netbios_names[n] ) )
nodup=0;
}
if (nodup)
my_netbios_names[namecount++] = nbname;
else
free(nbname);
nbname = strdup(*ptr);
if (nbname == NULL)
{
DEBUG(0,("init_structs: malloc fail when allocating names.\n"));
return False;
}
strupper( nbname );
/* Look for duplicates */
nodup=1;
for( n=0; n<namecount; n++ )
{
if( 0 == strcmp( nbname, my_netbios_names[n] ) )
nodup=0;
}
if (nodup)
my_netbios_names[namecount++] = nbname;
else
free(nbname);
ptr++;
ptr++;
}
}
/* Terminate name list */