dovecot: Renamed auth_winbind_helper to auth_winbind_helper_path.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/593d2ab4df0d
changeset: 6182:593d2ab4df0d
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Aug 06 21:21:06 2007 +0300
description:
Renamed auth_winbind_helper to auth_winbind_helper_path.

diffstat:

5 files changed, 9 insertions(+), 8 deletions(-)
dovecot-example.conf         |    2 +-
src/auth/mech-winbind.c      |    6 +++---
src/master/auth-process.c    |    3 ++-
src/master/master-settings.c |    4 ++--
src/master/master-settings.h |    2 +-

diffs (82 lines):

diff -r 18f663e23c28 -r 593d2ab4df0d dovecot-example.conf
--- a/dovecot-example.conf	Mon Aug 06 21:12:51 2007 +0300
+++ b/dovecot-example.conf	Mon Aug 06 21:21:06 2007 +0300
@@ -793,7 +793,7 @@ protocol lda {
 #auth_ntlm_use_winbind = no
 
 # Path for Samba's ntlm_auth helper binary.
-#auth_winbind_helper = /usr/bin/ntlm_auth
+#auth_winbind_helper_path = /usr/bin/ntlm_auth
 
 auth default {
   # Space separated list of wanted authentication mechanisms:
diff -r 18f663e23c28 -r 593d2ab4df0d src/auth/mech-winbind.c
--- a/src/auth/mech-winbind.c	Mon Aug 06 21:12:51 2007 +0300
+++ b/src/auth/mech-winbind.c	Mon Aug 06 21:21:06 2007 +0300
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define DEFAULT_WINBIND_HELPER "/usr/bin/ntlm_auth"
+#define DEFAULT_WINBIND_HELPER_PATH "/usr/bin/ntlm_auth"
 
 enum helper_result {
 	HR_OK	= 0,	/* OK or continue */
@@ -90,9 +90,9 @@ static void winbind_helper_connect(struc
 		    dup2(infd[1], STDOUT_FILENO) < 0)
 			i_fatal("dup2() failed: %m");
 
-		helper_path = getenv("WINBIND_HELPER");
+		helper_path = getenv("WINBIND_HELPER_PATH");
 		if (helper_path == NULL)
-			helper_path = DEFAULT_WINBIND_HELPER;
+			helper_path = DEFAULT_WINBIND_HELPER_PATH;
 
 		args[0] = helper_path;
 		args[1] = winbind->param;
diff -r 18f663e23c28 -r 593d2ab4df0d src/master/auth-process.c
--- a/src/master/auth-process.c	Mon Aug 06 21:12:51 2007 +0300
+++ b/src/master/auth-process.c	Mon Aug 06 21:21:06 2007 +0300
@@ -490,7 +490,8 @@ static void auth_set_environment(struct 
 		env_put(t_strconcat("GSSAPI_HOSTNAME=",
 				    set->gssapi_hostname, NULL));
 	}
-	env_put(t_strconcat("WINBIND_HELPER=", set->winbind_helper, NULL));
+	env_put(t_strconcat("WINBIND_HELPER_PATH=",
+			    set->winbind_helper_path, NULL));
 
 	restrict_process_size(set->process_size, (unsigned int)-1);
 }
diff -r 18f663e23c28 -r 593d2ab4df0d src/master/master-settings.c
--- a/src/master/master-settings.c	Mon Aug 06 21:12:51 2007 +0300
+++ b/src/master/master-settings.c	Mon Aug 06 21:21:06 2007 +0300
@@ -78,7 +78,7 @@ static struct setting_def auth_setting_d
 	DEF_STR(anonymous_username),
 	DEF_STR(krb5_keytab),
 	DEF_STR(gssapi_hostname),
-	DEF_STR(winbind_helper),
+	DEF_STR(winbind_helper_path),
 
 	DEF_BOOL(verbose),
 	DEF_BOOL(debug),
@@ -305,7 +305,7 @@ struct auth_settings default_auth_settin
 	MEMBER(anonymous_username) "anonymous",
 	MEMBER(krb5_keytab) "",
 	MEMBER(gssapi_hostname) "",
-	MEMBER(winbind_helper) "/usr/bin/ntlm_auth",
+	MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth",
 
 	MEMBER(verbose) FALSE,
 	MEMBER(debug) FALSE,
diff -r 18f663e23c28 -r 593d2ab4df0d src/master/master-settings.h
--- a/src/master/master-settings.h	Mon Aug 06 21:12:51 2007 +0300
+++ b/src/master/master-settings.h	Mon Aug 06 21:21:06 2007 +0300
@@ -204,7 +204,7 @@ struct auth_settings {
 	const char *anonymous_username;
 	const char *krb5_keytab;
 	const char *gssapi_hostname;
-	const char *winbind_helper;
+	const char *winbind_helper_path;
 
 	bool verbose, debug, debug_passwords;
 	bool ssl_require_client_cert;