Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (d8281aff26df61596f3978c05d859484331013dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Mathieu Lonjaret <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (d8281aff26df61596f3978c05d859484331013dd)
  • Date: Tue, 17 Oct 2006 07:07:35 -0500

GIT changes to master grimoire by Mathieu Lonjaret <lejatorn AT sourcemage.org>:

utils/vlock/DEPENDS | 5 +++--
utils/vlock/HISTORY | 7 +++++--
utils/vlock/PRE_BUILD | 17 ++++++++++-------
3 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 3c1e3d17257c0ce328ac8fd0c6ab9cc26b67a0af
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

vlock: shadow and pam are now mutually exclusive

diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
index dae1ead..fa3b2a7 100755
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1,2 +1,3 @@
-optional_depends linux-pam "YES_PAM" "NO_PAM" "...using PAM for auth" &&
-optional_depends shadow "YES_SHADOW" "NO_SHADOW" "native shadow password
support"
+optional_depends linux-pam "YES_PAM" "NO_PAM" \
+"Use pam for authentication? (recommended)"
+#optional_depends shadow "YES_SHADOW" "NO_SHADOW" "native shadow password
support"
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index cf456a4..baa5264 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,7 +1,10 @@
-2006-07-10 Thomas Orgis sobukus AT sourcemage.org>
+2006-10-17 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS, PRE_BUILD: set shadow and pam to be exclusive
+
+2006-07-10 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, PRE_BUILD: optionally enabling the hidden shadow support

-2006-07-06 Thomas Orgis sobukus AT sourcemage.org>
+2006-07-06 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, PRE_BUILD: made pam optional

2006-06-28 Eric Sandall <eric AT sandall.us>
diff --git a/utils/vlock/PRE_BUILD b/utils/vlock/PRE_BUILD
index 3a73940..b32e871 100755
--- a/utils/vlock/PRE_BUILD
+++ b/utils/vlock/PRE_BUILD
@@ -1,16 +1,19 @@
+#this is still wip as using shadow requires vlock to be setuid root
default_pre_build &&
cd $SOURCE_DIRECTORY &&
sedit "s/-O2/$CFLAGS/" Makefile &&
if list_find "$OPTS" "NO_PAM"
then
message "seding Makefile to disable PAM" &&
- sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1/' Makefile &&
+ #sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1/' Makefile &&
+ sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1 -DSHADOW_PWD/' Makefile &&
sedit 's/^\(LDFLAGS =.*\)-ldl -lpam -lpam_misc/\1-lcrypt/' Makefile
-fi &&
+fi
#does this conflict with PAM?
-if list_find "$OPTS" "YES_SHADOW"
-then
- message "seding Makefile to enable shadow" &&
- sedit 's/^\(CFLAGS =.*\)$/\1 -DSHADOW_PWD/' Makefile
-fi
+#->yes it does. ;-)
+#if list_find "$OPTS" "YES_SHADOW"
+#then
+# message "seding Makefile to enable shadow" &&
+# sedit 's/^\(CFLAGS =.*\)$/\1 -DSHADOW_PWD/' Makefile
+#fi




  • [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (d8281aff26df61596f3978c05d859484331013dd), Mathieu Lonjaret, 10/17/2006

Archive powered by MHonArc 2.6.24.

Top of Page