diff options
| author | Simo Sorce <idra@samba.org> | 2002-06-14 16:02:59 +0000 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2002-06-14 16:02:59 +0000 |
| commit | e69fba09846f9bfd1564c4c684bb5d4fc059b02d (patch) | |
| tree | 310c7e9a06c443aadb560a62f60809784db48218 /source3/smbd/password.c | |
| parent | a98d2b1e1788d3207278340330052fc09245e8d2 (diff) | |
| download | samba-e69fba09846f9bfd1564c4c684bb5d4fc059b02d.tar.gz samba-e69fba09846f9bfd1564c4c684bb5d4fc059b02d.tar.bz2 samba-e69fba09846f9bfd1564c4c684bb5d4fc059b02d.zip | |
moved lp_list_* functions away from param/loadparm.c, put int lib/util_str.c
and renamed to str_list_* as it is a better name.
Elrond should be satisfied now :)
(This used to be commit 4ae260adb9505384fcccfb4c9929cb60a45f2e84)
Diffstat (limited to 'source3/smbd/password.c')
| -rw-r--r-- | source3/smbd/password.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c index e50ba4ec1b..b2cf3106cb 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -355,27 +355,27 @@ BOOL user_ok(const char *user,int snum) ret = True; if (lp_invalid_users(snum)) { - lp_list_copy(&invalid, lp_invalid_users(snum)); - if (invalid && lp_list_substitute(invalid, "%S", lp_servicename(snum))) { + str_list_copy(&invalid, lp_invalid_users(snum)); + if (invalid && str_list_substitute(invalid, "%S", lp_servicename(snum))) { ret = !user_in_list(user, invalid); } } - if (invalid) lp_list_free (&invalid); + if (invalid) str_list_free (&invalid); if (ret && lp_valid_users(snum)) { - lp_list_copy(&valid, lp_valid_users(snum)); - if (valid && lp_list_substitute(valid, "%S", lp_servicename(snum))) { + str_list_copy(&valid, lp_valid_users(snum)); + if (valid && str_list_substitute(valid, "%S", lp_servicename(snum))) { ret = user_in_list(user,valid); } } - if (valid) lp_list_free (&valid); + if (valid) str_list_free (&valid); if (ret && lp_onlyuser(snum)) { - char **user_list = lp_list_make (lp_username(snum)); - if (user_list && lp_list_substitute(user_list, "%S", lp_servicename(snum))) { + char **user_list = str_list_make (lp_username(snum)); + if (user_list && str_list_substitute(user_list, "%S", lp_servicename(snum))) { ret = user_in_list(user, user_list); } - if (user_list) lp_list_free (&user_list); + if (user_list) str_list_free (&user_list); } return(ret); |