diff options
| author | Michael Adam <obnox@samba.org> | 2007-12-31 03:55:22 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2007-12-31 03:55:22 +0100 |
| commit | 4c7ef1c03e81f45270fddc4bd59f837d52bc34d8 (patch) | |
| tree | 3ec3534726294d40a384eac31d0308d54cdc7999 | |
| parent | feb4d82724657c5567d9ebefef7242a2a48496e2 (diff) | |
| download | samba-4c7ef1c03e81f45270fddc4bd59f837d52bc34d8.tar.gz samba-4c7ef1c03e81f45270fddc4bd59f837d52bc34d8.tar.bz2 samba-4c7ef1c03e81f45270fddc4bd59f837d52bc34d8.zip | |
Make grouping in if statement more explicit.
Michael
(This used to be commit a1bb47695a7fb21af239aa9d02537d3de2fea325)
| -rw-r--r-- | source3/utils/net_conf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 1882567d8b..07eb3b890f 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -217,9 +217,11 @@ static int import_process_service(TALLOC_CTX *ctx, while ((parm = lp_next_parameter(share->service, &pnum, 0))) { - if ((share->service < 0 && parm->p_class == P_LOCAL) + if ((share->service < 0) && (parm->p_class == P_LOCAL) && !(parm->flags & FLAG_GLOBAL)) + { continue; + } valstr = parm_valstr(tmp_ctx, parm, share); |