rpms/gdm/devel gdm-2.15.6-wtmp.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 17 18:22:21 UTC 2006
Author: rstrode
Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21611
Modified Files:
gdm-2.15.6-wtmp.patch
Log Message:
update wtmp patch to actually apply
gdm-2.15.6-wtmp.patch:
config/PreSession.in | 13 ----
daemon/slave.c | 21 +++++++-
daemon/verify-pam.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++
daemon/verify.h | 13 ++++
4 files changed, 166 insertions(+), 14 deletions(-)
Index: gdm-2.15.6-wtmp.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-wtmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.6-wtmp.patch 17 Jul 2006 03:09:48 -0000 1.1
+++ gdm-2.15.6-wtmp.patch 17 Jul 2006 18:22:19 -0000 1.2
@@ -1,5 +1,5 @@
---- gdm-2.15.6/config/PreSession.in
-+++ gdm-2.15.6/config/PreSession.in
+--- gdm-2.15.6/config/PreSession.in.wtmp 2006-04-27 03:06:05.000000000 +0200
++++ gdm-2.15.6/config/PreSession.in 2006-07-17 14:19:38.000000000 +0200
@@ -68,17 +68,4 @@ if [ "x$XSETROOT" != "x" ] ; then
"$XSETROOT" -cursor_name left_ptr -solid "$BACKCOLOR"
fi
@@ -18,9 +18,9 @@
-# some output for easy debugging
-echo "$0: could not find the sessreg utility, cannot update wtmp and utmp"
exit 0
---- gdm-2.15.6/daemon/slave.c
-+++ gdm-2.15.6/daemon/slave.c
-@@ -4315,6 +4315,14 @@ gdm_slave_session_start (void)
+--- gdm-2.15.6/daemon/slave.c.wtmp 2006-07-17 14:19:38.000000000 +0200
++++ gdm-2.15.6/daemon/slave.c 2006-07-17 14:19:38.000000000 +0200
+@@ -4317,6 +4317,14 @@ gdm_slave_session_start (void)
g_free (language);
g_free (gnome_session);
@@ -35,7 +35,7 @@
gdm_slave_send_num (GDM_SOP_SESSPID, pid);
gdm_sigchld_block_push ();
-@@ -4363,6 +4371,17 @@ gdm_slave_session_start (void)
+@@ -4365,6 +4373,17 @@ gdm_slave_session_start (void)
uid, gid);
}
@@ -53,7 +53,7 @@
gdm_slave_session_stop (pid != 0 /* run_post_session */,
FALSE /* no_shutdown_check */);
-@@ -4724,7 +4743,7 @@ gdm_slave_child_handler (int sig)
+@@ -4723,7 +4742,7 @@ gdm_slave_child_handler (int sig)
}
} else if (pid != 0 && pid == d->sesspid) {
d->sesspid = 0;
@@ -62,20 +62,48 @@
d->last_sess_status = WEXITSTATUS (status);
else
d->last_sess_status = -1;
---- gdm-2.15.6/daemon/verify-pam.c
-+++ gdm-2.15.6/daemon/verify-pam.c
-@@ -30,6 +30,8 @@ #ifdef sun
+--- gdm-2.15.6/daemon/verify.h.wtmp 2005-11-04 01:51:21.000000000 +0100
++++ gdm-2.15.6/daemon/verify.h 2006-07-17 14:19:38.000000000 +0200
+@@ -21,6 +21,12 @@
+
+ #include "gdm.h"
+
++typedef enum {
++ GDM_VERIFY_RECORD_TYPE_LOGIN,
++ GDM_VERIFY_RECORD_TYPE_LOGOUT,
++ GDM_VERIFY_RECORD_TYPE_FAILED_ATTEMPT
++} GdmVerifyRecordType;
++
+ /* If username is NULL, we ask, if local is FALSE, don't start
+ * the timed login timer */
+ gchar *gdm_verify_user (GdmDisplay *d,
+@@ -30,6 +36,13 @@ gchar *gdm_verify_user (GdmDisplay *d
+ void gdm_verify_cleanup (GdmDisplay *d);
+ void gdm_verify_check (void);
+ void gdm_verify_select_user (const char *user);
++void gdm_verify_write_record (GdmDisplay *d,
++ GdmVerifyRecordType record_type,
++ const gchar *username,
++ const gchar *console_name,
++ const gchar *host_name,
++ GPid pid);
++
+ /* used in pam */
+ gboolean gdm_verify_setup_env (GdmDisplay *d);
+ gboolean gdm_verify_setup_user (GdmDisplay *d,
+--- gdm-2.15.6/daemon/verify-pam.c.wtmp 2006-07-17 14:19:38.000000000 +0200
++++ gdm-2.15.6/daemon/verify-pam.c 2006-07-17 14:20:37.000000000 +0200
+@@ -29,6 +29,7 @@
+ #ifdef sun
#include <fcntl.h>
#endif
-
+#include <utmp.h>
-+
- #include <gligdm-2.15.6/gi18n.h>
- #include "gdm.h"
-@@ -47,6 +49,14 @@ #include <bsm/adt.h>
- #include <bsm/adt_event.h>
- #endif /* HAVE_ADT */
+ #include <glib/gi18n.h>
+
+@@ -57,6 +58,14 @@
+
+ gboolean gdm_should_use_security_tokens_pam_stack (void);
+#ifndef GDM_BAD_RECORDS_FILE
+#define GDM_BAD_RECORDS_FILE "/var/log/btmp"
@@ -88,7 +116,7 @@
/* Evil, but this way these things are passed to the child session */
static pam_handle_t *pamh = NULL;
-@@ -409,6 +419,125 @@ gdm_verify_select_user (const char *user
+@@ -418,6 +427,125 @@ gdm_verify_select_user (const char *user
selected_user = g_strdup (user);
}
@@ -214,7 +242,7 @@
static const char *
perhaps_translate_message (const char *msg)
{
-@@ -1099,6 +1228,11 @@ #ifdef HAVE_ADT
+@@ -1172,6 +1300,11 @@ authenticate_again:
audit_fail_login (d, pw_change, pwent, pamerr);
#endif /* HAVE_ADT */
@@ -226,32 +254,3 @@
/* The verbose authentication is turned on, output the error
* message from the PAM subsystem */
if ( ! error_msg_given &&
---- gdm-2.15.6/daemon/verify.h
-+++ gdm-2.15.6/daemon/verify.h
-@@ -21,6 +21,12 @@ #define GDM_VERIFY_H
-
- #include "gdm.h"
-
-+typedef enum {
-+ GDM_VERIFY_RECORD_TYPE_LOGIN,
-+ GDM_VERIFY_RECORD_TYPE_LOGOUT,
-+ GDM_VERIFY_RECORD_TYPE_FAILED_ATTEMPT
-+} GdmVerifyRecordType;
-+
- /* If username is NULL, we ask, if local is FALSE, don't start
- * the timed login timer */
- gchar *gdm_verify_user (GdmDisplay *d,
-@@ -30,6 +36,13 @@ gchar *gdm_verify_user (GdmDisplay *d
- void gdm_verify_cleanup (GdmDisplay *d);
- void gdm_verify_check (void);
- void gdm_verify_select_user (const char *user);
-+void gdm_verify_write_record (GdmDisplay *d,
-+ GdmVerifyRecordType record_type,
-+ const gchar *username,
-+ const gchar *console_name,
-+ const gchar *host_name,
-+ GPid pid);
-+
- /* used in pam */
- gboolean gdm_verify_setup_env (GdmDisplay *d);
- gboolean gdm_verify_setup_user (GdmDisplay *d,
More information about the fedora-cvs-commits
mailing list