[debian-edu-commits] debian-edu/upstream/ 31/71: Complete restructuring.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository libpam-mklocaluser.

commit 640a879cbfe1a3c38f5c24ca458681ba62273788
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri May 7 17:13:52 2010 +0000

    Complete restructuring.
---
 debian/changelog                                            |  2 +-
 debian/control                                              | 13 +++++++------
 debian/libpam-localoffline.install                          |  4 ----
 debian/libpam-mklocaluser.install                           |  2 ++
 ...am-localoffline.postinst => libpam-mklocaluser.postinst} |  0
 .../{libpam-localoffline.prerm => libpam-mklocaluser.prerm} |  0
 debian/pam-auth-update/lo-ccreds-check                      |  7 -------
 debian/pam-auth-update/lo-ccreds-save                       |  6 ------
 debian/pam-auth-update/{localoffline => mklocaluser}        |  0
 9 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a83795..53c2391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ libpam-mklocaluser (0.0.1) UNRELEASED; urgency=low
 
   * Do not upload to Debian before libpam-python is available (WNPP #578650).
 
-  * The ccreds stuff can be removed when bug #566718 is fixed.
+  * To work out of the box with ccreds, we need bug #566718 is fixed.
 
   * Initial release.
 
diff --git a/debian/control b/debian/control
index 9113410..8f40125 100644
--- a/debian/control
+++ b/debian/control
@@ -11,11 +11,12 @@ Vcs-Svn: svn://svn.debian.org/debian-edu/trunk/src/libpam-mklocaluser/
 
 Package: libpam-mklocaluser
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, libpam-ccreds, libpam-python
-Description: Configure PAM to create a local user and do offline authentication
+Depends: ${misc:Depends}, ${python:Depends}, libpam-python
+Suggests: libpam-ccreds | libpam-sss
+Description: Configure PAM to create a local user if it do not exist already
  When the user log in for the first time, a local user is created in
  /etc/passwd and primary group created in /etc/group, and a local home
- directory is created in /home.  The password is set up to be cached
- by libpam-ccreds to allow login without network connection using the
- password provided by some network authentication service like
- Kerberos or LDAP.
+ directory is created in /home.  This is useful when the password is
+ set up to be cached by libpam-ccreds or sssd to allow login without
+ network connection using the password provided by a network
+ authentication service like Kerberos or LDAP.
diff --git a/debian/libpam-localoffline.install b/debian/libpam-localoffline.install
deleted file mode 100644
index c915f40..0000000
--- a/debian/libpam-localoffline.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/pam-auth-update/lo-ccreds-check	usr/share/pam-configs
-debian/pam-auth-update/lo-ccreds-save	usr/share/pam-configs
-debian/pam-auth-update/mklocaluser	usr/share/pam-configs
-debian/pam-python.py			usr/lib/libpam-mklocaluser
diff --git a/debian/libpam-mklocaluser.install b/debian/libpam-mklocaluser.install
new file mode 100644
index 0000000..e5072b6
--- /dev/null
+++ b/debian/libpam-mklocaluser.install
@@ -0,0 +1,2 @@
+debian/pam-auth-update/mklocaluser	usr/share/pam-configs
+debian/pam-python.py			usr/lib/libpam-mklocaluser
diff --git a/debian/libpam-localoffline.postinst b/debian/libpam-mklocaluser.postinst
similarity index 100%
rename from debian/libpam-localoffline.postinst
rename to debian/libpam-mklocaluser.postinst
diff --git a/debian/libpam-localoffline.prerm b/debian/libpam-mklocaluser.prerm
similarity index 100%
rename from debian/libpam-localoffline.prerm
rename to debian/libpam-mklocaluser.prerm
diff --git a/debian/pam-auth-update/lo-ccreds-check b/debian/pam-auth-update/lo-ccreds-check
deleted file mode 100644
index 0e931f4..0000000
--- a/debian/pam-auth-update/lo-ccreds-check
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: Ccreds credential caching - password checking
-Default: yes
-Priority: 0
-Auth-Type: Primary
-Auth:
-	[success=end default=ignore]	pam_ccreds.so action=validate use_first_pass
-	[default=ignore]		pam_ccreds.so action=update
diff --git a/debian/pam-auth-update/lo-ccreds-save b/debian/pam-auth-update/lo-ccreds-save
deleted file mode 100644
index 53d8c0b..0000000
--- a/debian/pam-auth-update/lo-ccreds-save
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: Ccreds credential caching - password saving
-Default: yes
-Priority: 512
-Auth-Type: Additional
-Auth:
-	optional			pam_ccreds.so action=store
diff --git a/debian/pam-auth-update/localoffline b/debian/pam-auth-update/mklocaluser
similarity index 100%
rename from debian/pam-auth-update/localoffline
rename to debian/pam-auth-update/mklocaluser

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/libpam-mklocaluser.git