summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <Brian.Cameron@sun.com>2005-09-29 21:06:52 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-09-29 21:06:52 +0000
commitad1c421ec0390a25d2ad0994d8043d399968407c (patch)
treed1f765ab5b73a140cc5326d1dc3deb4d89f86e1e
parente9a4bcf783bc17120730ecf3344e0f314512552e (diff)
downloadgdm-ad1c421ec0390a25d2ad0994d8043d399968407c.tar.gz
Remove syslog() test that causes needless syslog message when Solaris
2005-09-29 Brian Cameron <Brian.Cameron@sun.com> * daemon/verify-pam.c: Remove syslog() test that causes needless syslog message when Solaris auditing is turned off. * gui/gdmflexiserver.c, gui/greeter/greeter_item_ulist.c: Correct grammar. Corrects bug #317479, thanks to adamw@gnome.org (Adam Weinberger). Note this fixes grammar for added in the previous two commits.
-rw-r--r--ChangeLog10
-rw-r--r--daemon/verify-pam.c6
-rw-r--r--gui/gdmflexiserver.c2
-rw-r--r--gui/greeter/greeter_item_ulist.c2
4 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a4d71048..920aa0e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-29 Brian Cameron <Brian.Cameron@sun.com>
+
+ * daemon/verify-pam.c: Remove syslog() test that causes
+ needless syslog message when Solaris auditing is turned
+ off.
+ * gui/gdmflexiserver.c, gui/greeter/greeter_item_ulist.c:
+ Correct grammar. Corrects bug #317479, thanks to
+ adamw@gnome.org (Adam Weinberger). Note this fixes
+ grammar for added in the previous two commits.
+
2005-09-28 William Jon McCann <mccann@jhu.edu>
* gui/gdmflexiserver.c (is_program_in_path, maybe_lock_screen)
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c
index c423b58a..a8f20418 100644
--- a/daemon/verify-pam.c
+++ b/daemon/verify-pam.c
@@ -284,12 +284,6 @@ audit_logout(void)
{
adt_event_data_t *event; /* event to generate */
- if (adt_ah == NULL) {
-
- syslog(LOG_AUTH | LOG_ALERT,
- "adt_ah(ADT_logout): NULL");
- return;
- }
if ((event = adt_alloc_event(adt_ah, ADT_logout)) == NULL) {
syslog(LOG_AUTH | LOG_ALERT,
diff --git a/gui/gdmflexiserver.c b/gui/gdmflexiserver.c
index 378e268d..0e3ad781 100644
--- a/gui/gdmflexiserver.c
+++ b/gui/gdmflexiserver.c
@@ -694,7 +694,7 @@ struct poptOption options [] = {
{ "no-lock", 'l', POPT_ARG_NONE, &no_lock, 0, N_("Do not lock current screen"), NULL },
{ "debug", 'd', POPT_ARG_NONE, &debug, 0, N_("Debugging output"), NULL },
{ "authenticate", 'a', POPT_ARG_NONE, &authenticate, 0, N_("Authenticate before running --command"), NULL },
- { "startnew", 's', POPT_ARG_NONE, &startnew, 0, N_("Start new flexible session, do not show popup"), NULL },
+ { "startnew", 's', POPT_ARG_NONE, &startnew, 0, N_("Start new flexible session; do not show popup"), NULL },
{ "monte-carlo-pi", 0, POPT_ARG_NONE, &monte_carlo_pi, 0, NULL, NULL },
POPT_AUTOHELP
{ NULL, 0, 0, NULL, 0}
diff --git a/gui/greeter/greeter_item_ulist.c b/gui/greeter/greeter_item_ulist.c
index f0a877be..48999fa7 100644
--- a/gui/greeter/greeter_item_ulist.c
+++ b/gui/greeter/greeter_item_ulist.c
@@ -193,7 +193,7 @@ user_selected (GtkTreeSelection *selection, gpointer data)
fflush (stdout);
} else {
syslog (LOG_WARNING,
- _("Theme broken, must have pam-message label!"));
+ _("Theme broken: must have pam-message label!"));
}
}
}