diff options
Diffstat (limited to 'meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch')
| -rw-r--r-- | meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch | 83 |
1 files changed, 55 insertions, 28 deletions
diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch index 15f8044fa2..1eacb8a53f 100644 --- a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch +++ b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch | |||
| @@ -1,88 +1,115 @@ | |||
| 1 | From 38882ab288fd4d2cc2e45dff222ae3412c8fe357 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Kang Kai <kai.kang@windriver.com> | ||
| 3 | Date: Wed, 20 Jul 2011 19:18:14 +0800 | ||
| 4 | Subject: [PATCH] shadow: update pam related configure files | ||
| 5 | |||
| 1 | The system-auth in the configure files is from Fedora which put all the 4 pam type rules | 6 | The system-auth in the configure files is from Fedora which put all the 4 pam type rules |
| 2 | in one file. | 7 | in one file. |
| 3 | In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account, | 8 | In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account, |
| 4 | common-password and common-session. | 9 | common-password and common-session. |
| 5 | So update them with oe way. | 10 | So update them with oe way. |
| 6 | 11 | ||
| 7 | Upstream-Status: Pending | 12 | See meta/recipes-extended/pam/libpam/pam.d/common-password |
| 13 | |||
| 14 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 8 | 15 | ||
| 9 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | 16 | Signed-off-by: Kang Kai <kai.kang@windriver.com> |
| 17 | --- | ||
| 18 | etc/pam.d/chage | 2 +- | ||
| 19 | etc/pam.d/chgpasswd | 2 +- | ||
| 20 | etc/pam.d/groupadd | 2 +- | ||
| 21 | etc/pam.d/groupdel | 2 +- | ||
| 22 | etc/pam.d/groupmems | 2 +- | ||
| 23 | etc/pam.d/groupmod | 2 +- | ||
| 24 | etc/pam.d/useradd | 2 +- | ||
| 25 | etc/pam.d/userdel | 2 +- | ||
| 26 | etc/pam.d/usermod | 2 +- | ||
| 27 | 9 files changed, 9 insertions(+), 9 deletions(-) | ||
| 10 | 28 | ||
| 11 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chage shadow-4.1.4.3/etc/pam.d/chage | 29 | diff --git a/etc/pam.d/chage b/etc/pam.d/chage |
| 12 | --- shadow-4.1.4.3/etc/pam.d.orig/chage 2011-07-20 19:02:27.384844958 +0800 | 30 | index 8f49f5c..b1f365d 100644 |
| 13 | +++ shadow-4.1.4.3/etc/pam.d/chage 2011-07-20 19:03:08.964844958 +0800 | 31 | --- a/etc/pam.d/chage |
| 32 | +++ b/etc/pam.d/chage | ||
| 14 | @@ -1,4 +1,4 @@ | 33 | @@ -1,4 +1,4 @@ |
| 15 | #%PAM-1.0 | 34 | #%PAM-1.0 |
| 16 | auth sufficient pam_rootok.so | 35 | auth sufficient pam_rootok.so |
| 17 | account required pam_permit.so | 36 | account required pam_permit.so |
| 18 | -password include system-auth | 37 | -password include system-auth |
| 19 | +password include common-password | 38 | +password include common-password |
| 20 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chgpasswd shadow-4.1.4.3/etc/pam.d/chgpasswd | 39 | diff --git a/etc/pam.d/chgpasswd b/etc/pam.d/chgpasswd |
| 21 | --- shadow-4.1.4.3/etc/pam.d.orig/chgpasswd 2011-07-20 19:02:27.384844958 +0800 | 40 | index 8f49f5c..b1f365d 100644 |
| 22 | +++ shadow-4.1.4.3/etc/pam.d/chgpasswd 2011-07-20 19:03:26.544844958 +0800 | 41 | --- a/etc/pam.d/chgpasswd |
| 42 | +++ b/etc/pam.d/chgpasswd | ||
| 23 | @@ -1,4 +1,4 @@ | 43 | @@ -1,4 +1,4 @@ |
| 24 | #%PAM-1.0 | 44 | #%PAM-1.0 |
| 25 | auth sufficient pam_rootok.so | 45 | auth sufficient pam_rootok.so |
| 26 | account required pam_permit.so | 46 | account required pam_permit.so |
| 27 | -password include system-auth | 47 | -password include system-auth |
| 28 | +password include common-password | 48 | +password include common-password |
| 29 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupadd shadow-4.1.4.3/etc/pam.d/groupadd | 49 | diff --git a/etc/pam.d/groupadd b/etc/pam.d/groupadd |
| 30 | --- shadow-4.1.4.3/etc/pam.d.orig/groupadd 2011-07-20 19:02:27.384844958 +0800 | 50 | index 8f49f5c..b1f365d 100644 |
| 31 | +++ shadow-4.1.4.3/etc/pam.d/groupadd 2011-07-20 19:04:08.124844958 +0800 | 51 | --- a/etc/pam.d/groupadd |
| 52 | +++ b/etc/pam.d/groupadd | ||
| 32 | @@ -1,4 +1,4 @@ | 53 | @@ -1,4 +1,4 @@ |
| 33 | #%PAM-1.0 | 54 | #%PAM-1.0 |
| 34 | auth sufficient pam_rootok.so | 55 | auth sufficient pam_rootok.so |
| 35 | account required pam_permit.so | 56 | account required pam_permit.so |
| 36 | -password include system-auth | 57 | -password include system-auth |
| 37 | +password include common-password | 58 | +password include common-password |
| 38 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupdel shadow-4.1.4.3/etc/pam.d/groupdel | 59 | diff --git a/etc/pam.d/groupdel b/etc/pam.d/groupdel |
| 39 | --- shadow-4.1.4.3/etc/pam.d.orig/groupdel 2011-07-20 19:02:27.384844958 +0800 | 60 | index 8f49f5c..b1f365d 100644 |
| 40 | +++ shadow-4.1.4.3/etc/pam.d/groupdel 2011-07-20 19:04:26.114844958 +0800 | 61 | --- a/etc/pam.d/groupdel |
| 62 | +++ b/etc/pam.d/groupdel | ||
| 41 | @@ -1,4 +1,4 @@ | 63 | @@ -1,4 +1,4 @@ |
| 42 | #%PAM-1.0 | 64 | #%PAM-1.0 |
| 43 | auth sufficient pam_rootok.so | 65 | auth sufficient pam_rootok.so |
| 44 | account required pam_permit.so | 66 | account required pam_permit.so |
| 45 | -password include system-auth | 67 | -password include system-auth |
| 46 | +password include common-password | 68 | +password include common-password |
| 47 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmems shadow-4.1.4.3/etc/pam.d/groupmems | 69 | diff --git a/etc/pam.d/groupmems b/etc/pam.d/groupmems |
| 48 | --- shadow-4.1.4.3/etc/pam.d.orig/groupmems 2011-07-20 19:02:27.384844958 +0800 | 70 | index 8f49f5c..b1f365d 100644 |
| 49 | +++ shadow-4.1.4.3/etc/pam.d/groupmems 2011-07-20 19:04:35.074844958 +0800 | 71 | --- a/etc/pam.d/groupmems |
| 72 | +++ b/etc/pam.d/groupmems | ||
| 50 | @@ -1,4 +1,4 @@ | 73 | @@ -1,4 +1,4 @@ |
| 51 | #%PAM-1.0 | 74 | #%PAM-1.0 |
| 52 | auth sufficient pam_rootok.so | 75 | auth sufficient pam_rootok.so |
| 53 | account required pam_permit.so | 76 | account required pam_permit.so |
| 54 | -password include system-auth | 77 | -password include system-auth |
| 55 | +password include common-password | 78 | +password include common-password |
| 56 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmod shadow-4.1.4.3/etc/pam.d/groupmod | 79 | diff --git a/etc/pam.d/groupmod b/etc/pam.d/groupmod |
| 57 | --- shadow-4.1.4.3/etc/pam.d.orig/groupmod 2011-07-20 19:02:27.384844958 +0800 | 80 | index 8f49f5c..b1f365d 100644 |
| 58 | +++ shadow-4.1.4.3/etc/pam.d/groupmod 2011-07-20 19:04:44.864844958 +0800 | 81 | --- a/etc/pam.d/groupmod |
| 82 | +++ b/etc/pam.d/groupmod | ||
| 59 | @@ -1,4 +1,4 @@ | 83 | @@ -1,4 +1,4 @@ |
| 60 | #%PAM-1.0 | 84 | #%PAM-1.0 |
| 61 | auth sufficient pam_rootok.so | 85 | auth sufficient pam_rootok.so |
| 62 | account required pam_permit.so | 86 | account required pam_permit.so |
| 63 | -password include system-auth | 87 | -password include system-auth |
| 64 | +password include common-password | 88 | +password include common-password |
| 65 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/useradd shadow-4.1.4.3/etc/pam.d/useradd | 89 | diff --git a/etc/pam.d/useradd b/etc/pam.d/useradd |
| 66 | --- shadow-4.1.4.3/etc/pam.d.orig/useradd 2011-07-20 19:02:27.384844958 +0800 | 90 | index 8f49f5c..b1f365d 100644 |
| 67 | +++ shadow-4.1.4.3/etc/pam.d/useradd 2011-07-20 19:07:26.244844958 +0800 | 91 | --- a/etc/pam.d/useradd |
| 92 | +++ b/etc/pam.d/useradd | ||
| 68 | @@ -1,4 +1,4 @@ | 93 | @@ -1,4 +1,4 @@ |
| 69 | #%PAM-1.0 | 94 | #%PAM-1.0 |
| 70 | auth sufficient pam_rootok.so | 95 | auth sufficient pam_rootok.so |
| 71 | account required pam_permit.so | 96 | account required pam_permit.so |
| 72 | -password include system-auth | 97 | -password include system-auth |
| 73 | +password include common-password | 98 | +password include common-password |
| 74 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/userdel shadow-4.1.4.3/etc/pam.d/userdel | 99 | diff --git a/etc/pam.d/userdel b/etc/pam.d/userdel |
| 75 | --- shadow-4.1.4.3/etc/pam.d.orig/userdel 2011-07-20 19:02:27.384844958 +0800 | 100 | index 8f49f5c..b1f365d 100644 |
| 76 | +++ shadow-4.1.4.3/etc/pam.d/userdel 2011-07-20 19:07:35.734844958 +0800 | 101 | --- a/etc/pam.d/userdel |
| 102 | +++ b/etc/pam.d/userdel | ||
| 77 | @@ -1,4 +1,4 @@ | 103 | @@ -1,4 +1,4 @@ |
| 78 | #%PAM-1.0 | 104 | #%PAM-1.0 |
| 79 | auth sufficient pam_rootok.so | 105 | auth sufficient pam_rootok.so |
| 80 | account required pam_permit.so | 106 | account required pam_permit.so |
| 81 | -password include system-auth | 107 | -password include system-auth |
| 82 | +password include common-password | 108 | +password include common-password |
| 83 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/usermod shadow-4.1.4.3/etc/pam.d/usermod | 109 | diff --git a/etc/pam.d/usermod b/etc/pam.d/usermod |
| 84 | --- shadow-4.1.4.3/etc/pam.d.orig/usermod 2011-07-20 19:02:27.384844958 +0800 | 110 | index 8f49f5c..b1f365d 100644 |
| 85 | +++ shadow-4.1.4.3/etc/pam.d/usermod 2011-07-20 19:07:42.024844958 +0800 | 111 | --- a/etc/pam.d/usermod |
| 112 | +++ b/etc/pam.d/usermod | ||
| 86 | @@ -1,4 +1,4 @@ | 113 | @@ -1,4 +1,4 @@ |
| 87 | #%PAM-1.0 | 114 | #%PAM-1.0 |
| 88 | auth sufficient pam_rootok.so | 115 | auth sufficient pam_rootok.so |