Menu
▾
▴
ipac-ng-commit — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(19) |
Nov
(34) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
(1) |
Mar
(4) |
Apr
(31) |
May
(15) |
Jun
(33) |
Jul
(3) |
Aug
(7) |
Sep
(2) |
Oct
(7) |
Nov
(2) |
Dec
|
| 2005 |
Jan
|
Feb
(7) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(2) |
Oct
|
Nov
(3) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Friedrich L. <fr...@us...> - 2004-07-13 11:33:34
|
Update of /cvsroot/ipac-ng/ipac-ng/storage/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19285 Added Files: Makefile.in mysql.c mysql_backend.h Log Message: first step towards mysql backend. still needs porting over to mysql functions --- NEW FILE: Makefile.in --- # $Id: Makefile.in,v 1.1 2004/07/13 11:33:25 friedl Exp $ # Makefile for mysql # NEEDLIBS=-lmysqlclient -lz SMETHOD=mysql CFLAGS=@CFLAGS@ CC=@CC@ DEFS=@DEFS@ all: libstor$(SMETHOD).a libstor$(SMETHOD).a: $(SMETHOD).o ar -crus libstor$(SMETHOD).a $? %.o: %.c ../../config.h ../../ipac.h $(CC) -c -I. -I../.. $(DEFS) $(CFLAGS) $< -o $@ clean: rm -f libstor$(SMETHOD).a $(SMETHOD).o distclean: clean rm -f Makefile *~ *.orig --- NEW FILE: mysql_backend.h --- /* * FIXME -- FIRST import from postgres backend, needs conversion to * mysql functions */ #ifndef MYSQL_BACKEND_H #define MYSQL_BACKEND_H static int postgre_stor_open (int flag); static int sql_execute_query (const char *query); static int sql_execute_simple_query (const char *query); static void sql_clear_result(); static int sql_number_of_affected_rows (); static const char *sql_result_get_value (int row, int column); static void sql_close_connection(); #endif /* MYSQL_BACKEND_H */ --- NEW FILE: mysql.c --- /* * * $Id: mysql.c,v 1.1 2004/07/13 11:33:25 friedl Exp $ * * mysql backend to ipac-ng * Copyright (C) 2001-2003 Al Zakharov, 2003-2004 Friedrich Lobenstock, 2004 Simon Hausman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * The author can be reached via email: kai...@ma..., or by * fido: Al_...@p8... * */ /* * FIXME -- FIRST import from postgres backend, needs conversion to * mysql functions */ #include "ipac.h" #include "mysql_backend.h" #include "../sharedsql/sharedsql.h" #include <libpq-fe.h> static char *pgoptions = NULL; static char *pgtty = NULL; static PGconn *conn; static PGresult *res; static int postgre_stor_open (int flag); static void sql_close_connection (); static const storage_method_t interface_entry = { "postgre", postgre_stor_open, sql_stor_store_record, sql_stor_list_timestamps, sql_stor_get_records, sql_stor_get_summary, sql_stor_delete_record, sql_stor_close }; const storage_method_t *ipac_sm_interface_postgre () { return &interface_entry; } /* include shared sql routines */ #include "../sharedsql/sharedsql.c" static int postgre_stor_open (int flag) { sql_stor_open(); conn = PQsetdbLogin (dbhost, dbport, pgoptions, pgtty, dbname, dbuser, dbpass); if (PQstatus (conn) == CONNECTION_BAD) { fprintf (stderr, "Connection to database '%s' failed.\n", dbname); fprintf (stderr, "%s", PQerrorMessage (conn)); DPRINTF ("failed postgre_stor_open\n"); PQfinish (conn); return -1; } DPRINTF ("postgre_stor_open\n"); storage_opened = 1; return 0; } static int sql_execute_query (const char *query) { DPRINTF ("%s\n", query); res = PQexec (conn, query); if (!res || (PQresultStatus (res) != PGRES_COMMAND_OK && PQresultStatus (res) != PGRES_TUPLES_OK)) { fprintf (stderr, "%s : SQL command (%s) failed\nError: %s\n", me, query, PQresultErrorMessage (res)); DPRINTF ("failed: %s\n", PQresultErrorMessage (res)); sql_clear_result(); return -1; } return 0; } static int sql_execute_simple_query (const char *query) { int resultCode; resultCode = sql_execute_query (query); if (resultCode >= 0) sql_clear_result(); return resultCode; } static void sql_clear_result() { PQclear (res); } static int sql_number_of_affected_rows () { return PQntuples (res); } static const char *sql_result_get_value (int row, int column) { return PQgetvalue (res, row, column); } static void sql_close_connection() { PQfinish (conn); } |
|
From: Friedrich L. <fr...@us...> - 2004-07-13 11:31:55
|
Update of /cvsroot/ipac-ng/ipac-ng/storage/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19128/mysql Log Message: Directory /cvsroot/ipac-ng/ipac-ng/storage/mysql added to the repository |
|
From: Friedrich L. <fr...@us...> - 2004-06-29 23:32:49
|
Update of /cvsroot/ipac-ng/ipac-ng/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16661 Modified Files: ipac.conf.sample Log Message: clarify Index: ipac.conf.sample =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/doc/ipac.conf.sample,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ipac.conf.sample 9 May 2004 23:41:35 -0000 1.1 +++ ipac.conf.sample 29 Jun 2004 23:32:40 -0000 1.2 @@ -1,5 +1,6 @@ # This is the main ipac-ng configuration file. It contains the # configuration directives that give the ipac-ng its instructions. +# Install as /etc/ipac-ng/ipac.conf ## accouting agent. iptables and ipchains available now. account agent = iptables |
|
From: Friedrich L. <fr...@us...> - 2004-06-29 23:31:50
|
Update of /cvsroot/ipac-ng/ipac-ng/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16428 Modified Files: rules.conf.sample Log Message: clarify Index: rules.conf.sample =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/doc/rules.conf.sample,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- rules.conf.sample 9 May 2004 23:41:35 -0000 1.1 +++ rules.conf.sample 29 Jun 2004 23:31:40 -0000 1.2 @@ -1,5 +1,5 @@ -# Example config file with accounting rules -# Install as /etc/ipac-ng/rules.conf.iptables +# Example config file with accounting rules for iptables +# Install as /etc/ipac-ng/rules.conf # # Format: # Name of rule|direction|interface|protocol|source|destination|extension| |
|
From: Friedrich L. <fr...@us...> - 2004-06-28 15:47:33
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3711 Modified Files: CHANGELOG TODO fetchipac.8 ipac-convert.8 ipacsum ipacsum.8 Log Message: start 1.31 Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- CHANGELOG 27 Jun 2004 22:29:27 -0000 1.27 +++ CHANGELOG 28 Jun 2004 15:47:24 -0000 1.28 @@ -25,6 +25,7 @@ * with storage backend "gdbm" DO NOT call fetchipac twice in the same second or you database will be destroyed - no fix yet +1.31 1.30 - fixed a bug when running "fetchipac -Svv" (friedl) Index: ipac-convert.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipac-convert.8,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ipac-convert.8 19 Jun 2004 23:04:50 -0000 1.6 +++ ipac-convert.8 28 Jun 2004 15:47:24 -0000 1.7 @@ -76,7 +76,7 @@ If the source database is corrupted, results are undefined. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.30. +This man page belongs to ipac version 1.31. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng Index: ipacsum =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ipacsum 19 Jun 2004 23:04:50 -0000 1.13 +++ ipacsum 28 Jun 2004 15:47:24 -0000 1.14 @@ -52,7 +52,7 @@ # =()<$datdelim="@<DATDELIM>@";>()= $datdelim="#-#-#-#-#"; # =()<$version="@<VERSION>@";>()= -$version="1.30"; +$version="1.31"; # =()<$prefix="@<prefix>@";>()= $prefix="/usr"; # =()<$exec_prefix="@<exec_prefix>@";>()= Index: TODO =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TODO 14 Jun 2004 23:05:49 -0000 1.6 +++ TODO 28 Jun 2004 15:47:24 -0000 1.7 @@ -23,7 +23,7 @@ - create documentation document with plain-file storage method description -Things to do for ipac-ng 1.30: +Things to do for ipac-ng 1.31: - add support for MySQL database backend Index: fetchipac.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.8,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- fetchipac.8 19 Jun 2004 23:04:50 -0000 1.7 +++ fetchipac.8 28 Jun 2004 15:47:24 -0000 1.8 @@ -339,7 +339,7 @@ to use ipchains with 2.4.* kernels!) .SH VERSION .\" =()<This man page belongs to ipac-ng version @<VERSION>@.>()= -This man page belongs to ipac-ng version 1.30. +This man page belongs to ipac-ng version 1.31. For updates and other information, look at .B http://sf.net/projects/ipac-ng Index: ipacsum.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum.8,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ipacsum.8 19 Jun 2004 23:04:50 -0000 1.6 +++ ipacsum.8 28 Jun 2004 15:47:24 -0000 1.7 @@ -414,7 +414,7 @@ very well and the output is ugly. Use --png instead. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.30. +This man page belongs to ipac version 1.31. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 22:32:38
|
Update of /cvsroot/ipac-ng/ipac-ng/storage/postgre In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23288 Added Files: postgre.h Log Message: forgot to add this file --- NEW FILE: postgre.h --- #ifndef POSTGRE_H #define POSTGRE_H static int postgre_stor_open (int flag); static int sql_execute_query (const char *query); static int sql_execute_simple_query (const char *query); static void sql_clear_result(); static int sql_number_of_affected_rows (); static const char *sql_result_get_value (int row, int column); static void sql_close_connection(); #endif /* POSTGRE_H */ |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 22:29:35
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22635 Modified Files: CHANGELOG Log Message: typo fixed Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- CHANGELOG 27 Jun 2004 19:41:17 -0000 1.26 +++ CHANGELOG 27 Jun 2004 22:29:27 -0000 1.27 @@ -22,8 +22,8 @@ working ok - no fix yet * duplicate tickmarks in generated images can happen, this is caused by rounding - no fix yet - * with storage backend DO NOT call fetchipac twice in the same - second or you database will be destroyed - no fix yet + * with storage backend "gdbm" DO NOT call fetchipac twice in the + same second or you database will be destroyed - no fix yet 1.30 |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 22:09:03
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17824 Modified Files: fetchipac.c ipac.h Log Message: finally fix the chain creation bug - with ipac-ng 1.28 this has been messed up totally Index: ipac.h =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipac.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ipac.h 17 Nov 2003 15:30:00 -0000 1.6 +++ ipac.h 27 Jun 2004 22:08:54 -0000 1.7 @@ -154,8 +154,8 @@ char iface[10]; // (destination)? in/out and many-many more char dest[MAX_RULE_NAME_LENGTH+1]; -// ''/'-j REJECT'/'-j RETURN'/'-j QUEUE' - char policy[10]; +// target chain (used for custom chains) or target '-j REJECT'/'-j RETURN'/'-j QUEUE' + char target[MAX_RULE_NAME_LENGTH+1]; // direction of packet: strictly in/out char direction[4]; char *extension[16]; Index: fetchipac.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- fetchipac.c 13 Jun 2004 01:14:28 -0000 1.18 +++ fetchipac.c 27 Jun 2004 22:08:54 -0000 1.19 @@ -168,7 +168,7 @@ while(r) { printf("%-20s | %-13s | %-5s | %-5s | %-18s %s | %-18s %s | %-9s | %-8s",r->name, r->dest,r->iface,r->protocol,r->snet,r->sport,r->dnet, - r->dport,r->direction,r->policy); + r->dport,r->direction,r->target); for (i=0;i<8;i++) { if (r->extension[i]) printf(" %-8s ", r->extension[i]); |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 22:09:03
|
Update of /cvsroot/ipac-ng/ipac-ng/agents/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17824/agents/iptables Modified Files: iptables.c Log Message: finally fix the chain creation bug - with ipac-ng 1.28 this has been messed up totally Index: iptables.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/iptables.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- iptables.c 27 Jun 2004 19:37:52 -0000 1.6 +++ iptables.c 27 Jun 2004 22:08:54 -0000 1.7 @@ -1278,7 +1278,7 @@ size = sizeof(struct ipt_entry_target) + target->size; target->t = xcalloc(1, size); target->t->u.target_size = size; - strcpy(target->t->u.user.name, d->policy); + strcpy(target->t->u.user.name, d->target); target->init(target->t, &fw.nfcache); if(check_inverse_type(d->protocol)) @@ -1568,8 +1568,12 @@ while(d) { if (strlen(d->name)>7) if (!memcmp(d->name, "%chain%", 7)) - if (iptc_is_chain(d->name+8, handle)) + if (iptc_is_chain(d->name+8, handle)) { iptc_flush_entries(d->name+8, &handle); + if (verbose>1) + fprintf(stderr, "flushing chain '%s'\n", d->name+8); + } + d=d->next; } free_raw_list(d1); @@ -1631,7 +1635,7 @@ d1 = d; while(d) { /* Trying to implement hierarchic rules */ - strcpy(targ, ""); + strcpy(d->target, ""); /* no target per default */ strcpy(chain, d->dest); // %-) /* Are we dealing with new chain? if so create it */ @@ -1642,9 +1646,12 @@ "chain name missing\n"); return 1; } - strcpy(targ, d->name+8); - iptc_create_chain(targ, &handle); - fprintf(frunfile, "%s|%%\n", chain); + /* set target to this new chain */ + strcpy(d->target, d->name+8); + if (verbose>1) + fprintf(stderr, "creating chain '%s'\n", d->target); + iptc_create_chain(d->target, &handle); + fprintf(frunfile, "%s|%%%s%%\n", chain, d->target); } else { fprintf(stderr, "error: incorrect symbol %% " "in rule name\n"); @@ -1690,27 +1697,27 @@ iptc_get_references(&ref, "ipac~fi", &handle); if (ref!=0) { strcpy(d.dest, "OUTPUT"); strcpy(d.snet, "0/0"); strcpy(d.dnet, "0/0"); - strcpy(d.policy, "ipac~i"); + strcpy(d.target, "ipac~i"); delete_rule(&d); - strcpy(d.dest, "FORWARD"); strcpy(d.policy, "ipac~fi"); + strcpy(d.dest, "FORWARD"); strcpy(d.target, "ipac~fi"); delete_rule(&d); } iptc_get_references(&ref, "ipac~fo", &handle); if ((ref!=0) && (first==1)) { strcpy(d.dest, "INPUT"); strcpy(d.snet, "0/0"); strcpy(d.dnet, "0/0"); - strcpy(d.policy, "ipac~o"); + strcpy(d.target, "ipac~o"); delete_rule(&d); - strcpy(d.dest, "FORWARD"); strcpy(d.policy, "ipac~fo"); + strcpy(d.dest, "FORWARD"); strcpy(d.target, "ipac~fo"); delete_rule(&d); } strcpy(d.dest, "OUTPUT"); strcpy(d.snet, "0/0"); strcpy(d.dnet, "0/0"); - strcpy(d.policy, "ipac~i"); + strcpy(d.target, "ipac~i"); insert_rule(&d, 0); - strcpy(d.dest, "INPUT"); strcpy(d.policy, "ipac~o"); + strcpy(d.dest, "INPUT"); strcpy(d.target, "ipac~o"); insert_rule(&d, 0); - strcpy(d.dest, "FORWARD"); strcpy(d.policy, "ipac~fo"); + strcpy(d.dest, "FORWARD"); strcpy(d.target, "ipac~fo"); insert_rule(&d, 0); - strcpy(d.dest, "FORWARD"); strcpy(d.policy, "ipac~fi"); + strcpy(d.dest, "FORWARD"); strcpy(d.target, "ipac~fi"); insert_rule(&d, 0); } iptc_commit(&handle); @@ -1771,7 +1778,7 @@ bzero((void *)&d, sizeof(raw_rule_type)); if (!handle) iptables_ipac_init(0); - strcpy(d.dest, "FORWARD"); strcpy(d.policy, "DROP"); + strcpy(d.dest, "FORWARD"); strcpy(d.target, "DROP"); ret = insert_rule(&d, 0); iptc_commit(&handle); return ret; |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 19:46:15
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25958 Modified Files: .ignore Log Message: add another file type which should be ignored when creating a release Index: .ignore =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/.ignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .ignore 17 May 2004 19:46:40 -0000 1.2 +++ .ignore 27 Jun 2004 19:46:07 -0000 1.3 @@ -4,6 +4,7 @@ *.spec *.d *~ +.#* .deps .ignore ipac-ng |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 19:41:26
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25143 Modified Files: CHANGELOG Log Message: typo fixed Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- CHANGELOG 27 Jun 2004 19:37:53 -0000 1.25 +++ CHANGELOG 27 Jun 2004 19:41:17 -0000 1.26 @@ -27,7 +27,7 @@ 1.30 -- fixed a little bug when runnging "fetchipac -Svv" (friedl) +- fixed a bug when running "fetchipac -Svv" (friedl) - fixed the "%chain% name" chain creation bug (friedl) - improve checking of storage backend libraries and error reporting when not found (friedl) |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 19:38:03
|
Update of /cvsroot/ipac-ng/ipac-ng/agents/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24550/agents/iptables Modified Files: iptables.c Log Message: fixed a little bug when runnging "fetchipac -Svv" Index: iptables.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/iptables.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- iptables.c 14 Nov 2003 19:51:29 -0000 1.5 +++ iptables.c 27 Jun 2004 19:37:52 -0000 1.6 @@ -1450,14 +1450,13 @@ { struct ipt_entry *e = NULL; + if (prepare_entry(d, &e)!=0) + return (1); + if (verbose>1) { printf("Appending rule to chain '%s'\n", d->dest); print_firewall_line(e, handle); } - - if (prepare_entry(d, &e)!=0) - return (1); - if (!iptc_append_entry(d->dest, e, &handle)) { fprintf(stderr, "iptables: %s\n", iptc_strerror(errno)); return (1); |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 19:38:03
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24550 Modified Files: CHANGELOG Log Message: fixed a little bug when runnging "fetchipac -Svv" Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- CHANGELOG 27 Jun 2004 19:26:49 -0000 1.24 +++ CHANGELOG 27 Jun 2004 19:37:53 -0000 1.25 @@ -27,6 +27,7 @@ 1.30 +- fixed a little bug when runnging "fetchipac -Svv" (friedl) - fixed the "%chain% name" chain creation bug (friedl) - improve checking of storage backend libraries and error reporting when not found (friedl) |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 19:26:59
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22423 Modified Files: CHANGELOG Log Message: move section "known problems" and document latest changes Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- CHANGELOG 19 Jun 2004 22:48:04 -0000 1.23 +++ CHANGELOG 27 Jun 2004 19:26:49 -0000 1.24 @@ -17,7 +17,19 @@ # Simon Hausman <simon at lst dot de> # +known problem(s): + * ipactest script reports errors despite everything is + working ok - no fix yet + * duplicate tickmarks in generated images can happen, this + is caused by rounding - no fix yet + * with storage backend DO NOT call fetchipac twice in the same + second or you database will be destroyed - no fix yet + + 1.30 +- fixed the "%chain% name" chain creation bug (friedl) +- improve checking of storage backend libraries and error reporting + when not found (friedl) - fixed an obviously very old bug in combination with an unusual installation of the postgres include files (friedl) @@ -28,11 +40,6 @@ - factor out common code for all sql backends (friedl + Simon Hausman) 1.28 -- known problem(s): - * with ipactest script which does report errors - despite everything is working ok - * duplicate tickmarks in generated images can happen, this - is caused by rounding - no fix yet - fixed the unspooling problem that creeped in during 1.28 (friedl) - non classic mode removed - make ipac-ng compile on 64 bit, also checked gdbm storage (friedl/Thomas Zehetbauer) |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 19:23:36
|
Update of /cvsroot/ipac-ng/ipac-ng/access/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21827/access/files Modified Files: rules.y Log Message: add a debugging option Index: rules.y =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/access/files/rules.y,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rules.y 19 Nov 2003 03:55:12 -0000 1.2 +++ rules.y 27 Jun 2004 19:23:25 -0000 1.3 @@ -73,6 +73,8 @@ } r1 = r2 = r4 = r5 = r; strncpy(r->name, $1, MAX_RULE_NAME_LENGTH); + if (verbose>1) + fprintf(stderr, "rule '%s'\n", r->name); } | SEP { fprintf(stderr, "got empty RULE NAME, abort\n"); |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 19:15:53
|
Update of /cvsroot/ipac-ng/ipac-ng/access/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19947 Modified Files: rules.l Log Message: fixed the chain creation bug in that rules in the form of "%chain% ..." where not correctly recognized Index: rules.l =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/access/files/rules.l,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- rules.l 6 Jul 2003 10:33:08 -0000 1.1.1.1 +++ rules.l 27 Jun 2004 19:15:45 -0000 1.2 @@ -16,7 +16,7 @@ YY_BUFFER_STATE old_st; %} -ACHAR [[:alnum:]][[:alnum:]\-\_\(\):\./\%\~ \t]* +ACHAR [[:alnum:]\%][[:alnum:]\-\_\(\):\./\%\~ \t]* %% <*>#[^\n]*[\n]? /* eat comments */ |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 16:13:35
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18145 Modified Files: configure configure.in Log Message: improve checking of storage backend libraries and error reporting when not found Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- configure 19 Jun 2004 19:40:30 -0000 1.13 +++ configure 27 Jun 2004 16:13:25 -0000 1.14 @@ -4069,8 +4069,12 @@ HAVE_LIBPQ=no fi -test $HAVE_LIBPQ = no && { echo "$as_me:$LINENO: WARNING: postgres library not found!" >&5 -echo "$as_me: WARNING: postgres library not found!" >&2;} + test $HAVE_LIBPQ = no && { echo "$as_me:$LINENO: WARNING: postgres library not found! + support for optional storage \"postgre\" will be disabled + hint: use the configure option '--with-postgresql-lib'" >&5 +echo "$as_me: WARNING: postgres library not found! + support for optional storage \"postgre\" will be disabled + hint: use the configure option '--with-postgresql-lib'" >&2;} echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5 echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6 if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then @@ -4127,16 +4131,21 @@ echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6 if test $ac_cv_lib_gdbm_gdbm_open = yes; then HAVE_LIBGDBM=yes +else + HAVE_LIBGDBM=no fi - -echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then + test $HAVE_LIBGDBM = no && { echo "$as_me:$LINENO: WARNING: gdbm library not found! + support for optional storage \"gdbm\" will be disabled" >&5 +echo "$as_me: WARNING: gdbm library not found! + support for optional storage \"gdbm\" will be disabled" >&2;} +echo "$as_me:$LINENO: checking for sqlite_get_table in -lsqlite" >&5 +echo $ECHO_N "checking for sqlite_get_table in -lsqlite... $ECHO_C" >&6 +if test "${ac_cv_lib_sqlite_sqlite_get_table+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" +LIBS="-lsqlite $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -4151,11 +4160,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dlopen (); +char sqlite_get_table (); int main () { -dlopen (); +sqlite_get_table (); ; return 0; } @@ -4172,34 +4181,36 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes + ac_cv_lib_sqlite_sqlite_get_table=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no +ac_cv_lib_sqlite_sqlite_get_table=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBS="-ldl $LIBS" - +echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_get_table" >&5 +echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_get_table" >&6 +if test $ac_cv_lib_sqlite_sqlite_get_table = yes; then + HAVE_LIBSQLITE=yes +else + HAVE_LIBSQLITE=no fi -echo "$as_me:$LINENO: checking for sqlite_get_table in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_get_table in -lsqlite... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite_sqlite_get_table+set}" = set; then + test $HAVE_LIBSQLITE = no && { echo "$as_me:$LINENO: WARNING: sqlite library not found! + support for optional storage \"sqlite\" will be disabled" >&5 +echo "$as_me: WARNING: sqlite library not found! + support for optional storage \"sqlite\" will be disabled" >&2;} + +echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsqlite $LIBS" +LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -4214,11 +4225,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char sqlite_get_table (); +char dlopen (); int main () { -sqlite_get_table (); +dlopen (); ; return 0; } @@ -4235,27 +4246,31 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_sqlite_sqlite_get_table=yes + ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_sqlite_sqlite_get_table=no +ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_get_table" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_get_table" >&6 -if test $ac_cv_lib_sqlite_sqlite_get_table = yes; then - HAVE_LIBSQLITE=yes -else - HAVE_LIBSQLITE=no +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 +_ACEOF + + LIBS="-ldl $LIBS" + fi LIBS="$LIBS -L. -lipac" +HAVE_POSTGRE=no if test $HAVE_LIBPQ = yes; then for ac_header in libpq-fe.h @@ -4404,15 +4419,22 @@ if test $HAVE_POSTGRE = yes; then CFLAGS="$CFLAGS $postgresql_inc" - LDFLAGS="$LDFLAGS $postgresql_lib -lpq" + LDFLAGS="$LDFLAGS $postgresql_lib" + #LDFLAGS="$LDFLAGS $postgresql_lib -lpq" else - { echo "$as_me:$LINENO: WARNING: postgres include file libpq-fe.h not found!" >&5 -echo "$as_me: WARNING: postgres include file libpq-fe.h not found!" >&2;} + { echo "$as_me:$LINENO: WARNING: postgres include file libpq-fe.h not found! + support for storage \"postgre\" will be disabled + hint: use the configure option '--with-postgresql-inc'" >&5 +echo "$as_me: WARNING: postgres include file libpq-fe.h not found! + support for storage \"postgre\" will be disabled + hint: use the configure option '--with-postgresql-inc'" >&2;} fi fi +HAVE_GDBM=no +if test $HAVE_LIBGDBM = yes; then -for ac_header in sqlite.h +for ac_header in gdbm.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -4548,18 +4570,174 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - HAVE_SQLITE_H=yes + HAVE_GDBM=yes else - HAVE_SQLITE_H=no + HAVE_GDBM=no fi done + if test $HAVE_GDBM = no; then + { echo "$as_me:$LINENO: WARNING: gdbm include file gdbm.h not found! + support for storage \"gdbm\" will be disabled" >&5 +echo "$as_me: WARNING: gdbm include file gdbm.h not found! + support for storage \"gdbm\" will be disabled" >&2;} + fi +fi + HAVE_SQLITE=no if test $HAVE_LIBSQLITE = yes; then - if test $HAVE_SQLITE_H = yes; then - HAVE_SQLITE=yes + +for ac_header in sqlite.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug...@gn.... ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug...@gn.... ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + HAVE_SQLITE=yes +else + HAVE_SQLITE=no +fi + +done + + + if test $HAVE_SQLITE = no; then + { echo "$as_me:$LINENO: WARNING: sqlite include file sqlite.h not found! + support for storage \"sqlite\" will be disabled" >&5 +echo "$as_me: WARNING: sqlite include file sqlite.h not found! + support for storage \"sqlite\" will be disabled" >&2;} fi fi @@ -4644,19 +4822,15 @@ fi if test $sm = gdbm; then - if test x$HAVE_LIBGDBM = x; then - { echo "$as_me:$LINENO: WARNING: GDBM library not found, omitting gdbm storage" >&5 -echo "$as_me: WARNING: GDBM library not found, omitting gdbm storage" >&2;} - STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/gdbm \?//'` + if test $HAVE_GDBM = no; then + STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/gdbm \?//'` continue fi fi if test $sm = sqlite; then if test $HAVE_SQLITE = no; then - { echo "$as_me:$LINENO: WARNING: Sqlite library not found, omitting sqlite storage" >&5 -echo "$as_me: WARNING: Sqlite library not found, omitting sqlite storage" >&2;} - STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/sqlite \?//'` + STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/sqlite \?//'` continue fi fi @@ -4683,12 +4857,10 @@ DEFAULT_STORAGE="" fi; if test x$DEFAULT_STORAGE = x; then - if test x$HAVE_LIBGDBM = x; then - { echo "$as_me:$LINENO: WARNING: gdbm is not accessible - bad, trying postgre" >&5 -echo "$as_me: WARNING: gdbm is not accessible - bad, trying postgre" >&2;} - if test x$HAVE_LIBPQ = x; then + if test $HAVE_LIBGDBM = no; then + if test $HAVE_POSTGRE = no; then DEFAULT_STORAGE=plain-file - IP_COMMENT=" (no postgre - consider installing postgre and re-run configure!)" + IP_COMMENT=" (consider installing postgre!)" else DEFAULT_STORAGE=postgre fi Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- configure.in 19 Jun 2004 19:40:30 -0000 1.13 +++ configure.in 27 Jun 2004 16:13:26 -0000 1.14 @@ -82,32 +82,53 @@ postgresql_inc="-I$postgresql_inc_default"]) dnl Checks for libraries. -AC_CHECK_LIB(pq, PQexec, [HAVE_LIBPQ=yes], [HAVE_LIBPQ=no]) -test $HAVE_LIBPQ = no && AC_MSG_WARN([postgres library not found!]) -AC_CHECK_LIB(gdbm,gdbm_open, HAVE_LIBGDBM=yes) +AC_CHECK_LIB(pq, PQexec, [HAVE_LIBPQ=yes], [HAVE_LIBPQ=no]) + test $HAVE_LIBPQ = no && AC_MSG_WARN([postgres library not found! + support for optional storage \"postgre\" will be disabled + hint: use the configure option '--with-postgresql-lib']) +AC_CHECK_LIB(gdbm, gdbm_open, [HAVE_LIBGDBM=yes], [HAVE_LIBGDBM=no]) + test $HAVE_LIBGDBM = no && AC_MSG_WARN([gdbm library not found! + support for optional storage \"gdbm\" will be disabled]) +AC_CHECK_LIB(sqlite, sqlite_get_table, [HAVE_LIBSQLITE=yes], [HAVE_LIBSQLITE=no]) + test $HAVE_LIBSQLITE = no && AC_MSG_WARN([sqlite library not found! + support for optional storage \"sqlite\" will be disabled]) AC_CHECK_LIB(dl, dlopen) -AC_CHECK_LIB(sqlite, sqlite_get_table, [ HAVE_LIBSQLITE=yes ], [HAVE_LIBSQLITE=no]) LIBS="$LIBS -L. -lipac" -dnl Checks for header files. +dnl Checks for header files if libraries found +HAVE_POSTGRE=no if test $HAVE_LIBPQ = yes; then AC_CHECK_HEADERS(libpq-fe.h, [HAVE_POSTGRE=yes], [HAVE_POSTGRE=no]) if test $HAVE_POSTGRE = yes; then CFLAGS="$CFLAGS $postgresql_inc" - LDFLAGS="$LDFLAGS $postgresql_lib -lpq" + LDFLAGS="$LDFLAGS $postgresql_lib" + #LDFLAGS="$LDFLAGS $postgresql_lib -lpq" else - AC_MSG_WARN([postgres include file libpq-fe.h not found!]) + AC_MSG_WARN([postgres include file libpq-fe.h not found! + support for storage \"postgre\" will be disabled + hint: use the configure option '--with-postgresql-inc']) fi fi -AC_CHECK_HEADERS(sqlite.h, [HAVE_SQLITE_H=yes], [HAVE_SQLITE_H=no]) +HAVE_GDBM=no +if test $HAVE_LIBGDBM = yes; then + AC_CHECK_HEADERS(gdbm.h, [HAVE_GDBM=yes], [HAVE_GDBM=no]) + + if test $HAVE_GDBM = no; then + AC_MSG_WARN([gdbm include file gdbm.h not found! + support for storage \"gdbm\" will be disabled]) + fi +fi HAVE_SQLITE=no if test $HAVE_LIBSQLITE = yes; then - if test $HAVE_SQLITE_H = yes; then - HAVE_SQLITE=yes + AC_CHECK_HEADERS(sqlite.h, [HAVE_SQLITE=yes], [HAVE_SQLITE=no]) + + if test $HAVE_SQLITE = no; then + AC_MSG_WARN([sqlite include file sqlite.h not found! + support for storage \"sqlite\" will be disabled]) fi fi @@ -185,8 +206,8 @@ dnl test if we are trying to compile with gdbm and there is libgdbm if test $sm = gdbm; then - if test x$HAVE_LIBGDBM = x; then - AC_MSG_WARN([GDBM library not found, omitting gdbm storage]) + if test $HAVE_GDBM = no; then + dnl AC_MSG_WARN([GDBM library not found, omitting gdbm storage]) STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/gdbm \?//'` continue fi @@ -195,7 +216,7 @@ dnl test if we are trying to compile with sqlite and if the library is there if test $sm = sqlite; then if test $HAVE_SQLITE = no; then - AC_MSG_WARN([Sqlite library not found, omitting sqlite storage]) + dnl AC_MSG_WARN([Sqlite library not found, omitting sqlite storage]) STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/sqlite \?//'` continue fi @@ -223,11 +244,11 @@ system.], DEFAULT_STORAGE=$enableval,DEFAULT_STORAGE="") if test x$DEFAULT_STORAGE = x; then - if test x$HAVE_LIBGDBM = x; then - AC_MSG_WARN([gdbm is not accessible - bad, trying postgre]) - if test x$HAVE_LIBPQ = x; then + if test $HAVE_LIBGDBM = no; then + dnl AC_MSG_WARN([gdbm is not accessible - bad, trying postgre]) + if test $HAVE_POSTGRE = no; then DEFAULT_STORAGE=plain-file - IP_COMMENT=" (no postgre - consider installing postgre and re-run configure!)" + IP_COMMENT=" (consider installing postgre!)" else DEFAULT_STORAGE=postgre fi |
|
From: Friedrich L. <fr...@us...> - 2004-06-27 16:13:34
|
Update of /cvsroot/ipac-ng/ipac-ng/storage/postgre In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18145/storage/postgre Modified Files: Makefile.in Log Message: improve checking of storage backend libraries and error reporting when not found Index: Makefile.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/storage/postgre/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.in 18 Apr 2004 21:02:38 -0000 1.5 +++ Makefile.in 27 Jun 2004 16:13:26 -0000 1.6 @@ -1,5 +1,6 @@ # $Id$ -# Makefile for plain-file +# Makefile for postgre +# NEEDLIBS=-lpq SMETHOD=postgre CFLAGS=@CFLAGS@ CC=@CC@ |
|
From: Friedrich L. <fr...@us...> - 2004-06-19 23:04:59
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18058 Modified Files: fetchipac.8 ipac-convert.8 ipacsum ipacsum.8 Log Message: increase version to 1.30 Index: ipac-convert.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipac-convert.8,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ipac-convert.8 13 Jun 2004 01:04:17 -0000 1.5 +++ ipac-convert.8 19 Jun 2004 23:04:50 -0000 1.6 @@ -76,7 +76,7 @@ If the source database is corrupted, results are undefined. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.29. +This man page belongs to ipac version 1.30. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng Index: ipacsum =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ipacsum 13 Jun 2004 01:04:06 -0000 1.12 +++ ipacsum 19 Jun 2004 23:04:50 -0000 1.13 @@ -52,7 +52,7 @@ # =()<$datdelim="@<DATDELIM>@";>()= $datdelim="#-#-#-#-#"; # =()<$version="@<VERSION>@";>()= -$version="1.29"; +$version="1.30"; # =()<$prefix="@<prefix>@";>()= $prefix="/usr"; # =()<$exec_prefix="@<exec_prefix>@";>()= Index: fetchipac.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.8,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- fetchipac.8 14 Jun 2004 23:16:09 -0000 1.6 +++ fetchipac.8 19 Jun 2004 23:04:50 -0000 1.7 @@ -339,7 +339,7 @@ to use ipchains with 2.4.* kernels!) .SH VERSION .\" =()<This man page belongs to ipac-ng version @<VERSION>@.>()= -This man page belongs to ipac-ng version 1.29. +This man page belongs to ipac-ng version 1.30. For updates and other information, look at .B http://sf.net/projects/ipac-ng Index: ipacsum.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum.8,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ipacsum.8 13 Jun 2004 01:04:17 -0000 1.5 +++ ipacsum.8 19 Jun 2004 23:04:50 -0000 1.6 @@ -414,7 +414,7 @@ very well and the output is ugly. Use --png instead. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.29. +This man page belongs to ipac version 1.30. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng |
|
From: Friedrich L. <fr...@us...> - 2004-06-19 22:48:28
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2888 Modified Files: CHANGELOG Log Message: fixed an obviously very old bug in combination with an unusual installation of the postgres include files Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- CHANGELOG 14 Jun 2004 23:16:09 -0000 1.22 +++ CHANGELOG 19 Jun 2004 22:48:04 -0000 1.23 @@ -17,6 +17,10 @@ # Simon Hausman <simon at lst dot de> # +1.30 +- fixed an obviously very old bug in combination with an unusual + installation of the postgres include files (friedl) + 1.29 - in case of the sqlite database the database file will be placed at /var/lib/ipac with the selected database name plus the suffix ".db" (friedl) |
|
From: Friedrich L. <fr...@us...> - 2004-06-19 19:40:39
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21006 Modified Files: configure.in configure Log Message: move some checks so the checks for the database libraries and their header files are closer to each other Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- configure 19 Jun 2004 19:36:04 -0000 1.12 +++ configure 19 Jun 2004 19:40:30 -0000 1.13 @@ -309,7 +309,7 @@ #endif" ac_subdirs_all="$ac_subdirs_all $configure_dirs" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION MANTIME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT AWK YACC LEX LEXLIB LEX_OUTPUT_ROOT IPCHAINS IPTABLES MKTEMP PERL CPP EGREP TMP DATDELIM STORAGEMETHODS STORAGEMETHODLIBRARYS DEFAULT_STORAGE BILLAGENTS BILLAGENTSLIBRARYS DEFAULT_ACCESS CONFDIR CONFFILE ACCAGENTS ACCAGENTSLIBRARYS DEFAULT_AGENT DBSTRIP IPT_LIB_DIR IPFWADM_PROC IPCHAINS_PROC_C IPCHAINS_PROC_N CH_CTRL_IN CH_CTRL_OUT CH_INNAME CH_OUTNAME ipac_datadir RUNFILE PIDFILE RECONFLAG STATUSFILE LOCKFILE DBASE DBASE_PORT subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION MANTIME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK YACC LEX LEXLIB LEX_OUTPUT_ROOT IPCHAINS IPTABLES MKTEMP PERL TMP DATDELIM STORAGEMETHODS STORAGEMETHODLIBRARYS DEFAULT_STORAGE BILLAGENTS BILLAGENTSLIBRARYS DEFAULT_ACCESS CONFDIR CONFFILE ACCAGENTS ACCAGENTSLIBRARYS DEFAULT_AGENT DBSTRIP IPT_LIB_DIR IPFWADM_PROC IPCHAINS_PROC_C IPCHAINS_PROC_N CH_CTRL_IN CH_CTRL_OUT CH_INNAME CH_OUTNAME ipac_datadir RUNFILE PIDFILE RECONFLAG STATUSFILE LOCKFILE DBASE DBASE_PORT subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1317,7 +1317,6 @@ [...1957 lines suppressed...] echo "$as_me:$LINENO: checking for default data directory" >&5 echo $ECHO_N "checking for default data directory... $ECHO_C" >&6 @@ -5097,6 +5762,8 @@ s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t +s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@AWK@,$AWK,;t t s,@YACC@,$YACC,;t t s,@LEX@,$LEX,;t t @@ -5106,8 +5773,6 @@ s,@IPTABLES@,$IPTABLES,;t t s,@MKTEMP@,$MKTEMP,;t t s,@PERL@,$PERL,;t t -s,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t s,@TMP@,$TMP,;t t s,@DATDELIM@,$DATDELIM,;t t s,@STORAGEMETHODS@,$STORAGEMETHODS,;t t Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- configure.in 19 Jun 2004 19:36:04 -0000 1.12 +++ configure.in 19 Jun 2004 19:40:30 -0000 1.13 @@ -38,6 +38,10 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION") AC_SUBST(MANTIME) +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T + dnl Checks for programs. MYPATH=$PATH:/sbin:/usr/sbin AC_PROG_CC @@ -107,10 +111,6 @@ fi fi -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T - dnl Checks for library functions. dnl ------------------------------ |
|
From: Friedrich L. <fr...@us...> - 2004-06-19 19:36:13
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16278 Modified Files: configure.in configure Log Message: better handling of postgres library and includes files Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- configure 13 Jun 2004 01:14:28 -0000 1.11 +++ configure 19 Jun 2004 19:36:04 -0000 1.12 @@ -862,7 +862,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ---with-postgresql-lib=DIR location of postgresql library +--with-postgresql-lib=DIR location of postgresql library file --with-postgresql-inc=DIR location of postgresql include files --with-confdir=directory use default directory for config files, default is /etc/ipac-ng @@ -1289,6 +1289,9 @@ + +postgresql_inc_default=/usr/include/pgsql + ipac_datadir_default=/var/lib/ipac ipac_reconflag_default=/var/lib/ipac/flag ipac_runfile_default=/var/run/ipac.rules @@ -2692,6 +2695,26 @@ + + +# Check whether --with-postgresql_lib or --without-postgresql_lib was given. +if test "${with_postgresql_lib+set}" = set; then + withval="$with_postgresql_lib" + CPPFLAGS="$CPPFLAGS -L$withval" + postgresql_lib="-L$withval" +fi; + + +# Check whether --with-postgresql_inc or --without-postgresql_inc was given. +if test "${with_postgresql_inc+set}" = set; then + withval="$with_postgresql_inc" + CPPFLAGS="-I$withval $CPPFLAGS" + postgresql_inc="-I$withval" +else + CPPFLAGS="-I$postgresql_inc_default $CPPFLAGS" + postgresql_inc="-I$postgresql_inc_default" +fi; + echo "$as_me:$LINENO: checking for PQexec in -lpq" >&5 echo $ECHO_N "checking for PQexec in -lpq... $ECHO_C" >&6 if test "${ac_cv_lib_pq_PQexec+set}" = set; then @@ -2748,8 +2771,12 @@ echo "${ECHO_T}$ac_cv_lib_pq_PQexec" >&6 if test $ac_cv_lib_pq_PQexec = yes; then HAVE_LIBPQ=yes +else + HAVE_LIBPQ=no fi +test $HAVE_LIBPQ = no && { echo "$as_me:$LINENO: WARNING: postgres library not found!" >&5 +echo "$as_me: WARNING: postgres library not found!" >&2;} echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5 echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6 if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then @@ -2934,19 +2961,9 @@ LIBS="$LIBS -L. -lipac" -postgresql_inc=-I/usr/include/pgsql - -if test x$HAVE_LIBPQ = x; then -# Check whether --with-postgresql_lib or --without-postgresql_lib was given. -if test "${with_postgresql_lib+set}" = set; then - withval="$with_postgresql_lib" - postgresql_lib="-L$withval" - HAVE_LIBPQ=yes -fi; -fi - -ac_ext=c +if test $HAVE_LIBPQ = yes; then + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -3420,7 +3437,7 @@ -for ac_header in postgres.h +for ac_header in libpq-fe.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -3556,25 +3573,21 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - + HAVE_POSTGRE=yes +else + HAVE_POSTGRE=no fi done -if test x$HAVE_POSTGRES = x; then - -# Check whether --with-postgresql_inc or --without-postgresql_inc was given. -if test "${with_postgresql_inc+set}" = set; then - withval="$with_postgresql_inc" - postgresql_inc="-I$withval" -fi; -fi - -CFLAGS="$CFLAGS $postgresql_inc" - -if test $HAVE_LIBPQ = yes; then - LDFLAGS="$LDFLAGS $postgresql_lib -lpq" + if test $HAVE_POSTGRE = yes; then + CFLAGS="$CFLAGS $postgresql_inc" + LDFLAGS="$LDFLAGS $postgresql_lib -lpq" + else + { echo "$as_me:$LINENO: WARNING: postgres include file libpq-fe.h not found!" >&5 +echo "$as_me: WARNING: postgres include file libpq-fe.h not found!" >&2;} + fi fi @@ -3959,10 +3972,8 @@ sed -e 's/^# *NEEDLIBS=//' -e 's/ *$//'` if test $sm = postgre; then - if test x$HAVE_LIBPQ = x; then - { echo "$as_me:$LINENO: WARNING: PQ library not found, omitting postgre storage" >&5 -echo "$as_me: WARNING: PQ library not found, omitting postgre storage" >&2;} - STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/postgre \?//'` + if test $HAVE_POSTGRE = no; then + STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/postgre \?//'` continue fi fi Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- configure.in 13 Jun 2004 01:14:28 -0000 1.11 +++ configure.in 19 Jun 2004 19:36:04 -0000 1.12 @@ -8,6 +8,10 @@ dnl name of variable is as those following without the '_default' in the dnl end dnl all these settings can be changed at run time anyway, though! + +dnl the default include path for postgres +postgresql_inc_default=/usr/include/pgsql + ipac_datadir_default=/var/lib/ipac ipac_reconflag_default=/var/lib/ipac/flag ipac_runfile_default=/var/run/ipac.rules @@ -58,37 +62,42 @@ AC_DEFINE_UNQUOTED(IPCHAINS,"$IPCHAINS") AC_SUBST(IPCHAINS) + +dnl check for library path options +AC_ARG_WITH(postgresql_lib, + [--with-postgresql-lib=DIR location of postgresql library file], + [CPPFLAGS="$CPPFLAGS -L$withval" + postgresql_lib="-L$withval"]) + +dnl check for include path options +AC_ARG_WITH(postgresql_inc, + [--with-postgresql-inc=DIR location of postgresql include files], + [CPPFLAGS="-I$withval $CPPFLAGS" + postgresql_inc="-I$withval"], + [CPPFLAGS="-I$postgresql_inc_default $CPPFLAGS" + postgresql_inc="-I$postgresql_inc_default"]) + dnl Checks for libraries. -AC_CHECK_LIB(pq,PQexec, HAVE_LIBPQ=yes) +AC_CHECK_LIB(pq, PQexec, [HAVE_LIBPQ=yes], [HAVE_LIBPQ=no]) +test $HAVE_LIBPQ = no && AC_MSG_WARN([postgres library not found!]) AC_CHECK_LIB(gdbm,gdbm_open, HAVE_LIBGDBM=yes) AC_CHECK_LIB(dl, dlopen) AC_CHECK_LIB(sqlite, sqlite_get_table, [ HAVE_LIBSQLITE=yes ], [HAVE_LIBSQLITE=no]) LIBS="$LIBS -L. -lipac" -postgresql_inc=-I/usr/include/pgsql - -if test x$HAVE_LIBPQ = x; then - AC_ARG_WITH(postgresql_lib, - [--with-postgresql-lib=DIR location of postgresql library], - [postgresql_lib="-L$withval" - HAVE_LIBPQ=yes]) -fi dnl Checks for header files. -AC_CHECK_HEADERS(postgres.h) +if test $HAVE_LIBPQ = yes; then + AC_CHECK_HEADERS(libpq-fe.h, [HAVE_POSTGRE=yes], [HAVE_POSTGRE=no]) -if test x$HAVE_POSTGRES = x; then - AC_ARG_WITH(postgresql_inc, - [--with-postgresql-inc=DIR location of postgresql include files], - [postgresql_inc="-I$withval"]) + if test $HAVE_POSTGRE = yes; then + CFLAGS="$CFLAGS $postgresql_inc" + LDFLAGS="$LDFLAGS $postgresql_lib -lpq" + else + AC_MSG_WARN([postgres include file libpq-fe.h not found!]) + fi fi -CFLAGS="$CFLAGS $postgresql_inc" - -if test $HAVE_LIBPQ = yes; then - LDFLAGS="$LDFLAGS $postgresql_lib -lpq" -fi - AC_CHECK_HEADERS(sqlite.h, [HAVE_SQLITE_H=yes], [HAVE_SQLITE_H=no]) HAVE_SQLITE=no @@ -167,8 +176,8 @@ dnl test if we are trying to compile with postgre and there is libpq if test $sm = postgre; then - if test x$HAVE_LIBPQ = x; then - AC_MSG_WARN([PQ library not found, omitting postgre storage]) + if test $HAVE_POSTGRE = no; then + dnl AC_MSG_WARN([PQ library not found, omitting postgre storage]) STORAGEMETHODS=`echo $STORAGEMETHODS|sed -e 's/postgre \?//'` continue fi |
|
From: Friedrich L. <fr...@us...> - 2004-06-14 23:38:06
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21159 Modified Files: Makefile.in Log Message: distclean update Index: Makefile.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.in 18 Apr 2004 21:02:35 -0000 1.7 +++ Makefile.in 14 Jun 2004 23:37:57 -0000 1.8 @@ -190,7 +190,7 @@ distclean: clean distclean-recursive rm -f Makefile config.h config.status config.cache config.log \ - subst-config ipactest + subst-config ipactest fetchipac rm -fr autom4te.cache *~ *.orig maintainerclean: distclean |
|
From: Friedrich L. <fr...@us...> - 2004-06-14 23:25:36
|
Update of /cvsroot/ipac-ng/ipac-ng/storage/sqlite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9319 Modified Files: sqlite.c Log Message: error message should print the full path of the database file Index: sqlite.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/storage/sqlite/sqlite.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sqlite.c 14 Jun 2004 23:16:09 -0000 1.2 +++ sqlite.c 14 Jun 2004 23:25:27 -0000 1.3 @@ -64,7 +64,7 @@ static int sqlite_stor_open (int flag) { - char temp[256]; + char filename[256]; sql_stor_open(); @@ -72,10 +72,10 @@ the ipac datadir so the database file ends up at the same place all the time */ conn = sqlite_open (strcat (strcat (strcat ( - strcpy (temp, datadir), "/"), dbname), ".db"), 0, &err); + strcpy (filename, datadir), "/"), dbname), ".db"), 0, &err); if (err) { - fprintf (stderr, "Connection to database '%s' failed.\n", dbname); - fprintf (stderr, "%s", err); + fprintf (stderr, "Connection to database '%s' failed.\n", filename); + fprintf (stderr, "Error: %s\n", err); sqlite_freemem (err); return 1; } |
|
From: Friedrich L. <fr...@us...> - 2004-06-14 23:16:19
|
Update of /cvsroot/ipac-ng/ipac-ng/storage/sqlite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv849/storage/sqlite Modified Files: sqlite.c Log Message: put sqlite database file always into the ipac datadir /var/lib/ipac Index: sqlite.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/storage/sqlite/sqlite.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sqlite.c 13 Jun 2004 01:14:31 -0000 1.1 +++ sqlite.c 14 Jun 2004 23:16:09 -0000 1.2 @@ -23,6 +23,8 @@ #include "ipac.h" #include "../sharedsql/sharedsql.h" #include <sqlite.h> +#include <unistd.h> +#include <string.h> static sqlite *conn; static char **res; @@ -62,9 +64,15 @@ static int sqlite_stor_open (int flag) { + char temp[256]; + sql_stor_open(); - conn = sqlite_open (dbname, 0, &err); + /* open database filename as sql database name plus suffix ".db" in + the ipac datadir so the database file ends up at the same place + all the time */ + conn = sqlite_open (strcat (strcat (strcat ( + strcpy (temp, datadir), "/"), dbname), ".db"), 0, &err); if (err) { fprintf (stderr, "Connection to database '%s' failed.\n", dbname); fprintf (stderr, "%s", err); |
