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

r25042: Avoid direct references to global loadparm context.

Browse Source
This commit is contained in:
Jelmer Vernooij 2007-09-08 21:06:57 +00:00 committed by Gerald (Jerry) Carter
parent 9bb8738945
commit 256532ab4b
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/param/loadparm.c
View File

@ -2539,26 +2539,10 @@ struct loadparm_service *lp_servicebynum(int snum)
}
struct loadparm_service *lp_service(const char *service_name)
{
int snum = lp_servicenumber(service_name);
if (snum < 0)
return NULL;
return loadparm.ServicePtrs[snum];
}
/***************************************************************************
Return the number of the service with the given name, or -1 if it doesn't
exist. Note that this is a DIFFERENT ANIMAL from the internal function
getservicebyname()! This works ONLY if all services have been loaded, and
does not copy the found service.
***************************************************************************/
int lp_servicenumber(const char *pszServiceName)
{
int iService;
char *serviceName;
for (iService = loadparm.iNumServices - 1; iService >= 0; iService--) {
if (loadparm.ServicePtrs[iService] &&
loadparm.ServicePtrs[iService]->szService) {
@ -2568,17 +2552,16 @@ int lp_servicenumber(const char *pszServiceName)
*/
serviceName = standard_sub_basic(loadparm.ServicePtrs[iService],
loadparm.ServicePtrs[iService]->szService);
if (strequal(serviceName, pszServiceName))
break;
if (strequal(serviceName, service_name))
return loadparm.ServicePtrs[iService];
}
}
if (iService < 0)
DEBUG(7,("lp_servicenumber: couldn't find %s\n", pszServiceName));
return iService;
DEBUG(7,("lp_servicenumber: couldn't find %s\n", service_name));
return NULL;
}
/*******************************************************************
A useful volume label function.
********************************************************************/