summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--net-im/jabberd/files/jabberd-2.1.11-r1.patch20
1 files changed, 18 insertions, 2 deletions
diff --git a/net-im/jabberd/files/jabberd-2.1.11-r1.patch b/net-im/jabberd/files/jabberd-2.1.11-r1.patch
index 441163c..6eba147 100644
--- a/net-im/jabberd/files/jabberd-2.1.11-r1.patch
+++ b/net-im/jabberd/files/jabberd-2.1.11-r1.patch
@@ -95,2 +95,18 @@ index 099aec9..29dca26 100644
95 AC_SUBST(PGSQL_LIBS) 95 AC_SUBST(PGSQL_LIBS)
96diff --git a/etc/c2s.xml.dist.in b/etc/c2s.xml.dist.in
97index 873a133..0589ada 100644
98--- a/etc/c2s.xml.dist.in
99+++ b/etc/c2s.xml.dist.in
100@@ -325,6 +325,11 @@
101
102 <!-- PostgreSQL module configuration -->
103 <pgsql>
104+ <!-- PostgreSQL connection info -->
105+ <conninfo>dbname=jabberd2 user=jabberd2 password=secret</conninfo>
106+
107+ <!-- The rest of connection settings are used only in absence of 'conninfo' -->
108+
109 <!-- Database server host and port -->
110 <host>localhost</host>
111 <port>5432</port>
96diff --git a/mio/mio_impl.h b/mio/mio_impl.h 112diff --git a/mio/mio_impl.h b/mio/mio_impl.h
@@ -162,3 +178,3 @@ index 06f9e6e..5abf065 100644
162diff --git a/storage/authreg_pgsql.c b/storage/authreg_pgsql.c 178diff --git a/storage/authreg_pgsql.c b/storage/authreg_pgsql.c
163index 1f15e83..8d3cf88 100644 179index 1f15e83..cb68e7d 100644
164--- a/storage/authreg_pgsql.c 180--- a/storage/authreg_pgsql.c
@@ -187,5 +203,5 @@ index 1f15e83..8d3cf88 100644
187+ if(conninfo) { 203+ if(conninfo) {
188 +conn = PQconnect(conninfo);
189 +/* don't log connection info for it can contain password */ 204 +/* don't log connection info for it can contain password */
190 +log_debug( ZONE, "pgsql connecting to the databse"); 205 +log_debug( ZONE, "pgsql connecting to the databse");
206 +conn = PQconnectdb(conninfo);
191+ }else{ 207+ }else{