- Remove obsolete README.pam_tally [bsc#977973]
- Update Linux-PAM to version 1.3.0 - Rediff encryption_method_nis.diff - Add /sbin/unix2_chkpwd (moved from pam-modules) - Remove (since accepted upstream): - 0001-Remove-YP-dependencies-from-pam_access-they-were-nev.patch - 0002-Remove-enable-static-modules-option-and-support-from.patch - 0003-fix-nis-checks.patch - 0004-PAM_EXTERN-isn-t-needed-anymore-but-don-t-remove-it-.patch - 0005-Use-TI-RPC-functions-if-we-compile-and-link-against-.patch OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=159
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
|
||||
index 0cfc0f4..2239206 100644
|
||||
--- a/modules/pam_unix/pam_unix_passwd.c
|
||||
+++ b/modules/pam_unix/pam_unix_passwd.c
|
||||
@@ -796,6 +796,29 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv)
|
||||
--- modules/pam_unix/pam_unix_passwd.c
|
||||
+++ modules/pam_unix/pam_unix_passwd.c 2016/04/11 13:49:32
|
||||
@@ -840,6 +840,29 @@
|
||||
* rebuild the password database file.
|
||||
*/
|
||||
|
||||
@@ -32,13 +30,11 @@ index 0cfc0f4..2239206 100644
|
||||
/*
|
||||
* First we encrypt the new password.
|
||||
*/
|
||||
diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c
|
||||
index 19d72e6..dafa9f0 100644
|
||||
--- a/modules/pam_unix/support.c
|
||||
+++ b/modules/pam_unix/support.c
|
||||
@@ -37,8 +37,8 @@
|
||||
#define SELINUX_ENABLED 0
|
||||
#endif
|
||||
--- modules/pam_unix/support.c
|
||||
+++ modules/pam_unix/support.c 2016/04/11 13:49:32
|
||||
@@ -31,8 +31,8 @@
|
||||
#include "support.h"
|
||||
#include "passverify.h"
|
||||
|
||||
-static char *
|
||||
-search_key (const char *key, const char *filename)
|
||||
@@ -47,7 +43,7 @@ index 19d72e6..dafa9f0 100644
|
||||
{
|
||||
FILE *fp;
|
||||
char *buf = NULL;
|
||||
@@ -159,7 +159,7 @@ int _set_ctrl(pam_handle_t *pamh, int flags, int *remember, int *rounds,
|
||||
@@ -153,7 +153,7 @@
|
||||
}
|
||||
|
||||
/* preset encryption method with value from /etc/login.defs */
|
||||
@@ -56,7 +52,7 @@ index 19d72e6..dafa9f0 100644
|
||||
if (val) {
|
||||
for (j = 0; j < UNIX_CTRLS_; ++j) {
|
||||
if (unix_args[j].token && unix_args[j].is_hash_algo
|
||||
@@ -177,7 +177,7 @@ int _set_ctrl(pam_handle_t *pamh, int flags, int *remember, int *rounds,
|
||||
@@ -171,7 +171,7 @@
|
||||
|
||||
/* read number of rounds for crypt algo */
|
||||
if (rounds && (on(UNIX_SHA256_PASS, ctrl) || on(UNIX_SHA512_PASS, ctrl))) {
|
||||
@@ -65,11 +61,9 @@ index 19d72e6..dafa9f0 100644
|
||||
|
||||
if (val) {
|
||||
*rounds = strtol(val, NULL, 10);
|
||||
diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h
|
||||
index 6f5b2eb..a35a8a8 100644
|
||||
--- a/modules/pam_unix/support.h
|
||||
+++ b/modules/pam_unix/support.h
|
||||
@@ -174,4 +174,5 @@ extern int _unix_read_password(pam_handle_t * pamh
|
||||
--- modules/pam_unix/support.h
|
||||
+++ modules/pam_unix/support.h 2016/04/11 13:49:32
|
||||
@@ -174,4 +174,5 @@
|
||||
|
||||
extern int _unix_run_verify_binary(pam_handle_t *pamh,
|
||||
unsigned int ctrl, const char *user, int *daysleft);
|
||||
|
Reference in New Issue
Block a user