summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-03-14 08:27:41 +0000
committerAndrew Tridgell <tridge@samba.org>1998-03-14 08:27:41 +0000
commitb85346942e7d785af718b68d61b208cb457a2b27 (patch)
treeb99ebbcff64702909827dea32cb773a14c469190 /source3/utils
parentbfd5df01a33a7c1674a256add3d703e60b02516f (diff)
downloadsamba-b85346942e7d785af718b68d61b208cb457a2b27.tar.gz
samba-b85346942e7d785af718b68d61b208cb457a2b27.tar.bz2
samba-b85346942e7d785af718b68d61b208cb457a2b27.zip
another makeover of loadparm to support new stuff in swat and
testparm. In particular I added: - ability to optionally save default values of all parameters when calling lp_load(). This can then be used to save only non-default parameters in lp_dump(). This makes the saved smb.conf (and viewed parameters in testparm) much shorter - ability to not load ipc share in lp_load() - separators in parm_table[] so parameters can be grouped logically. - flag to mark parameters that are local but which should be also viewed as global as far as parameters editing is concerned (This used to be commit f9af35da26e58fb0b644b5f0169f1c212230047a)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/nmblookup.c2
-rw-r--r--source3/utils/status.c2
-rw-r--r--source3/utils/testparm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index a73a35cd56..4c9132ee75 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -172,7 +172,7 @@ int main(int argc,char *argv[])
init_structs();
- if (!lp_load(servicesf,True)) {
+ if (!lp_load(servicesf,True,False,False)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
}
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 401dd25c89..7c89ad6d63 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -152,7 +152,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
get_myname(myhostname, NULL);
- if (!lp_load(servicesf,False)) {
+ if (!lp_load(servicesf,False,False,False)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
return (-1);
}
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index a35a3fd71e..0cc76066bb 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -67,7 +67,7 @@ extern pstring myhostname;
return(1);
}
- if (!lp_load(configfile,False))
+ if (!lp_load(configfile,False,True,False))
{
printf("Error loading services.\n");
return(1);