summaryrefslogtreecommitdiffstats
path: root/funcweb
diff options
context:
space:
mode:
authorKrzysztof A. Adamski <krzysztofa@gmail.com>2008-07-11 13:12:56 -0400
committermakkalot <makkalot@gmail.com>2008-08-04 22:20:42 +0300
commitf2e491ba089156ad683da8cb197cc34c03d10af9 (patch)
treedffd4f4196ef6c0b41a2c4d80259cba86c4bf9f7 /funcweb
parent5c5f6a54328c87c51ef608ea3f501779dd45a805 (diff)
downloadfunc-f2e491ba089156ad683da8cb197cc34c03d10af9.tar.gz
func-f2e491ba089156ad683da8cb197cc34c03d10af9.tar.xz
func-f2e491ba089156ad683da8cb197cc34c03d10af9.zip
Provide our own PAM service configuration file.
(cherry picked from commit 1656265c3aec5c0701c25f9260b03c444e6af07a)
Diffstat (limited to 'funcweb')
-rw-r--r--funcweb/etc/pam.d/funcweb3
-rw-r--r--funcweb/funcweb.spec1
-rw-r--r--funcweb/funcweb/identity/pam.py2
-rw-r--r--funcweb/setup.py5
4 files changed, 9 insertions, 2 deletions
diff --git a/funcweb/etc/pam.d/funcweb b/funcweb/etc/pam.d/funcweb
new file mode 100644
index 0000000..658583d
--- /dev/null
+++ b/funcweb/etc/pam.d/funcweb
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec
index a2b1720..39d394b 100644
--- a/funcweb/funcweb.spec
+++ b/funcweb/funcweb.spec
@@ -98,6 +98,7 @@ rm -fr $RPM_BUILD_ROOT
%dir /var/log/funcweb
%config(noreplace) %{_sysconfdir}/httpd/conf.d/funcweb.conf
%config(noreplace) %{_sysconfdir}/%{name}/prod.cfg
+%config(noreplace) %{_sysconfdir}/pam.d/funcweb
%config(noreplace) /etc/logrotate.d/funcweb_rotate
#adding the server startup shutdown thing
diff --git a/funcweb/funcweb/identity/pam.py b/funcweb/funcweb/identity/pam.py
index 87bc126..503ba0b 100644
--- a/funcweb/funcweb/identity/pam.py
+++ b/funcweb/funcweb/identity/pam.py
@@ -82,7 +82,7 @@ PAM_AUTHENTICATE = LIBPAM.pam_authenticate
PAM_AUTHENTICATE.restype = c_int
PAM_AUTHENTICATE.argtypes = [PamHandle, c_int]
-def authenticate(username, password, service='login'):
+def authenticate(username, password, service='funcweb'):
"""Returns True if the given username and password authenticate for the
given service. Returns False otherwise
diff --git a/funcweb/setup.py b/funcweb/setup.py
index e4e6cf7..fc12ca2 100644
--- a/funcweb/setup.py
+++ b/funcweb/setup.py
@@ -23,6 +23,8 @@ initpath = "/etc/init.d"
#the log path
logpath = "/var/log/funcweb"
rotpath = "/etc/logrotate.d"
+#the pam path
+pampath = "/etc/pam.d/"
#the setup part
setup(
@@ -93,6 +95,7 @@ setup(
(self_etcpath,['etc/prod.cfg']),
(initpath,['init-scripts/funcwebd']),
(logpath,[]),
- (rotpath,['etc/funcweb_rotate'])
+ (rotpath,['etc/funcweb_rotate']),
+ (pampath,['etc/pam.d/funcweb'])
],
)