Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d27aa60f8a232a6b8a9ab00a70e5ea0651656067)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d27aa60f8a232a6b8a9ab00a70e5ea0651656067)
  • Date: Mon, 10 Jul 2006 11:04:43 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

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

New commits:
commit d27aa60f8a232a6b8a9ab00a70e5ea0651656067
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

vlock _can_ use shadow passwords, one just has to enable them...

diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
old mode 100644
new mode 100755
index 5cd9fdc..dae1ead
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1,3 +1,2 @@
-message "Either PAM auth or non-shadowed passwords are supported." &&
-optional_depends linux-pam "YES_PAM" "NO_PAM" "...using PAM for auth"
-
+optional_depends linux-pam "YES_PAM" "NO_PAM" "...using PAM for auth" &&
+optional_depends shadow "YES_SHADOW" "NO_SHADOW" "native shadow password
support"
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index 454f65a..cf456a4 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,6 @@
+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>
* DEPENDS, PRE_BUILD: made pam optional

diff --git a/utils/vlock/PRE_BUILD b/utils/vlock/PRE_BUILD
index b208a86..3a73940 100755
--- a/utils/vlock/PRE_BUILD
+++ b/utils/vlock/PRE_BUILD
@@ -6,5 +6,11 @@ then
message "seding Makefile to disable PAM" &&
sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1/' Makefile &&
sedit 's/^\(LDFLAGS =.*\)-ldl -lpam -lpam_misc/\1-lcrypt/' Makefile
+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




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d27aa60f8a232a6b8a9ab00a70e5ea0651656067), Thomas Orgis, 07/10/2006

Archive powered by MHonArc 2.6.24.

Top of Page