summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-02-06 12:42:29 +1100
committerJeremy Allison <jra@samba.org>2010-02-10 15:43:49 -0800
commit13ac4ad52187df7093904d4ad9c47d51bd1eda6f (patch)
tree286d428d386462271a3ca8686d594cd113c59b46 /source3/smbd
parentaa52a0925d4c07117cc6eb62c6e80eda24f8cc40 (diff)
downloadsamba-13ac4ad52187df7093904d4ad9c47d51bd1eda6f.tar.gz
samba-13ac4ad52187df7093904d4ad9c47d51bd1eda6f.tar.bz2
samba-13ac4ad52187df7093904d4ad9c47d51bd1eda6f.zip
s3-smbd: update to use new DLIST macros
(cherry picked from commit 365b408c458c848a818637d9b36a0423aeb1ba54)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/dir.c7
-rw-r--r--source3/smbd/posix_acls.c4
2 files changed, 5 insertions, 6 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 3fe3218762..b1e9734681 100644
--- 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 7342420a89..2fb7b77c86 100644
--- 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;