The lp_load() function doesn't fudge the pszFname arg anymore.

1 files changed, 1 insertions, 8 deletions

diff --git a/loadparm.c b/loadparm.c
index d9c9d931..67ce3bec 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -809,8 +809,6 @@ static BOOL do_section(char *sectionname)
 ***************************************************************************/
 BOOL lp_load(char *pszFname, int globals_only)
 {
-	extern int am_server;
-	extern int am_root;
 	pstring n2;
 	BOOL bRetval;
 
@@ -820,12 +818,7 @@ BOOL lp_load(char *pszFname, int globals_only)
 
 	init_globals();
 
-	if (pszFname)
-	    pstrcpy(n2,pszFname);
-	else if (am_server && am_root <= 0)
-	    pstrcpy(n2,RSYNCD_USERCONF);
-	else
-	    pstrcpy(n2,RSYNCD_SYSCONF);
+	pstrcpy(n2, pszFname);
 
 	/* We get sections first, so have to start 'behind' to make up */
 	iServiceIndex = -1;