diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-06 18:53:00 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-06 18:53:00 -0800 |
| commit | 8b4b5c3a92be83e99d9177b04f0da56f610025de (patch) | |
| tree | 7ee4a9729d64a7eb52db84c01b4bb65d7fd4c252 /source3/smbd | |
| parent | 2c5a9f0a57774b861439390ab86b48c3f0475af8 (diff) | |
| download | samba-8b4b5c3a92be83e99d9177b04f0da56f610025de.tar.gz samba-8b4b5c3a92be83e99d9177b04f0da56f610025de.tar.bz2 samba-8b4b5c3a92be83e99d9177b04f0da56f610025de.zip | |
Add wrapper str_list_make_v3() to replace the old S3 behavior of
str_list_make(). From Dan Sledz <dan.sledz@isilon.com>:
In samba 3.2 passing NULL or an empty string returned NULL.
In master, it now returns a list of length 1 with the first string set
to NULL (an empty list).
Jeremy.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/map_username.c | 2 | ||||
| -rw-r--r-- | source3/smbd/password.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/map_username.c b/source3/smbd/map_username.c index a8899dd538..f549f0c9f3 100644 --- a/source3/smbd/map_username.c +++ b/source3/smbd/map_username.c @@ -178,7 +178,7 @@ bool map_username(fstring user) /* skip lines like 'user = ' */ - dosuserlist = str_list_make(talloc_tos(), dosname, NULL); + dosuserlist = str_list_make_v3(talloc_tos(), dosname, NULL); if (!dosuserlist) { DEBUG(0,("Bad username map entry. Unable to build user list. Ignoring.\n")); continue; diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 88e7b766be..84b40f28cc 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -576,7 +576,7 @@ static bool user_ok(const char *user, int snum) TALLOC_FREE(valid); if (ret && lp_onlyuser(snum)) { - char **user_list = str_list_make( + char **user_list = str_list_make_v3( talloc_tos(), lp_username(snum), NULL); if (user_list && str_list_substitute(user_list, "%S", |