add Kerberos realm parameter to connection

Author: freddy77

ChangeLog

@@ -1,3 +1,7 @@
+Fri Aug 12 18:38:45 CEST 2011    Frediano Ziglio <freddy77_A_gmail_D_com>
+	* include/tds.h src/tds/config.c src/tds/gssapi.c src/tds/mem.c:
+	- add Kerberos realm parameter to connection
+
 Fri Aug 12 15:49:18 CEST 2011    Frediano Ziglio <freddy77_A_gmail_D_com>
 	* src/odbc/unittests/describecol.c:
 	* src/odbc/unittests/describecol.in:
@@ -751,4 +755,4 @@ Sat Apr  9 16:15:00 EDT 2011	JK Lowden <[email protected]>
 	* ChangeLog-0.91 added because of release
 
 $FreeTDS$
-$Id: ChangeLog,v 1.3377 2011/08/12 13:49:54 freddy77 Exp $
+$Id: ChangeLog,v 1.3378 2011/08/12 16:38:32 freddy77 Exp $

include/tds.h

@@ -21,7 +21,7 @@
 #ifndef _tds_h_
 #define _tds_h_
 
-/* $Id: tds.h,v 1.386 2011/08/10 07:46:08 freddy77 Exp $ */
+/* $Id: tds.h,v 1.387 2011/08/12 16:38:32 freddy77 Exp $ */
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -480,6 +480,8 @@ typedef enum tds_encryption_level {
 #define TDS_STR_ENCRYPTION_REQUIRE "require"
 /* Defines to enable optional GSSAPI delegation */
 #define TDS_GSSAPI_DELEGATION "enable gssapi delegation"
+/* Kerberos realm name */
+#define TDS_STR_REALM	"realm"
 
 
 /* TODO do a better check for alignment than this */
@@ -503,6 +505,7 @@ typedef struct tds_login
 	TDS_INT connect_timeout;
 	DSTR client_host_name;
 	DSTR server_host_name;
+	DSTR server_realm_name;		/**< server realm name (in freetds.conf) */
 	DSTR app_name;
 	DSTR user_name;	    	/**< account for login */
 	DSTR password;	    	/**< password of account login */

src/tds/config.c

@@ -78,7 +78,7 @@
 #include <dmalloc.h>
 #endif
 
-TDS_RCSID(var, "$Id: config.c,v 1.172 2011/07/27 16:28:47 freddy77 Exp $");
+TDS_RCSID(var, "$Id: config.c,v 1.173 2011/08/12 16:38:32 freddy77 Exp $");
 
 static void tds_config_login(TDSLOGIN * connection, TDSLOGIN * login);
 static void tds_config_env_tdsdump(TDSLOGIN * login);
@@ -237,6 +237,7 @@ tds_read_config_info(TDSSOCKET * tds, TDSLOGIN * login, TDSLOCALE * locale)
 		tdsdump_log(TDS_DBG_INFO1, "\t%20s = %d\n", "text_size", connection->text_size);
 		tdsdump_log(TDS_DBG_INFO1, "\t%20s = %d\n", "broken_dates", connection->broken_dates);
 		tdsdump_log(TDS_DBG_INFO1, "\t%20s = %d\n", "emul_little_endian", connection->emul_little_endian);
+		tdsdump_log(TDS_DBG_INFO1, "\t%20s = %s\n", "server_realm_name", tds_dstr_cstr(&connection->server_realm_name));
 
 		tdsdump_close();
 	}
@@ -607,6 +608,8 @@ tds_parse_conf_section(const char *option, const char *value, void *param)
 		tds_dstr_copy(&login->server_name, value);
 	} else if (!strcmp(option, TDS_STR_USENTLMV2)) {
 		login->use_ntlmv2 = tds_config_boolean(value);
+	} else if (!strcmp(option, TDS_STR_REALM)) {
+		tds_dstr_copy(&login->server_realm_name, value);
 	} else {
 		tdsdump_log(TDS_DBG_INFO1, "UNRECOGNIZED option '%s' ... ignoring.\n", option);
 	}

src/tds/gssapi.c

@@ -65,7 +65,7 @@
 #include <dmalloc.h>
 #endif
 
-TDS_RCSID(var, "$Id: gssapi.c,v 1.20 2011/07/09 19:50:17 freddy77 Exp $");
+TDS_RCSID(var, "$Id: gssapi.c,v 1.21 2011/08/12 16:38:32 freddy77 Exp $");
 
 /**
  * \ingroup libtds
@@ -198,9 +198,17 @@ tds_gss_get_auth(TDSSOCKET * tds)
 			server_name = host->h_name;
 	}
 
-	if (asprintf(&auth->sname, "MSSQLSvc/%s:%d", server_name, tds->login->port) < 0) {
-		tds_gss_free(tds, (TDSAUTHENTICATION *) auth);
-		return NULL;
+	if (tds_dstr_isempty(&tds->login->server_realm_name)) {
+		if (asprintf(&auth->sname, "MSSQLSvc/%s:%d", server_name, tds->login->port) < 0) {
+			tds_gss_free(tds, (TDSAUTHENTICATION *) auth);
+			return NULL;
+		}
+	} else {
+		if (asprintf(&auth->sname, "MSSQLSvc/%s:%d@%s", server_name, tds->login->port,
+		             tds_dstr_cstr(&tds->login->server_realm_name)) < 0) {
+			tds_gss_free(tds, (TDSAUTHENTICATION *) auth);
+			return NULL;
+		}
 	}
 	tdsdump_log(TDS_DBG_NETWORK, "using kerberos name %s\n", auth->sname);
 

src/tds/mem.c

@@ -51,7 +51,7 @@
 #include <dmalloc.h>
 #endif
 
-TDS_RCSID(var, "$Id: mem.c,v 1.220 2011/08/08 11:52:10 freddy77 Exp $");
+TDS_RCSID(var, "$Id: mem.c,v 1.221 2011/08/12 16:38:32 freddy77 Exp $");
 
 static void tds_free_env(TDSSOCKET * tds);
 static void tds_free_compute_results(TDSSOCKET * tds);
@@ -806,6 +806,7 @@ tds_alloc_connection(TDSLOCALE * locale)
 	tds_dstr_init(&connection->dump_file);
 	tds_dstr_init(&connection->client_charset);
 	tds_dstr_init(&connection->instance_name);
+	tds_dstr_init(&connection->server_realm_name);
 
 	/* fill in all hardcoded defaults */
 	if (!tds_dstr_copy(&connection->server_name, TDS_DEF_SERVER))
@@ -1020,6 +1021,7 @@ tds_alloc_login(void)
 	tds_dstr_init(&tds_login->password);
 	tds_dstr_init(&tds_login->library);
 	tds_dstr_init(&tds_login->client_charset);
+	tds_dstr_init(&tds_login->server_realm_name);
 
 	if ((s=getenv("DSQUERY")) != NULL)
 		server_name = s;
@@ -1060,6 +1062,7 @@ tds_free_login(TDSLOGIN * login)
 	tds_dstr_free(&login->database);
 	tds_dstr_free(&login->dump_file);
 	tds_dstr_free(&login->instance_name);
+	tds_dstr_init(&login->server_realm_name);
 	free(login);
 }