diff options
author | Wayne Davison <wayned@samba.org> | 2007-10-01 02:25:58 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2007-10-01 02:25:58 +0000 |
commit | d4eba300c9ca263b8d849644ea5d729170e7d49d (patch) | |
tree | a6ae17e51be916fc8fd0425b06b77b0159aefa1a | |
parent | dd589118d0108f78e33ad302df0bc316ce84bf4a (diff) | |
download | android_external_rsync-d4eba300c9ca263b8d849644ea5d729170e7d49d.tar.gz android_external_rsync-d4eba300c9ca263b8d849644ea5d729170e7d49d.tar.bz2 android_external_rsync-d4eba300c9ca263b8d849644ea5d729170e7d49d.zip |
The lp_load() function doesn't fudge the pszFname arg anymore.
-rw-r--r-- | loadparm.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -809,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; @@ -820,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; |