Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When performing a --dry-run, output a "(DRY RUN)" reminder on the
[rsync/rsync.git]
/
loadparm.c
diff --git
a/loadparm.c
b/loadparm.c
index
d9c9d93
..
67ce3be
100644
(file)
--- a/
loadparm.c
+++ b/
loadparm.c
@@
-809,8
+809,6
@@
static BOOL do_section(char *sectionname)
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
{
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
{
- extern int am_server;
- extern int am_root;
pstring n2;
BOOL bRetval;
pstring n2;
BOOL bRetval;
@@
-820,12
+818,7
@@
BOOL lp_load(char *pszFname, int globals_only)
init_globals();
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;
/* We get sections first, so have to start 'behind' to make up */
iServiceIndex = -1;