diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index d6512b87663..86fa95c38cd 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -818,25 +818,6 @@ files_struct *dptr_fetch_fsp(struct smbd_server_connection *sconn, return dptr->dir_hnd->fsp; } -/**************************************************************************** - Fetch the dir ptr. -****************************************************************************/ - -struct dptr_struct *dptr_fetch_lanman2(struct smbd_server_connection *sconn, - int dptr_num) -{ - struct dptr_struct *dptr = dptr_get(sconn, dptr_num); - - if (!dptr) { - DEBUG(3,("fetched null dirptr %d\n",dptr_num)); - return(NULL); - } - DEBUG(3,("fetching dirptr %d for path %s\n", - dptr_num, - dptr->smb_dname->base_name)); - return(dptr); -} - /**************************************************************************** Fetch the fsp associated with the dptr_num. ****************************************************************************/ @@ -844,11 +825,13 @@ struct dptr_struct *dptr_fetch_lanman2(struct smbd_server_connection *sconn, files_struct *dptr_fetch_lanman2_fsp(struct smbd_server_connection *sconn, int dptr_num) { - struct dptr_struct *dptr = dptr_fetch_lanman2(sconn, dptr_num); - + struct dptr_struct *dptr = dptr_get(sconn, dptr_num); if (dptr == NULL) { return NULL; } + DBG_NOTICE("fetching dirptr %d for path %s\n", + dptr_num, + dptr->smb_dname->base_name); return dptr->dir_hnd->fsp; } diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index d371ba9e4dc..c1d6b32c06e 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -209,8 +209,6 @@ bool dptr_fill(struct smbd_server_connection *sconn, char *buf1,unsigned int key); files_struct *dptr_fetch_fsp(struct smbd_server_connection *sconn, char *buf,int *num); -struct dptr_struct *dptr_fetch_lanman2(struct smbd_server_connection *sconn, - int dptr_num); files_struct *dptr_fetch_lanman2_fsp(struct smbd_server_connection *sconn, int dptr_num); bool get_dir_entry(TALLOC_CTX *ctx,