X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d53d7795ee771a149a6ae010107bf3bf6d7588d0..30e8c8e1e48088477f0befdd08922caa6919bc51:/loadparm.c

diff --git a/loadparm.c b/loadparm.c
index d559b117..20326621 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -748,6 +748,9 @@ False on failure.
 ***************************************************************************/
 BOOL lp_load(char *pszFname, int globals_only)
 {
+	extern int am_server;
+	extern int am_daemon;
+	extern int am_root;
 	pstring n2;
 	BOOL bRetval;
  
@@ -757,7 +760,12 @@ BOOL lp_load(char *pszFname, int globals_only)
   
 	init_globals();
 
-	pstrcpy(n2,pszFname);
+	if (pszFname)
+	    pstrcpy(n2,pszFname);
+	else if (am_server && am_daemon && !am_root)
+	    pstrcpy(n2,RSYNCD_USERCONF);
+	else
+	    pstrcpy(n2,RSYNCD_SYSCONF);
 
 	/* We get sections first, so have to start 'behind' to make up */
 	iServiceIndex = -1;