summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2002-02-20 01:15:54 +0000
committerGeorge Lebl <jirka@src.gnome.org>2002-02-20 01:15:54 +0000
commitad495517750cb5eeac0643af8e952d5087a5f822 (patch)
tree08213536353f9c2b6b3ebb5d2f74e5037b46a67b
parentd9b1bd36a18c84d99b0cf2ecd72644a5f9120015 (diff)
downloadgdm-ad495517750cb5eeac0643af8e952d5087a5f822.tar.gz
fix typo
Tue Feb 19 17:28:11 2002 George Lebl <jirka@5z.com> * gui/gdmconfig.glade: fix typo * gui/gdmlogin.c: increase welcome string limit to 2048 * daemon/verify-pam.c: treat USER_UNKNOWN just like AUTH_ERR
-rw-r--r--ChangeLog8
-rw-r--r--daemon/verify-pam.c3
-rw-r--r--gui/gdmconfig.glade2
-rw-r--r--gui/gdmlogin.c2
4 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dd58e81b..e846494e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Feb 19 17:28:11 2002 George Lebl <jirka@5z.com>
+
+ * gui/gdmconfig.glade: fix typo
+
+ * gui/gdmlogin.c: increase welcome string limit to 2048
+
+ * daemon/verify-pam.c: treat USER_UNKNOWN just like AUTH_ERR
+
2002-02-05 Abel Cheung <maddog@linux.org.hk>
* configure.in (ALL_LINGUAS): zh_CN.GB2312 -> zh_CN
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c
index df56f3cb..53fcedf3 100644
--- a/daemon/verify-pam.c
+++ b/daemon/verify-pam.c
@@ -429,7 +429,8 @@ gdm_verify_user (GdmDisplay *d,
if ( ! error_msg_given &&
gdm_slave_should_complain ()) {
/* I'm not sure yet if I should display this message for any other issues - heeten */
- if (pamerr == PAM_AUTH_ERR) {
+ if (pamerr == PAM_AUTH_ERR ||
+ pamerr == PAM_USER_UNKNOWN) {
/* FIXME: Hmm, how are we sure that the login is username
* and password. That is the most common case but not
* neccessairly true, this message needs to be changed
diff --git a/gui/gdmconfig.glade b/gui/gdmconfig.glade
index 1c4992d5..612d2888 100644
--- a/gui/gdmconfig.glade
+++ b/gui/gdmconfig.glade
@@ -688,7 +688,7 @@
<widget>
<class>GtkCheckButton</class>
<name>quiver</name>
- <tooltip>If the user fails to authenticate himself the login window should Quiver to indicate failiure</tooltip>
+ <tooltip>If the user fails to authenticate himself the login window should Quiver to indicate failure</tooltip>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index c047d894..35319a35 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -539,7 +539,7 @@ gdm_parse_enriched_string (const gchar *s)
return buffer;
}
- if (strlen (s) > 1023) {
+ if (strlen (s) > 2048) {
syslog (LOG_ERR, _("gdm_parse_enriched_string: String too long!"));
g_free (display);
buffer = g_strdup_printf (_("Welcome to %s"), hostname);