Acked-by: Philip Balister <[email protected]>


On 03/22/2010 07:06 AM, Marcin Juszkiewicz wrote:
From: David-John Willis<[email protected]>

Signed-off-by: Chris Larson<[email protected]>
---
  recipes/shadow/files/pam.d/login |    2 +-
  recipes/shadow/files/securetty   |   31 +++++++++++++++++++++++++++++--
  recipes/shadow/shadow.inc        |    2 +-
  3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/recipes/shadow/files/pam.d/login b/recipes/shadow/files/pam.d/login
index 65992c6..e41eb04 100644
--- a/recipes/shadow/files/pam.d/login
+++ b/recipes/shadow/files/pam.d/login
@@ -44,7 +44,7 @@ session       required   pam_env.so readenv=1
  session       required   pam_env.so readenv=1 envfile=/etc/default/locale

  # Standard Un*x authentication.
-...@include common-auth
+auth       include      common-auth

  # This allows certain extra groups to be granted to a user
  # based on things like time of day, tty, service, and user.
diff --git a/recipes/shadow/files/securetty b/recipes/shadow/files/securetty
index 2705baa..8fd26e0 100644
--- a/recipes/shadow/files/securetty
+++ b/recipes/shadow/files/securetty
@@ -5,12 +5,20 @@ console
  # Standard serial ports
  ttyS0
  ttyS1
+ttyS2
+ttyS3

  # USB dongles
  ttyUSB0
  ttyUSB1
  ttyUSB2

+# PowerMac
+ttyPZ0
+ttyPZ1
+ttyPZ2
+ttyPZ3
+
  # Embedded MPC platforms
  ttyPSC0
  ttyPSC1
@@ -94,8 +102,27 @@ tty61
  tty62
  tty63

-# devfs consoles
-# Note: On kernels greater than 2.6.12, this is not needed.
+# Local X displays (allows empty passwords with pam_unix's nullok_secure)
+:0
+:0.0
+:0.1
+:1
+:1.0
+:1.1
+:2
+:2.0
+:2.1
+:3
+:3.0
+:3.1
+
+# Embedded Freescale i.MX ports
+ttymxc0
+ttymxc1
+ttymxc2
+ttymxc3
+ttymxc4
+ttymxc5

  # Standard serial ports, with devfs
  tts/0
diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index 4a40151..68381f0 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -11,7 +11,7 @@ LICENSE = "BSD"
  SECTION = "base"
  DEPENDS += "$...@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"

-INC_PR = "r7"
+INC_PR = "r8"

  # Additional Policy files for PAM
  PAM_SRC_URI = " \

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Reply via email to