diff options
Diffstat (limited to 'loadparm.c')
-rw-r--r-- | loadparm.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -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; |