diff options
Diffstat (limited to 'source4/utils')
| -rw-r--r-- | source4/utils/config.mk | 6 | ||||
| -rw-r--r-- | source4/utils/nmblookup.c | 2 | ||||
| -rw-r--r-- | source4/utils/testparm.c | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/source4/utils/config.mk b/source4/utils/config.mk index 6ef7e40471..9ebfbbb7e3 100644 --- a/source4/utils/config.mk +++ b/source4/utils/config.mk @@ -17,14 +17,14 @@ PRIVATE_DEPENDENCIES = \ auth \ MESSAGING \ LIBEVENTS -MANPAGE = man/ntlm_auth.1 # End BINARY ntlm_auth ################################# +MANPAGES += utils/man/ntlm_auth.1 + ################################# # Start BINARY getntacl [BINARY::getntacl] -MANPAGE = man/getntacl.1 INSTALLDIR = BINDIR OBJ_FILES = \ getntacl.o @@ -38,6 +38,8 @@ PRIVATE_DEPENDENCIES = \ # End BINARY getntacl ################################# +MANPAGES += utils/man/getntacl.1 + ################################# # Start BINARY setntacl [BINARY::setntacl] diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c index 7eae9c7765..fe03e0dbbe 100644 --- a/source4/utils/nmblookup.c +++ b/source4/utils/nmblookup.c @@ -211,7 +211,7 @@ static bool process_one(struct loadparm_context *lp_ctx, node_name = talloc_strdup(tmp_ctx, name); } - nbtsock = nbt_name_socket_init(tmp_ctx, NULL); + nbtsock = nbt_name_socket_init(tmp_ctx, NULL, lp_iconv_convenience(lp_ctx)); if (options.root_port) { all_zero_addr = socket_address_from_strings(tmp_ctx, nbtsock->sock->backend_name, diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c index a4ff522186..286a4a61fb 100644 --- a/source4/utils/testparm.c +++ b/source4/utils/testparm.c @@ -93,8 +93,8 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c for (s=0;s<lp_numservices(lp_ctx);s++) { struct loadparm_service *service = lp_servicebynum(lp_ctx, s); if (service != NULL) { - const char **deny_list = lp_hostsdeny(service); - const char **allow_list = lp_hostsallow(service); + const char **deny_list = lp_hostsdeny(service, lp_default_service(lp_ctx)); + const char **allow_list = lp_hostsallow(service, lp_default_service(lp_ctx)); int i; if(deny_list) { for (i=0; deny_list[i]; i++) { @@ -139,7 +139,7 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c return(1); } if (!parameter_name) { - lp_dump_one(stdout, show_defaults, service); + lp_dump_one(stdout, show_defaults, service, lp_default_service(lp_ctx)); } else { ret = !lp_dump_a_parameter(lp_ctx, service, parameter_name, stdout); } @@ -154,8 +154,8 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c for (s=0;s<lp_numservices(lp_ctx);s++) { struct loadparm_service *service = lp_servicebynum(lp_ctx, s); if (service != NULL) { - if (allow_access(NULL, lp_hostsdeny(NULL), lp_hostsallow(NULL), cname, caddr) - && allow_access(NULL, lp_hostsdeny(service), lp_hostsallow(service), cname, caddr)) { + if (allow_access(NULL, lp_hostsdeny(NULL, lp_default_service(lp_ctx)), lp_hostsallow(NULL, lp_default_service(lp_ctx)), cname, caddr) + && allow_access(NULL, lp_hostsdeny(service, lp_default_service(lp_ctx)), lp_hostsallow(service, lp_default_service(lp_ctx)), cname, caddr)) { fprintf(stderr,"Allow connection from %s (%s) to %s\n", cname,caddr,lp_servicename(service)); } else { |