← Back to branch summary

~ubuntu-branches/ubuntu/maverick/pdns/maverick-updates

« back to all changes in this revision

Viewing changes to modules/gpgsqlbackend/spgsql.cc

  • Committer: Bazaar Package Importer
  • Author(s): Debian PowerDNS Maintainers
  • Date: 2005-07-29 20:24:33 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050729202433-cfrk71byx0mmmbk6
Tags: 2.9.18-1
http://bugs.debian.org/318798
* New upstream release (Closes: #318798)
* Drop patches: 64bit-compile-fix.dpatch, addfeatures-ldapbackend.dpatch,
  amd64-compilefix.dpatch, blankout-domain-fix.dpatch,
  consistent-sql.dpatch, dosfix-ldapbackend.dpatch, fix-exit-status.dpatch,
  gpgsql-compilefix.dpatch, gsqlite-compilefix.dpatch, gsqlite-slave.dpatch,
  recursor-slowdown.patch.dpatch, typoinitscript.dpatch, zone2ldap.dpatch
  They are applied upstream.
* The ldapbackend did not properly escape all queries, allowing it to fail
  and not answer questions. (CAN-2005-2301)
* Questions from clients denied recursion could blank out answers to clients
  who are allowed recursion services, temporarily. (CAN-2005-2302)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gpgsqlbackend/spgsql.cc
1
 
/* Copyright 2003 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE 
2
 
   for more information.
3
 
   $Id: spgsql.cc,v 1.4 2004/01/17 13:18:22 ahu Exp $  */
 
1
/* Copyright 2003 - 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE 
 
2
   for more information. */
4
3
#include <string>
5
4
#include "spgsql.hh"
6
5
 
12
11
 
13
12
bool SPgSQL::s_dolog;
14
13
 
15
 
SPgSQL::SPgSQL(const string &database, const string &host, const string &msocket, const string &user, 
 
14
SPgSQL::SPgSQL(const string &database, const string &host, const string& port, const string &msocket, const string &user, 
16
15
               const string &password)
17
16
{
18
17
  d_db=0;
26
25
  if(!host.empty())
27
26
    connectstr+=" host="+host;
28
27
 
 
28
  if(!port.empty())
 
29
    connectstr+=" port="+port;
 
30
 
29
31
  if(!password.empty())
30
32
    connectstr+=" password="+password;
31
33