diff --git a/pam-0.99.7.1-console-decrement.patch b/pam-0.99.7.1-console-decrement.patch deleted file mode 100644 index 345055d..0000000 --- a/pam-0.99.7.1-console-decrement.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- Linux-PAM-0.99.7.1/modules/pam_console/pam_console.c.decrement 2006-05-10 11:32:40.000000000 +0200 -+++ Linux-PAM-0.99.7.1/modules/pam_console/pam_console.c 2007-03-23 11:14:53.000000000 +0100 -@@ -19,7 +19,7 @@ - * - * /var/run/console/ is used for reference counting - * and to make console authentication easy -- if it exists, then -- * has console access. -+ * is logged on console. - * - * A system startup script should remove /var/run/console/console.lock - * and everything in /var/run/console/ -@@ -560,7 +560,7 @@ - */ - int fd; - int count = 0; -- int err; -+ int err = PAM_SUCCESS; - int delete_consolelock = 0; - const char *username = NULL, *user_prompt; - char *lockfile = NULL; -@@ -605,7 +605,8 @@ - _pam_log(pamh, LOG_ERR, FALSE, - "\"impossible\" fstat error on %s", consolelock); - close(fd); -- err = PAM_SESSION_ERR; goto return_error; -+ err = PAM_SESSION_ERR; -+ goto decrement; - } - consoleuser = _do_malloc(st.st_size+1); - if (st.st_size) { -@@ -614,7 +615,7 @@ - "\"impossible\" read error on %s", consolelock); - err = PAM_SESSION_ERR; - close(fd); -- goto return_error; -+ goto decrement; - } - consoleuser[st.st_size] = '\0'; - } -@@ -627,23 +628,19 @@ - */ - console_run_handlers(pamh, FALSE, username, tty); - } -- } else { -- /* didn't open file */ -- err = PAM_SESSION_ERR; -- goto return_error; - } - } - -+decrement: - count = use_count(pamh, lockfile, -1, 1); - if (count < 1 && delete_consolelock) { - if (unlink(consolelock)) { - _pam_log(pamh, LOG_ERR, FALSE, - "\"impossible\" unlink error on %s", consolelock); -- err = PAM_SESSION_ERR; goto return_error; -+ err = PAM_SESSION_ERR; - } - } - -- err = PAM_SUCCESS; - return_error: - if (lockfile) free(lockfile); - if (consoleuser) free (consoleuser); diff --git a/pam-0.99.7.1-console-more-displays.patch b/pam-0.99.7.1-console-more-displays.patch deleted file mode 100644 index bbf6600..0000000 --- a/pam-0.99.7.1-console-more-displays.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- Linux-PAM-0.99.7.1/modules/pam_console/console.handlers.displays 2006-09-04 16:14:31.000000000 +0200 -+++ Linux-PAM-0.99.7.1/modules/pam_console/console.handlers 2007-02-06 16:50:41.000000000 +0100 -@@ -14,6 +14,6 @@ - # echo lock wait Locking console for user on tty - # touch unlock wait /var/run/console-unlocked - --console consoledevs tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9] -+console consoledevs tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]+\.[0-9]+ :[0-9]+ - /sbin/pam_console_apply lock logfail wait -t tty -s - /sbin/pam_console_apply unlock logfail wait -r -t tty -s ---- Linux-PAM-0.99.7.1/modules/pam_console/console.perms.displays 2005-07-14 15:13:44.000000000 +0200 -+++ Linux-PAM-0.99.7.1/modules/pam_console/console.perms 2007-02-06 16:49:49.000000000 +0100 -@@ -18,8 +18,8 @@ - # Rather a new file in the console.perms.d directory should be created. - - # file classes -- these are regular expressions --=tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9] --=:[0-9]\.[0-9] :[0-9] -+=tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]+\.[0-9]+ :[0-9]+ -+=:[0-9]+\.[0-9]+ :[0-9]+ - - # device classes -- see console.perms.d/50-default.perms - # permission definitions -- see console.perms.d/50-default.perms