CAcert Code Development list.

[Wytze van der Raay <wytze AT cacert.org>]

Hi Michael,

On 04.07.2012 01:09, Michael Tänzer wrote:
> We have a fix for https://bugs.cacert.org/view.php?id=967
> "Give an OA the oppertuntiy to check if a desiginated Organisation
> Admininistrator is a CAcert assurer"
> 
> The fix was reviewed by Dirk Astrath (dastrath) and me (NEOatNHNG) and
> tested by Ulrich Schröter (Uli60), Marcus Mängel (INOPIAE) and Benedikt
> Heintel (Benedikt).
> 
> Diff is attached. Please also run the locale makefile so that our
> translators see the new strings (if present) on
> https://translations.cacert.org and new translations get imported into
> the system.
> 
> Changed files:
> includes/account.php

The fix has been installed on the production server on July 4, 2012.
See also the attached log message.

In locale, a 'make upload' and a 'make all' has been executed.
The Apache2 webserver has been restarted to ensure that the new
translations are enabled.

Regards,
-- wytze

--- Begin Message ---

• From: Wytze van der Raay <wytze AT cacert.org>
• To: cacert-systemlog AT lists.cacert.org
• Subject: Fwd: [cvs.cacert.org checkin notification]
• Date: Wed, 04 Jul 2012 11:03:26 +0200
• Organization: CAcert

Fix for https://bugs.cacert.org/view.php?id=967
Give an OA the opportuntiy to check if a designated Organisation
Admininistrator is a CAcert assurer.

In conjunction with the attached CVS changes a new tarball has been
made available incorporating all updates. The new tarball is available
through http://www.cacert.org/src-lic.php

-- end

--- Begin Message ---

• From: "root" <root AT cvs.cacert.org>
• To: critical-admin AT cacert.org
• Subject: cvs.cacert.org checkin notification
• Date: Wed, 4 Jul 2012 11:00:18 +0200 (CEST)

uid=0(root) gid=0(root) groups=0(root)
account.php 1.155 1.156
Wed Jul  4 11:00:17 CEST 2012
Update of /var/lib/cvs/cacert/includes
In directory hlin:/home/cacert/www/includes

Modified Files:
        account.php 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=967
Give an OA the opportuntiy to check if a designated Organisation 
Admininistrator
is a CAcert assurer.

===================================================================
RCS file: /var/lib/cvs/cacert/includes/account.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- account.php 2012/01/24 14:25:36     1.155
+++ account.php 2012/07/04 09:00:17     1.156
@@ -2289,8 +2289,21 @@
                        $_SESSION['_config']['errmsg'] = sprintf(_("Wasn't 
able to match '%s' against any user in the system"), 
sanitizeHTML($_REQUEST['email']));
                } else {
                        $row = mysql_fetch_assoc($res);
-                       mysql_query("insert into `org` set 
`memid`='".intval($row['id'])."', 
`orgid`='".intval($_SESSION['_config']['orgid'])."',
-                                       `masteracc`='$masteracc', `OU`='$OU', 
`comments`='$comments'");
+                       if ( !is_assurer(intval($row['id'])) )
+                       {
+                               $id = $oldid;
+                               $oldid=0;
+                               $_SESSION['_config']['errmsg'] =
+                                               _("The user is not an Assurer 
yet");
+                       } else {
+                               mysql_query(
+                                       "insert into `org`
+                                               set 
`memid`='".intval($row['id'])."',
+                                                       
`orgid`='".intval($_SESSION['_config']['orgid'])."',
+                                                       
`masteracc`='$masteracc',
+                                                       `OU`='$OU',
+                                                       
`comments`='$comments'");
+                       }
                }
        }
 

--- End Message ---

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

--- End Message ---

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature