s3-smbd: update to use new DLIST macros

(cherry picked from commit 365b408c458c848a818637d9b36a0423aeb1ba54)

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 3fe32187623cfa6668ac9a4562c31b8ea0865029..b1e9734681eb5371df887b93460fd963ecdf04ac 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -153,8 +153,7 @@ static void dptr_idleoldest(struct smbd_server_connection *sconn)
        /*
         * Go to the end of the list.
         */
-       for(dptr = sconn->smb1.searches.dirptrs; dptr && dptr->next; dptr = dptr->next)
-               ;
+       dptr = DLIST_TAIL(sconn->smb1.searches.dirptrs);
 
        if(!dptr) {
                DEBUG(0,("No dptrs available to idle ?\n"));
@@ -165,7 +164,7 @@ static void dptr_idleoldest(struct smbd_server_connection *sconn)
         * Idle the oldest pointer.
         */
 
-       for(; dptr; dptr = dptr->prev) {
+       for(; dptr; dptr = DLIST_PREV(dptr)) {
                if (dptr->dir_hnd) {
                        dptr_idle(dptr);
                        return;
@@ -394,7 +393,7 @@ static void dptr_close_oldest(struct smbd_server_connection *sconn,
         * one of the new dnum handles.
         */
 
-       for(; dptr; dptr = dptr->prev) {
+       for(; dptr; dptr = DLIST_PREV(dptr)) {
                if ((old && (dptr->dnum < 256) && !dptr->expect_close) ||
                        (!old && (dptr->dnum > 255))) {
                                dptr_close_internal(dptr);

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 7342420a8998c3a7a64b5239926e225be18b451b..2fb7b77c861fb78fca187f57e93242f9dad50183 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2094,11 +2094,11 @@ static void process_deny_list( canon_ace **pp_ace_list )
                         * list at this point including this entry.
                         */
 
-                       canon_ace *prev_entry = curr_ace->prev;
+                       canon_ace *prev_entry = DLIST_PREV(curr_ace);
 
                        free_canon_ace_list( curr_ace );
                        if (prev_entry)
-                               prev_entry->next = NULL;
+                               DLIST_REMOVE(ace_list, prev_entry);
                        else {
                                /* We deleted the entire list. */
                                ace_list = NULL;