make sure we substitute basic variables in read/write list

(This used to be commit 52bea54d35e7fb32c7ed7b067c13afe53761affb)

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index f9f264c270297b0365eb8b6d8ad52bb3f4f5393e..70126b9e7fc9eed9f32fde4e39fb555906d49541 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -273,7 +273,7 @@ static void set_read_only(connection_struct *conn, gid_t *groups, size_t n_group
 
        str_list_copy(&list, lp_readlist(conn->service));
        if (list) {
-               if (!str_list_substitute(list, "%S", service)) {
+               if ( !str_list_sub_basic(list, current_user_info.smb_name) ) {
                        DEBUG(0, ("ERROR: read list substitution failed\n"));
                }
                if (user_in_list(conn->user, (const char **)list, groups, n_groups))
@@ -283,7 +283,7 @@ static void set_read_only(connection_struct *conn, gid_t *groups, size_t n_group
        
        str_list_copy(&list, lp_writelist(conn->service));
        if (list) {
-               if (!str_list_substitute(list, "%S", service)) {
+               if ( !str_list_sub_basic(list, current_user_info.smb_name) ) {
                        DEBUG(0, ("ERROR: write list substitution failed\n"));
                }
                if (user_in_list(conn->user, (const char **)list, groups, n_groups))