mirror of
https://github.com/samba-team/samba.git
synced 2025-02-28 01:58:17 +03:00
r10579: str_list_make() can return NULL
(This used to be commit f547ab4644fd1c8ae2e44a25e874abf35e02d986)
This commit is contained in:
parent
40a6f8f2b2
commit
5a1cf98998
@ -163,7 +163,7 @@ static NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
|
|||||||
int i;
|
int i;
|
||||||
const char **workstations = str_list_make(mem_ctx, workstation_list, ",");
|
const char **workstations = str_list_make(mem_ctx, workstation_list, ",");
|
||||||
|
|
||||||
for (i = 0; workstations[i]; i++) {
|
for (i = 0; workstations && workstations[i]; i++) {
|
||||||
DEBUG(10,("sam_account_ok: checking for workstation match '%s' and '%s'\n",
|
DEBUG(10,("sam_account_ok: checking for workstation match '%s' and '%s'\n",
|
||||||
workstations[i], user_info->workstation_name));
|
workstations[i], user_info->workstation_name));
|
||||||
|
|
||||||
|
@ -75,6 +75,9 @@ void set_socket_options(int fd, const char *options)
|
|||||||
const char **options_list = str_list_make(NULL, options, " \t,");
|
const char **options_list = str_list_make(NULL, options, " \t,");
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
|
if (!options_list)
|
||||||
|
return;
|
||||||
|
|
||||||
for (j = 0; options_list[j]; j++) {
|
for (j = 0; options_list[j]; j++) {
|
||||||
const char *tok = options_list[j];
|
const char *tok = options_list[j];
|
||||||
int ret=0,i;
|
int ret=0,i;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user