Adding a support script that can be used to make the checked-out

[rsync/rsync.git] / loadparm.c

diff --git a/loadparm.c b/loadparm.c
index 5cd8a8f..67ce3be 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -50,6 +50,7 @@
 /* TODO: Parameter to set debug level on server. */
 
 #include "rsync.h"
+#include "ifuncs.h"
 #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2)))
 #define strequal(a,b) (strcasecmp(a,b)==0)
 #define BOOLSTR(b) ((b) ? "Yes" : "No")
@@ -808,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;
 
@@ -819,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;