BOOL ignore_errors;
BOOL ignore_nonreadable;
BOOL list;
+ BOOL munge_symlinks;
BOOL read_only;
BOOL strict_modes;
BOOL transfer_logging;
/* ignore_errors; */ False,
/* ignore_nonreadable; */ False,
/* list; */ True,
+ /* munge_symlinks; */ (BOOL)-1,
/* read_only; */ True,
/* strict_modes; */ True,
/* transfer_logging; */ False,
{"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL,0},
{"max connections", P_INTEGER,P_LOCAL, &sDefault.max_connections, NULL,0},
{"max verbosity", P_INTEGER,P_LOCAL, &sDefault.max_verbosity, NULL,0},
+ {"munge symlinks", P_BOOL, P_LOCAL, &sDefault.munge_symlinks, NULL,0},
{"name", P_STRING, P_LOCAL, &sDefault.name, NULL,0},
{"outgoing chmod", P_STRING, P_LOCAL, &sDefault.outgoing_chmod, NULL,0},
{"path", P_PATH, P_LOCAL, &sDefault.path, NULL,0},
FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_BOOL(lp_list, list)
+FN_LOCAL_BOOL(lp_munge_symlinks, munge_symlinks)
FN_LOCAL_BOOL(lp_read_only, read_only)
FN_LOCAL_BOOL(lp_strict_modes, strict_modes)
FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
if (strwicmp(parm_table[iIndex].label, parmname) == 0)
return(iIndex);
- rprintf(FERROR, "Unknown Parameter encountered: \"%s\"\n", parmname);
+ rprintf(FLOG, "Unknown Parameter encountered: \"%s\"\n", parmname);
return(-1);
}
*pb = False;
else
{
- rprintf(FERROR, "Badly formed boolean in configuration file: \"%s\".\n",
+ rprintf(FLOG, "Badly formed boolean in configuration file: \"%s\".\n",
parmvalue);
bRetval = False;
}
if (parmnum < 0)
{
- rprintf(FERROR, "IGNORING unknown parameter \"%s\"\n", parmname);
+ rprintf(FLOG, "IGNORING unknown parameter \"%s\"\n", parmname);
return(True);
}
parm_ptr = def_ptr;
} else {
if (parm_table[parmnum].class == P_GLOBAL) {
- rprintf(FERROR, "Global parameter %s found in service section!\n",parmname);
+ rprintf(FLOG, "Global parameter %s found in service section!\n",parmname);
return(True);
}
parm_ptr = ((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,&sDefault);
return(True);
}
+ if (strchr(sectionname, '/') != NULL) {
+ rprintf(FLOG, "Warning: invalid section name in configuration file: %s\n", sectionname);
+ return False;
+ }
+
/* if we have a current service, tidy it up before moving on */
bRetval = True;
if ((iServiceIndex=add_a_service(&sDefault,sectionname)) < 0)
{
- rprintf(FERROR,"Failed to add a new service\n");
+ rprintf(FLOG, "Failed to add a new service\n");
return(False);
}
}