[dovecot-cvs] dovecot/src/auth auth.c, 1.31.2.1, 1.31.2.2 auth.h, 1.22.2.1, 1.22.2.2 mech-gssapi.c, 1.5.2.4, 1.5.2.5

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv1095/src/auth

Modified Files:
      Tag: branch_1_0
	auth.c auth.h mech-gssapi.c 
Log Message:
Added auth_gssapi_hostname setting.



Index: auth.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth.c,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -d -r1.31.2.1 -r1.31.2.2
--- auth.c	19 Jan 2007 15:19:29 -0000	1.31.2.1
+++ auth.c	27 Mar 2007 21:41:34 -0000	1.31.2.2
@@ -4,6 +4,7 @@
 #include "network.h"
 #include "buffer.h"
 #include "str.h"
+#include "hostpid.h"
 #include "mech.h"
 #include "userdb.h"
 #include "passdb.h"
@@ -248,6 +249,12 @@
 	if (env != NULL && *env != '\0')
 		auth->username_format = env;
 
+	env = getenv("GSSAPI_HOSTNAME");
+	if (env != NULL && *env != '\0')
+		auth->gssapi_hostname = env;
+	else
+		auth->gssapi_hostname = my_hostname;
+
 	env = getenv("MASTER_USER_SEPARATOR");
 	if (env != NULL)
 		auth->master_user_separator = env[0];

Index: auth.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth.h,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- auth.h	1 Jul 2006 18:40:33 -0000	1.22.2.1
+++ auth.h	27 Mar 2007 21:41:35 -0000	1.22.2.2
@@ -46,6 +46,7 @@
 	const char *default_realm;
 	const char *anonymous_username;
 	const char *username_format;
+	const char *gssapi_hostname;
 	char username_chars[256];
 	char username_translation[256];
 	char master_user_separator;

Index: mech-gssapi.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-gssapi.c,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -d -r1.5.2.4 -r1.5.2.5
--- mech-gssapi.c	11 Mar 2007 21:36:36 -0000	1.5.2.4
+++ mech-gssapi.c	27 Mar 2007 21:41:35 -0000	1.5.2.5
@@ -20,7 +20,6 @@
 #include "buffer.h"
 #include "hex-binary.h"
 #include "safe-memset.h"
-#include "hostpid.h"
 
 #ifdef HAVE_GSSAPI
 
@@ -113,7 +112,7 @@
 	principal_name = t_str_new(128);
 	str_append(principal_name, service_name);
 	str_append_c(principal_name, '@');
-	str_append(principal_name, my_hostname); 
+	str_append(principal_name, request->auth->gssapi_hostname);
 
 	auth_request_log_info(request, "gssapi",
 		"Obtaining credentials for %s", str_c(principal_name));