2 files changed, 15 insertions, 15 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);
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 32ceb63154..af70e7839e 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -266,24 +266,24 @@ static void set_read_only(connection_struct *conn)
 
 	if (!service) return;
 
-	lp_list_copy(&list, lp_readlist(conn->service));
+	str_list_copy(&list, lp_readlist(conn->service));
 	if (list) {
-		if (!lp_list_substitute(list, "%S", service)) {
+		if (!str_list_substitute(list, "%S", service)) {
 			DEBUG(0, ("ERROR: read list substitution failed\n"));
 		}
 		if (user_in_list(conn->user, list))
 			conn->read_only = True;
-		lp_list_free(&list);
+		str_list_free(&list);
 	}
 	
-	lp_list_copy(&list, lp_writelist(conn->service));
+	str_list_copy(&list, lp_writelist(conn->service));
 	if (list) {
-		if (!lp_list_substitute(list, "%S", service)) {
+		if (!str_list_substitute(list, "%S", service)) {
 			DEBUG(0, ("ERROR: write list substitution failed\n"));
 		}
 		if (user_in_list(conn->user, list))
 			conn->read_only = False;
-		lp_list_free(&list);
+		str_list_free(&list);
 	}
 }