summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/auth/auth_sam.c2
-rw-r--r--source4/lib/util_sock.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index a6db8ef63d..1df2103eb6 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -163,7 +163,7 @@ static NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
int i;
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",
workstations[i], user_info->workstation_name));
diff --git a/source4/lib/util_sock.c b/source4/lib/util_sock.c
index be968666a7..8a65a27d02 100644
--- a/source4/lib/util_sock.c
+++ b/source4/lib/util_sock.c
@@ -75,6 +75,9 @@ void set_socket_options(int fd, const char *options)
const char **options_list = str_list_make(NULL, options, " \t,");
int j;
+ if (!options_list)
+ return;
+
for (j = 0; options_list[j]; j++) {
const char *tok = options_list[j];
int ret=0,i;