← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/strongswan/oneiric

« back to all changes in this revision

Viewing changes to src/charon/plugins/sql/sql_config.c

  • Committer: Bazaar Package Importer
  • Author(s): Rene Mayrhofer
  • Date: 2009-04-18 20:28:51 UTC
  • mfrom: (1.1.9 upstream) (2.1.15 karmic)
  • Revision ID: james.westby@ubuntu.com-20090418202851-ep722qhmzvpxh6yj
Tags: 4.3.2-1
http://bugs.debian.org/525652
http://bugs.debian.org/533837
http://bugs.debian.org/531612
http://bugs.debian.org/526037
http://bugs.debian.org/526486
http://bugs.debian.org/526487
http://bugs.debian.org/526488
http://bugs.debian.org/528073
http://bugs.debian.org/525234
http://bugs.debian.org/528323
http://bugs.debian.org/528370
http://bugs.debian.org/529027
http://bugs.debian.org/529071
http://bugs.debian.org/529592
http://bugs.debian.org/529638
http://bugs.debian.org/529661
http://bugs.debian.org/529742
http://bugs.debian.org/530273
http://bugs.debian.org/529063
Urgency high because of security issue and FTBFS.
* New upstream release, fixes security bug.
* Fix padlock handling for i386 in debian/rules.
  Closes: #525652 (FTBFS on i386)
* Acknowledge NMUs by security team.
  Closes: #533837, #531612
* Add "Conflicts: strongswan (< 4.2.12-1)" to libstrongswan, 
  strongswan-starter, strongswan-ikev1, and strongswan-ikev2 to force
  update of the strongswan package on installation and avoid conflicts
  caused by package restructuring.
  Closes: #526037: strongswan-ikev2 and strongswan: error when trying to 
                   install together
  Closes: #526486: strongswan and libstrongswan: error when trying to 
                   install together
  Closes: #526487: strongswan-ikev1 and strongswan: error when trying to 
                   install together
  Closes: #526488: strongswan-starter and strongswan: error when trying to 
                   install together
* Debconf templates and debian/control reviewed by the debian-l10n-
  english team as part of the Smith review project. Closes: #528073
* Debconf translation updates:
  Closes: #525234: [INTL:ja] Update po-debconf template translation (ja.po) 
  Closes: #528323: [INTL:sv] po-debconf file for strongswan 
  Closes: #528370: [INTL:vi] Vietnamese debconf templates translation update 
  Closes: #529027: [INTL:pt] Updated Portuguese translation for debconf messages
  Closes: #529071: [INTL:fr] French debconf templates translation update 
  Closes: #529592: nb translation of debconf PO for strongSWAN 
  Closes: #529638: [INTL:ru] Russian debconf templates translation 
  Closes: #529661: Updated Czech translation of strongswan debconf messages 
  Closes: #529742: [INTL:eu] strongswan debconf basque translation 
  Closes: #530273: [INTL:fi] Finnish translation of the debconf templates
  Closes: #529063: [INTL:gl] strongswan 4.2.14-2 debconf translation update

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/charon/plugins/sql/sql_config.c
11
11
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
12
 * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
13
13
 * for more details.
14
 
 *
15
 
 * $Id: sql_config.c 4860 2009-02-11 13:09:52Z martin $
16
14
 */
17
15
 
18
16
#include <string.h>
267
265
                peer_cfg_t *peer_cfg, *mediated_cfg;
268
266
                ike_cfg_t *ike;
269
267
                host_t *vip = NULL;
270
 
                auth_info_t *auth;
 
268
                auth_cfg_t *auth;
271
269
                
272
270
                local_id = identification_create_from_encoding(l_type, l_data);
273
271
                remote_id = identification_create_from_encoding(r_type, r_data);
291
289
                if (ike)
292
290
                {
293
291
                        peer_cfg = peer_cfg_create(
294
 
                                        name, 2, ike, local_id, remote_id, cert_policy, uniqueid,
 
292
                                        name, 2, ike, cert_policy, uniqueid,
295
293
                                        keyingtries, rekeytime, reauthtime, jitter, overtime,
296
294
                                        mobike, dpd_delay, vip, pool,
297
295
                                        mediation, mediated_cfg, peer_id);
298
 
                        auth = peer_cfg->get_auth(peer_cfg);
299
 
                        auth->add_item(auth, AUTHN_AUTH_CLASS, &auth_method);
 
296
                        auth = auth_cfg_create();
 
297
                        auth->add(auth, AUTH_RULE_AUTH_CLASS, auth_method);
 
298
                        auth->add(auth, AUTH_RULE_IDENTITY, local_id->clone(local_id));
 
299
                        peer_cfg->add_auth_cfg(peer_cfg, auth, TRUE);
 
300
                        auth = auth_cfg_create();
 
301
                        auth->add(auth, AUTH_RULE_IDENTITY, remote_id->clone(remote_id));
300
302
                        if (eap_type)
301
303
                        {
302
 
                                auth->add_item(auth, AUTHN_EAP_TYPE, &eap_type);
 
304
                                auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_EAP);
 
305
                                auth->add(auth, AUTH_RULE_EAP_TYPE, eap_type);
303
306
                                if (eap_vendor)
304
307
                                {
305
 
                                        auth->add_item(auth, AUTHN_EAP_VENDOR, &eap_vendor);
 
308
                                        auth->add(auth, AUTH_RULE_EAP_VENDOR, eap_vendor);
306
309
                                }
307
310
                        }
 
311
                        peer_cfg->add_auth_cfg(peer_cfg, auth, FALSE);
308
312
                        add_child_cfgs(this, peer_cfg, id);
309
313
                        return peer_cfg;
310
314
                }