diff --git a/hdfs_connection.c b/hdfs_connection.c
index a5e9300..84185e1 100644
--- a/hdfs_connection.c
+++ b/hdfs_connection.c
@@ -37,6 +37,7 @@ hdfs_get_connection(ForeignServer *server, UserMapping *user, hdfs_opt *opt)
 							opt->password,
 							opt->connect_timeout,
 							opt->receive_timeout,
+							opt->auth_type,
 							&err_buf);
 	if (conn < 0)
 		ereport(ERROR,
diff --git a/hdfs_fdw.h b/hdfs_fdw.h
index bdd3a60..0c9febd 100644
--- a/hdfs_fdw.h
+++ b/hdfs_fdw.h
@@ -71,6 +71,7 @@ typedef struct hdfs_opt
 	char           *dbname;           /* HDFS database name */
 	char           *table_name;       /* HDFS table name */
 	CLIENT_TYPE    client_type;
+	AUTH_TYPE      auth_type;
 	bool           use_remote_estimate;
 	int            connect_timeout;
 	int            receive_timeout;
diff --git a/hdfs_option.c b/hdfs_option.c
index 3c75798..a884c83 100644
--- a/hdfs_option.c
+++ b/hdfs_option.c
@@ -70,6 +70,7 @@ static struct HDFSFdwOption valid_options[] =
 	{ "dbname",              ForeignTableRelationId },
 	{ "table_name",          ForeignTableRelationId },
 	{ "client_type",         ForeignServerRelationId },
+	{ "auth_type",           ForeignServerRelationId },
 	{ "use_remote_estimate", ForeignServerRelationId },
 	{ "query_timeout",       ForeignServerRelationId },
 	{ "connect_timeout",     ForeignServerRelationId },
@@ -183,6 +184,8 @@ hdfs_get_options(Oid foreigntableid)
 	/* Set default clinet type to HiverServer2 */
 	opt->client_type = HIVESERVER2;
 
+	opt->auth_type = AUTH_TYPE_UNSPECIFIED;
+
 	/* Loop through the options, and get the server/port */
 	foreach(lc, options)
 	{
@@ -221,6 +224,22 @@ hdfs_get_options(Oid foreigntableid)
 							errhint("Valid client_type is hiveserver2, this option will be deprecated soon")));
 		}
 
+		if (strcmp(def->defname, "auth_type") == 0)
+		{
+			if (strcasecmp(defGetString(def), "NOSASL") == 0)
+				opt->auth_type = AUTH_TYPE_NOSASL;
+			else
+			{
+				if (strcasecmp(defGetString(def), "LDAP") == 0)
+					opt->auth_type = AUTH_TYPE_LDAP;
+				else
+					ereport(ERROR,
+						(errcode(ERRCODE_FDW_INVALID_OPTION_NAME),
+							errmsg("invalid option \"%s\"", defGetString(def)),
+								errhint("Valid auth_type are NOSASL & LDAP")));
+			}
+		}
+
 		if (strcmp(def->defname, "use_remote_estimate") == 0)
 			opt->use_remote_estimate = defGetBoolean(def);
 
diff --git a/libhive/jdbc/HiveJdbcClient.java b/libhive/jdbc/HiveJdbcClient.java
index 6c7fd99..14162aa 100644
--- a/libhive/jdbc/HiveJdbcClient.java
+++ b/libhive/jdbc/HiveJdbcClient.java
@@ -34,6 +34,11 @@
 public class HiveJdbcClient
 {
 	private static String		m_driverName = "org.apache.hive.jdbc.HiveDriver";
+
+	private static final int	m_authTypeUnspecified = 0;
+	private static final int	m_authTypeNoSasl = 1;
+	private static final int	m_authTypeLDAP = 2;
+
 	private int					m_queryTimeout = 0;
 	private boolean				m_isDebug = false;
 	private int					m_nestingLimit = 100;
@@ -72,11 +77,11 @@ public int FindFreeSlot()
 		return (-1);
 	}
 
-	/* singature will be (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IILMsgBuf;)I */
+	/* singature will be (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIILMsgBuf;)I */
 	public int DBOpenConnection(String host, int port, String databaseName,
 								String userName, String password,
 								int connectTimeout, int receiveTimeout,
-								MsgBuf errBuf)
+								int authType, MsgBuf errBuf)
 	{
 		int index;
 		String hst;
@@ -165,14 +170,58 @@ public int DBOpenConnection(String host, int port, String databaseName,
 
 		try
 		{
-			if (userName == null || userName.equals(""))
+			switch (authType)
 			{
-				conURL += ";auth=noSasl";
-				m_hdfsConnection[index] = DriverManager.getConnection(conURL, "userName", "password");
-			}
-			else
-			{
-				m_hdfsConnection[index] = DriverManager.getConnection(conURL, userName, password);
+				case m_authTypeUnspecified:
+					if (userName == null || userName.equals(""))
+					{
+						conURL += ";auth=noSasl";
+						m_hdfsConnection[index] = DriverManager.getConnection(conURL, "userName", "password");
+					}
+					else
+					{
+						m_hdfsConnection[index] = DriverManager.getConnection(conURL, userName, password);
+					}
+					break;
+
+				case m_authTypeNoSasl:
+					conURL += ";auth=noSasl";
+					if (userName == null || userName.equals(""))
+					{
+						errBuf.catVal("ERROR : A valid user name is required");
+						m_isFree[index] = true;
+						return (-3);
+					}
+					else
+					{
+						m_hdfsConnection[index] = DriverManager.getConnection(conURL, userName, password);
+					}
+					break;
+
+				case m_authTypeLDAP:
+					if (userName == null || userName.equals(""))
+					{
+						errBuf.catVal("ERROR : A valid user name is required");
+						m_isFree[index] = true;
+						return (-4);
+					}
+					else
+					{
+						m_hdfsConnection[index] = DriverManager.getConnection(conURL, userName, password);
+					}
+					break;
+
+				default:
+					if (userName == null || userName.equals(""))
+					{
+						conURL += ";auth=noSasl";
+						m_hdfsConnection[index] = DriverManager.getConnection(conURL, "userName", "password");
+					}
+					else
+					{
+						m_hdfsConnection[index] = DriverManager.getConnection(conURL, userName, password);
+					}
+					break;
 			}
 		}
 		catch (SQLException ex)
@@ -183,7 +232,7 @@ public int DBOpenConnection(String host, int port, String databaseName,
 			errBuf.catVal(DriverManager.getLoginTimeout());
 			errBuf.catVal(" seconds");
 			m_isFree[index] = true;
-			return (-3);
+			return (-5);
 		}
 
 		m_host[index].resetVal();
diff --git a/libhive/jdbc/hiveclient.cpp b/libhive/jdbc/hiveclient.cpp
index bf89edf..452d4bd 100644
--- a/libhive/jdbc/hiveclient.cpp
+++ b/libhive/jdbc/hiveclient.cpp
@@ -169,7 +169,7 @@ int Initialize()
 	}
 
 	g_DBOpenConnection = g_jni->GetMethodID(g_clsJdbcClient, "DBOpenConnection",
-				"(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IILMsgBuf;)I");
+				"(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIILMsgBuf;)I");
 	if (g_DBOpenConnection == NULL)
 	{
 		g_jvm->DestroyJavaVM();
@@ -255,7 +255,7 @@ int Destroy()
 int DBOpenConnection(char *host, int port, char *databaseName,
 					char *username, char *password,
 					int connectTimeout, int receiveTimeout,
-					char **errBuf)
+					AUTH_TYPE auth_type, char **errBuf)
 {
 	int rc;
 	jstring rv;
@@ -276,6 +276,7 @@ int DBOpenConnection(char *host, int port, char *databaseName,
 							g_jni->NewStringUTF(password),
 							connectTimeout,
 							receiveTimeout,
+							auth_type,
 							g_objMsgBuf);
 
 	rv = (jstring)g_jni->CallObjectMethod(g_objMsgBuf, g_getVal);
diff --git a/libhive/jdbc/hiveclient.h b/libhive/jdbc/hiveclient.h
index 45f3978..9e74006 100644
--- a/libhive/jdbc/hiveclient.h
+++ b/libhive/jdbc/hiveclient.h
@@ -38,6 +38,13 @@ typedef enum HIVE_SERVER_TYPE {
   HIVE_SERVER2 =  1
 } HIVE_SERVER_TYPE;
 
+typedef enum AUTH_TYPE
+{
+	AUTH_TYPE_UNSPECIFIED = 0,
+	AUTH_TYPE_NOSASL,
+	AUTH_TYPE_LDAP
+} AUTH_TYPE;
+
 /******************************************************************************
  * Global Hive Client Functions (usable as C callback functions)
  *****************************************************************************/
@@ -85,7 +92,7 @@ int Destroy(void);
 int DBOpenConnection(char *host, int port, char *databaseName,
 					char *username, char *password,
 					int connectTimeout, int receiveTimeout,
-					char **errBuf);
+					AUTH_TYPE auth_type, char **errBuf);
 
 /**
  * @brief Disconnect from a Hive database.