diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-09-29 02:40:09 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-09-29 02:40:09 +0000 |
| commit | fbb85e4b422f0f48f31e10025aa293ffacc53178 (patch) | |
| tree | e648f1e7b05405d8142f84c49a8611a0492a99c1 | |
| parent | b777c1626f6583d5687a9fb6c5c776df8c524bcf (diff) | |
| download | samba-fbb85e4b422f0f48f31e10025aa293ffacc53178.tar.gz samba-fbb85e4b422f0f48f31e10025aa293ffacc53178.tar.bz2 samba-fbb85e4b422f0f48f31e10025aa293ffacc53178.zip | |
Testparm fixes:
- Also check global 'hosts allow'/'hosts deny' when checking access to share
- Warn when user specifies 2 arguments instead of 1 or 3.
Patch from Jay Fenlason <fenlason@redhat.com>
(This used to be commit 034fe96f9c3d3328bc69ef328f10690336dc35b0)
| -rw-r--r-- | source3/utils/testparm.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 34c25480d9..085156305b 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -226,7 +226,12 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_ cname = poptGetArg(pc); caddr = poptGetArg(pc); - + + if ( cname && ! caddr ) { + printf ( "ERROR: You must specify both a machine name and an IP address.\n" ); + return(1); + } + if (new_local_machine) { set_local_machine_name(new_local_machine, True); } @@ -346,8 +351,9 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_ if(cname && caddr){ /* this is totally ugly, a real `quick' hack */ for (s=0;s<1000;s++) { - if (VALID_SNUM(s)) { - if (allow_access(lp_hostsdeny(s), lp_hostsallow(s), cname, caddr)) { + if (VALID_SNUM(s)) { + if (allow_access(lp_hostsdeny(-1), lp_hostsallow(-1), cname, caddr) + && allow_access(lp_hostsdeny(s), lp_hostsallow(s), cname, caddr)) { printf("Allow connection from %s (%s) to %s\n", cname,caddr,lp_servicename(s)); } else { |