sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3-smbd: update to use new DLIST macros

Browse Source 
(cherry picked from commit 365b408c458c848a818637d9b36a0423aeb1ba54)
This commit is contained in:
Andrew Tridgell 2010-02-06 12:42:29 +11:00 committed by Jeremy Allison
parent aa52a0925d
commit 13ac4ad521
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/smbd/dir.c
View File

@ -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);

4
source3/smbd/posix_acls.c
View File

@ -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;