mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-04 01:37:34 -08:00
d4ab922949
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/13117 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
95 lines
2.6 KiB
Diff
95 lines
2.6 KiB
Diff
--- a/vpgsql.c 2011-02-28 18:00:45.000000000 +0100
|
|
+++ b/vpgsql.c 2011-08-06 05:46:49.959717911 +0200
|
|
@@ -392,10 +392,10 @@
|
|
#endif
|
|
|
|
#ifdef ENABLE_SQL_LOGGING
|
|
- qnprintf( sqlBufUpdate, SQL_BUF_SIZE,
|
|
+ qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
|
|
"delete from vlog where domain = '%s'", domain );
|
|
pgres=PQexec(pgc, SqlBufUpdate);
|
|
- if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) {
|
|
+ if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) {
|
|
return(-1);
|
|
}
|
|
#endif
|
|
@@ -445,11 +445,11 @@
|
|
#endif
|
|
|
|
#ifdef ENABLE_SQL_LOGGING
|
|
- qnprintf( sqlBufUpdate, SQL_BUF_SIZE,
|
|
+ qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
|
|
"delete from vlog where domain = '%s' and user='%s'",
|
|
domain, user );
|
|
pgres=PQexec(pgc, SqlBufUpdate);
|
|
- if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) {
|
|
+ if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) {
|
|
err = -1;
|
|
}
|
|
#endif
|
|
@@ -1555,6 +1555,64 @@
|
|
return valias_current->data;
|
|
}
|
|
}
|
|
+
|
|
+char *valias_select_names( char *alias, char *domain )
|
|
+{
|
|
+ PGresult *pgres;
|
|
+ int err;
|
|
+ unsigned ntuples, ctuple;
|
|
+ struct linklist *temp_entry = NULL;
|
|
+
|
|
+ /* remove old entries as necessary */
|
|
+ while (valias_current != NULL)
|
|
+ valias_current = linklist_del (valias_current);
|
|
+
|
|
+ if ( (err =vauth_open(0)) != 0 ) return (NULL);
|
|
+
|
|
+ qnprintf( SqlBufRead, SQL_BUF_SIZE,
|
|
+ "select distinct alias from valias where domain = '%s' order by alias", domain);
|
|
+ if ( ! (pgres=PQexec(pgc, SqlBufRead))
|
|
+ || PQresultStatus(pgres) != PGRES_TUPLES_OK ) {
|
|
+ if(pgres) PQclear(pgres);
|
|
+ vcreate_valias_table();
|
|
+ if ( ! (pgres=PQexec(pgc, SqlBufRead))
|
|
+ || PQresultStatus(pgres) != PGRES_TUPLES_OK ) {
|
|
+ fprintf(stderr,"vpgsql: sql error[o]: %s\n",
|
|
+ PQerrorMessage(pgc));
|
|
+ if (pgres) PQclear (pgres);
|
|
+ return(NULL);
|
|
+ }
|
|
+ }
|
|
+ ntuples = PQntuples (pgres);
|
|
+ for (ctuple = 0; ctuple < ntuples; ctuple++) {
|
|
+ temp_entry = linklist_add (temp_entry, PQgetvalue (pgres, ctuple, 1), PQgetvalue (pgres, ctuple, 0));
|
|
+ if (valias_current == NULL) valias_current = temp_entry;
|
|
+ }
|
|
+ PQclear (pgres);
|
|
+ pgres = NULL;
|
|
+
|
|
+ if (valias_current == NULL) return NULL; /* no results */
|
|
+ else {
|
|
+ strcpy (alias, valias_current->d2);
|
|
+ return(valias_current->data);
|
|
+ }
|
|
+}
|
|
+
|
|
+char *valias_select_names_next(char *alias)
|
|
+{
|
|
+ if (valias_current == NULL) return NULL;
|
|
+ valias_current = linklist_del (valias_current);
|
|
+
|
|
+ if (valias_current == NULL) return NULL; /* no results */
|
|
+ else {
|
|
+ strcpy(alias, valias_current->d2);
|
|
+ return(valias_current->data);
|
|
+ }
|
|
+}
|
|
+
|
|
+void valias_select_names_end() {
|
|
+ // not needed with PostgreSQL
|
|
+}
|
|
#endif
|
|
|
|
#ifdef ENABLE_SQL_LOGGING
|