diff options
| author | Wayne Davison <wayned@samba.org> | 2006-04-06 07:28:22 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-04-06 07:28:22 +0000 |
| commit | 077d5d4ebc8ffa96264ab3fe1bef6395388b1f92 (patch) | |
| tree | 2d5d126d376897b5941e3566761bde162854a6b9 /loadparm.c | |
| parent | e2d774cdd7e00d9680a5f68d3b81c2bed7a37d40 (diff) | |
| download | android_external_rsync-077d5d4ebc8ffa96264ab3fe1bef6395388b1f92.tar.gz android_external_rsync-077d5d4ebc8ffa96264ab3fe1bef6395388b1f92.tar.bz2 android_external_rsync-077d5d4ebc8ffa96264ab3fe1bef6395388b1f92.zip | |
There's no need for lp_load() to check am_daemon.
Diffstat (limited to 'loadparm.c')
| -rw-r--r-- | loadparm.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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); |