From 077d5d4ebc8ffa96264ab3fe1bef6395388b1f92 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 6 Apr 2006 07:28:22 +0000
Subject: [PATCH] There's no need for lp_load() to check am_daemon.

---
 loadparm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/loadparm.c b/loadparm.c
index bd37ac99..a003b34d 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -802,7 +802,6 @@ 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;
@@ -815,7 +814,7 @@ BOOL lp_load(char *pszFname, int globals_only)
 
 	if (pszFname)
 	    pstrcpy(n2,pszFname);
-	else if (am_server && am_daemon && !am_root)
+	else if (am_server && !am_root)
 	    pstrcpy(n2,RSYNCD_USERCONF);
 	else
 	    pstrcpy(n2,RSYNCD_SYSCONF);
-- 
2.34.1