[Cherokee-commits] [3656] cherokee/branches/newerrors/cherokee: Update LOG_* calls

[SVN at cherokee-project.com]

Revision: 3656
          http://svn.cherokee-project.com/changeset/3656
Author:   alo
Date:     2009-09-11 16:25:56 +0200 (Fri, 11 Sep 2009)

Log Message:
-----------
Update LOG_* calls

Modified Paths:
--------------
    cherokee/branches/newerrors/cherokee/error_list.py
    cherokee/branches/newerrors/cherokee/validator_pam.c

Modified: cherokee/branches/newerrors/cherokee/error_list.py
===================================================================
--- cherokee/branches/newerrors/cherokee/error_list.py	2009-09-11 11:06:22 UTC (rev 3655)
+++ cherokee/branches/newerrors/cherokee/error_list.py	2009-09-11 14:25:56 UTC (rev 3656)
@@ -14,6 +14,21 @@
 
 BROKEN_CONFIG = """The configuration file seems to be broken."""
 
+# cherokee/validator_pam.c
+#
+e('VALIDATOR_PAM_DELAY',
+  title = "Setting pam fail delay failed",
+  desc  = "Cherokee could not configure PAM propertly. Most likely you have found an incompatibiliry issue between Cherokee and your system PAM library.")
+
+e('VALIDATOR_PAM_AUTH',
+  title = "User '%s' - not authenticated: %s",
+  desc  = "(to-do)")
+
+e('VALIDATOR_PAM_ACCOUNT',
+  title = "User '%s' - invalid account: %s",
+  desc  = "(to-do)")
+
+
 # cherokee/validator_ldap.c
 #
 e('VALIDATOR_LDAP_PROPERTY',

Modified: cherokee/branches/newerrors/cherokee/validator_pam.c
===================================================================
--- cherokee/branches/newerrors/cherokee/validator_pam.c	2009-09-11 11:06:22 UTC (rev 3655)
+++ cherokee/branches/newerrors/cherokee/validator_pam.c	2009-09-11 14:25:56 UTC (rev 3656)
@@ -168,7 +168,7 @@
 #ifdef HAVE_PAM_FAIL_DELAY
 	ret = pam_fail_delay (pamhandle, 0);
 	if (ret != PAM_SUCCESS) {
-		LOG_ERROR_S ("Setting pam fail delay failed\n");
+		LOG_ERROR_S (CHEROKEE_ERROR_VALIDATOR_PAM_DELAY);
 
 		conn->error_code = http_internal_error;
 		return ret_error;
@@ -194,7 +194,7 @@
 #endif
 
 	if (ret != PAM_SUCCESS) {
-		LOG_ERROR ("PAM: user '%s' - not authenticated: %s\n",
+		LOG_ERROR (CHEROKEE_ERROR_VALIDATOR_PAM_AUTH,
 			   conn->validator->user.buf,
 			   pam_strerror(pamhandle, ret));
 
@@ -205,7 +205,7 @@
 	 */
 	ret = pam_acct_mgmt (pamhandle, PAM_DISALLOW_NULL_AUTHTOK); 
 	if (ret != PAM_SUCCESS) {
-		LOG_ERROR ("PAM: user '%s' - invalid account: %s\n",
+		LOG_ERROR (CHEROKEE_ERROR_VALIDATOR_PAM_ACCOUNT,
 			   conn->validator->user.buf,
 			   pam_strerror(pamhandle, ret));
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.octality.com/pipermail/cherokee-commits/attachments/20090911/bec404a2/attachment.htm