From 6a8a4601648d698f8285081bbde7d982fa45671f Mon Sep 17 00:00:00 2001 From: Aslak Raanes Date: Thu, 25 Oct 2018 13:52:19 +0200 Subject: [PATCH] begynn fjerning av yacc o.l. for lesing av mysql-admutils-config --- mysql-dbadm.c | 2 +- mysql-useradm.c | 2 +- pwfile.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-dbadm.c b/mysql-dbadm.c index d80ed86..ffe32a0 100644 --- a/mysql-dbadm.c +++ b/mysql-dbadm.c @@ -619,7 +619,7 @@ main(int argc, char *argv[]) if ((command != c_show) && (argc < 3)) return wrong_use(NULL); - read_config_file(); +/* read_config_file(); */ /* connect to the database server and select the mysql database */ if (!mysql_real_connect(&mysql, db_server, db_user, db_passwd, db_name, 0, NULL, 0)) diff --git a/mysql-useradm.c b/mysql-useradm.c index 04bcdca..f7d3e9a 100644 --- a/mysql-useradm.c +++ b/mysql-useradm.c @@ -277,7 +277,7 @@ main(int argc, char *argv[]) if ((command != c_show) && (argc < 3)) return wrong_use(NULL); - read_config_file(); +/* read_config_file(); */ /* connect to the database server and select the mysql database */ if (!mysql_real_connect(&mysql, db_server, db_user, db_passwd, db_name, 0, NULL, 0)) diff --git a/pwfile.c b/pwfile.c index ce2e573..433dd13 100644 --- a/pwfile.c +++ b/pwfile.c @@ -19,8 +19,8 @@ /* defaults for configurable values */ const char* db_user = "root"; -const char* db_server = "localhost"; -const char* db_passwd = NULL; +const char* db_server = "mysql.stud.ntnu.no"; +const char* db_passwd = MYSQLPW ; const char* db_name = "mysql"; extern int yyparse(void);