Author: tille
Date: 2008-09-26 09:17:19 +0000 (Fri, 26 Sep 2008)
New Revision: 2542
Modified:
trunk/packages/agdbnet/trunk/debian/patches/10_preconf.patch
trunk/packages/agdbnet/trunk/debian/patches/30_fix_empty_status_bug_in_curator_authentication.patch
trunk/packages/agdbnet/trunk/debian/postinst
trunk/packages/agdbnet/trunk/debian/postrm
Log:
Make sure that user status is really 'curator'
Modified: trunk/packages/agdbnet/trunk/debian/patches/10_preconf.patch
===================================================================
--- trunk/packages/agdbnet/trunk/debian/patches/10_preconf.patch
2008-09-26 08:04:24 UTC (rev 2541)
+++ trunk/packages/agdbnet/trunk/debian/patches/10_preconf.patch
2008-09-26 09:17:19 UTC (rev 2542)
@@ -5,7 +5,7 @@
@@ -1,17 +1,17 @@
###GENERAL####
-tmp_dir=/var/www/html/tmp
-+tmp_dir=/var/www/agdbnet/tmp
++tmp_dir=/var/www/agdbnet/temporary
####EMBOSS####
#used for sequence alignment in allele query
Modified:
trunk/packages/agdbnet/trunk/debian/patches/30_fix_empty_status_bug_in_curator_authentication.patch
===================================================================
---
trunk/packages/agdbnet/trunk/debian/patches/30_fix_empty_status_bug_in_curator_authentication.patch
2008-09-26 08:04:24 UTC (rev 2541)
+++
trunk/packages/agdbnet/trunk/debian/patches/30_fix_empty_status_bug_in_curator_authentication.patch
2008-09-26 09:17:19 UTC (rev 2542)
@@ -2,7 +2,13 @@
A user with status == '' should not be able to log in as curator.
--- agdbnet_v1.0.0.orig/cgi-bin/agcurate.pl
+++ agdbnet_v1.0.0/cgi-bin/agcurate.pl
-@@ -326,7 +326,13 @@
+@@ -322,11 +322,18 @@
+ sub curator_id {
+ my $username = $q->remote_user;
+ if ($username) {
+- my $qry = "SELECT id FROM users WHERE user_name=?";
++ # status needs to be queried as well
++ my $qry = "SELECT id, status FROM users WHERE user_name=?";
my $sql = $db->prepare($qry) or die "cannot prepare";
$sql->execute($username);
my ( $id, $status ) = $sql->fetchrow_array;
Modified: trunk/packages/agdbnet/trunk/debian/postinst
===================================================================
--- trunk/packages/agdbnet/trunk/debian/postinst 2008-09-26 08:04:24 UTC
(rev 2541)
+++ trunk/packages/agdbnet/trunk/debian/postinst 2008-09-26 09:17:19 UTC
(rev 2542)
@@ -112,7 +112,7 @@
"$CURATORCONF"
fi
-TMPDIR="/var/www/${pkg}/tmp"
+TMPDIR="/var/www/${pkg}/temporary"
SQLDIR="/var/lib/${pkg}"
case "$1" in
Modified: trunk/packages/agdbnet/trunk/debian/postrm
===================================================================
--- trunk/packages/agdbnet/trunk/debian/postrm 2008-09-26 08:04:24 UTC (rev
2541)
+++ trunk/packages/agdbnet/trunk/debian/postrm 2008-09-26 09:17:19 UTC (rev
2542)
@@ -31,7 +31,7 @@
fi
# If package should be purged also purge temporary web directory
- rm -rf /var/www/${pkg}/tmp
+ rm -rf /var/www/${pkg}/temporary
# finally remove web directory
if [ -d /var/www/${pkg} ] ; then
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
