]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Remove dptr_fetch_lanman2() - unused.
authorJeremy Allison <jra@samba.org>
Wed, 17 Jul 2019 20:28:53 +0000 (13:28 -0700)
committerRalph Boehme <slow@samba.org>
Tue, 6 Aug 2019 14:23:35 +0000 (14:23 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/dir.c
source3/smbd/proto.h

index d6512b876638c3c73ea0824949202fdfe94f3180..86fa95c38cd3a51c37e3e0e81d5d91364c429421 100644 (file)
@@ -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;
 }
 
index d371ba9e4dcfa7af4aab174a1b057c731fecbfc3..c1d6b32c06ed6b98fac708e5c9483c4aa30426a7 100644 (file)
@@ -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,