From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 30 Sep 2007 01:22:54 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
X-Git-Tag: 1.0~33^2
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=e6cfb6cbeaa6be87ae81c3e377b17c11dabb3df7;hp=4e38a36ebdfaf9d928f08dba7a0d68a844ae7f29

Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
---

diff --git a/daemon/auth-pam.c b/daemon/auth-pam.c
index 7e51383..35b0a05 100644
--- a/daemon/auth-pam.c
+++ b/daemon/auth-pam.c
@@ -171,9 +171,9 @@ static int inithandle(struct authhandle *auth, char *username)
     data = newpamdata();
     conv.conv = (int (*)(int, const struct pam_message **, struct pam_response **, void *))pamconv;
     conv.appdata_ptr = auth;
-    if((buf = icwcstombs(confgetstr("auth", "pamserv"), NULL)) == NULL)
+    if((buf = icwcstombs(confgetstr("auth-pam", "pamserv"), NULL)) == NULL)
     {
-	flog(LOG_ERR, "could not initialize pam since auth.pamserv cannot be translated into the current locale: %s", strerror(errno));
+	flog(LOG_ERR, "could not initialize pam since auth-pam.pamserv cannot be translated into the current locale: %s", strerror(errno));
 	releasepam(data);
 	return(1);
     }