diff options
Diffstat (limited to 'net/traff/files/patch-traff.c')
| -rw-r--r-- | net/traff/files/patch-traff.c | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/net/traff/files/patch-traff.c b/net/traff/files/patch-traff.c index 358781742942..3d30a810a69f 100644 --- a/net/traff/files/patch-traff.c +++ b/net/traff/files/patch-traff.c @@ -1,28 +1,20 @@ ---- traff.c.orig Fri Feb 1 16:10:22 2002 -+++ traff.c Tue Sep 27 18:04:32 2005 -@@ -135,7 +135,7 @@ - DEBUG(printf("Reading Config\n");) - config = (t_config *) malloc(sizeof(t_config)); - // reading config file -- config_init(config,"/etc/traff.conf"); // this function will initialize configuration -+ config_init(config,"%%PREFIX%%/etc/traff.conf"); // this function will initialize configuration - config->dt = time(0); +--- traff.c.orig 2009-11-10 20:55:07.000000000 -0500 ++++ traff.c 2011-05-26 21:17:58.000000000 -0400 +@@ -121,7 +121,7 @@ + /* The options we understand. */ + static struct argp_option options[] = { + {"debug", 'd', 0, 0, "Produce debug output" }, +-{"config", 'c', "FILE", 0, "Configuration File default: /etc/traff.conf" }, ++{"config", 'c', "FILE", 0, "Configuration File default: %%PREFIX%%/etc/traff.conf" }, + { 0 } + }; - DEBUG(print_config();) -@@ -467,14 +467,8 @@ - bzero(my_query, QUERYLENGTH); - DEBUG(printf("Initializing Mysql\n");) - mysql_init(&mysql); -- DEBUG(printf("Connecting to host %s, db %s, table %s using login %s, password %s\n",cat->sql->host,cat->sql->db, cat->sql->table,cat->sql->user,cat->sql->password);) -- mysql_connect(&mysql,cat->sql->host,cat->sql->user,cat->sql->password); -- if (mysql_errno(&mysql)) { -- fprintf(stderr,"Error connecting to Mysql-Database in category %s:\n%d, %s\n",cat->name, mysql_errno(&mysql),mysql_error(&mysql)); -- syslog(LOG_ERR,"Error connecting to Mysql-Database in category %s:\n%d, %s\n",cat->name, mysql_errno(&mysql),mysql_error(&mysql)); -- return 1; -- } -- mysql_select_db(&mysql,cat->sql->db); -+ DEBUG(printf("Connecting to host %s, db %s, table %s using login %s, password %s\n",cat->sql->host,cat->sql->db, cat->sql->table,cat->sql->user,cat->sql->password,cat->sql->db,0,NULL,0);) -+ mysql_real_connect(&mysql,cat->sql->host,cat->sql->user,cat->sql->password,cat->sql->db,0,NULL,0); - if (mysql_errno(&mysql)) { - fprintf(stderr,"Error connecting to Mysql-Database in category %s:\n%d, %s\n",cat->name, mysql_errno(&mysql),mysql_error(&mysql)); - syslog(LOG_ERR,"Error connecting to Mysql-Database in category %s:\n%d, %s\n",cat->name, mysql_errno(&mysql),mysql_error(&mysql)); +@@ -174,7 +174,7 @@ + + /* Default values. */ + arguments.debug = 0; +- arguments.config = "/etc/traff.conf"; ++ arguments.config = "%%PREFIX%%/etc/traff.conf"; + + /* Parse our arguments; every option seen by parse_opt will be + reflected in arguments. */ |