CVE-2017-2619: s3: smbd: Create wrapper function for OpenDir in preparation for makin...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12496

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 3c6f00096fa829bb96d44a1d6a4373800fb10120..b22d92d7ba9d0a101442629eee2c9b741201bfa9 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1630,7 +1630,8 @@ static int smb_Dir_destructor(struct smb_Dir *dirp)
  Open a directory.
 ********************************************************************/
 
-struct smb_Dir *OpenDir(TALLOC_CTX *mem_ctx, connection_struct *conn,
+static struct smb_Dir *OpenDir_internal(TALLOC_CTX *mem_ctx,
+                       connection_struct *conn,
                        const struct smb_filename *smb_dname,
                        const char *mask,
                        uint32_t attr)
@@ -1672,6 +1673,18 @@ struct smb_Dir *OpenDir(TALLOC_CTX *mem_ctx, connection_struct *conn,
        return NULL;
 }
 
+struct smb_Dir *OpenDir(TALLOC_CTX *mem_ctx, connection_struct *conn,
+                       const struct smb_filename *smb_dname,
+                       const char *mask,
+                       uint32_t attr)
+{
+       return OpenDir_internal(mem_ctx,
+                               conn,
+                               smb_dname,
+                               mask,
+                               attr);
+}
+
 /*******************************************************************
  Open a directory from an fsp.
 ********************************************************************/