Mercurial > dovecot > original-hg > dovecot-1.2

changeset 5263:8384f797c0fc HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PAM service name supports variables now.
author Timo Sirainen <tss@iki.fi>
date Sat, 10 Mar 2007 16:14:47 +0200
parents bf40ec268264
children 169b5e67d307
files dovecot-example.conf src/auth/passdb-pam.c
diffstat 2 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/dovecot-example.conf	Sat Mar 10 16:09:02 2007 +0200
+++ b/dovecot-example.conf	Sat Mar 10 16:14:47 2007 +0200
@@ -811,11 +811,11 @@
     #   %u%r - Username and remote IP address must match.
     #   %u%s - Username and service (ie. IMAP, POP3) must match.
     # 
-    # If service name is "*", it means the authenticating service name
-    # is used, eg. pop3 or imap (/etc/pam.d/pop3, /etc/pam.d/imap).
+    # The service name can contain variables, for example %Ls expands to
+    # pop3 or imap.
     #
     # Some examples:
-    #   args = session=yes *
+    #   args = session=yes %Ls
     #   args = cache_key=%u dovecot
     #args = dovecot
   }
--- a/src/auth/passdb-pam.c	Sat Mar 10 16:09:02 2007 +0200
+++ b/src/auth/passdb-pam.c	Sat Mar 10 16:14:47 2007 +0200
@@ -15,6 +15,8 @@
 #include "buffer.h"
 #include "ioloop.h"
 #include "hash.h"
+#include "str.h"
+#include "var-expand.h"
 #include "network.h"
 #include "passdb.h"
 #include "mycrypt.h"
@@ -424,12 +426,16 @@
         struct pam_passdb_module *module = (struct pam_passdb_module *)_module;
         struct pam_auth_request *pam_auth_request;
 	enum passdb_result result;
+	string_t *expanded_service;
 	const char *service;
 	int fd[2];
 	pid_t pid;
 
-	service = module->service_name != NULL ?
-		module->service_name : request->service;
+	expanded_service = t_str_new(64);
+	var_expand(expanded_service, module->service_name,
+		   auth_request_get_var_expand_table(request, NULL));
+	service = str_c(expanded_service);
+
 	auth_request_log_debug(request, "pam", "lookup service=%s", service);
 
 	if (worker) {
@@ -505,7 +511,8 @@
 		} else if (strcmp(t_args[i], "blocking=yes") == 0) {
 			module->module.blocking = TRUE;
 		} else if (strcmp(t_args[i], "*") == 0) {
-			module->service_name = NULL;
+			/* for backwards compatibility */
+			module->service_name = "%s";
 		} else if (t_args[i+1] == NULL) {
 			if (*t_args[i] != '\0') {
 				module->service_name =