From 3b21f90cfa100468c0f93f2477ef0e6826d81771 Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Sun, 13 Jul 2025 06:05:41 -0400 Subject: [PATCH] Need to implement sql_gettupple --- Makefile | 12 ++++++------ app/scarmt.c | 2 ++ conf/mailleur.conf.dvl | 8 ++++---- lib/gessql.c | 5 +++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 63cb1e2..e1519b7 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,6 @@ debug \ do \ $(MAKE) DB=$(DB) -s -C $$i $@ ; \ done - @ #ln -nsf bin-posql bin - @ ln -nsf bin-mysql bin @@ -28,13 +26,14 @@ clean : cleanrpm $(MAKE) -s -C $$i $@ ; \ done @ - rm -fr $(APPNAME)-* - @ - rm -fr bin -posql : clean debug newtest +posql : clean debug @ ln -nsf bin-posql bin + @ $(MAKE) -s newtest -mysql : clean debug newtest +mysql : clean debug @ ln -nsf bin-mysql bin + @ $(MAKE) -s newtest #==================================================================== FEEDPAR = \ @@ -187,12 +186,13 @@ tstspf : clean debug #preparing a test area newtest : deltest @ mkdir -p $(TESTDIR)/var/run + @ mkdir -p $(TESTDIR)/$(SBINDIR) @ mkdir -p $(TESTDIR)/usr/share/$(APPNAME) @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/queue @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/mails @ mkdir -p $(TESTDIR)/usr @ cp -a \ - bin \ + bin/* \ $(TESTDIR)/$(SBINDIR) @ cp -a \ sql \ diff --git a/app/scarmt.c b/app/scarmt.c index c987e71..a42aec4 100644 --- a/app/scarmt.c +++ b/app/scarmt.c @@ -44,6 +44,8 @@ _Bool proceed; sqlptr=(SQLPTR *)0; rmtip=(char **)0; delay=10; //10 second sleeping time +if (debug>0) + delay=2; phase=0; proceed=true; while (proceed==true) { diff --git a/conf/mailleur.conf.dvl b/conf/mailleur.conf.dvl index 466ec80..8363d40 100644 --- a/conf/mailleur.conf.dvl +++ b/conf/mailleur.conf.dvl @@ -44,10 +44,10 @@ CA_VERIFY_CLT=0 #to check PEER/server remote certificate DB_NAME=mailleur DB_HOST=localhost DB_LANG="UTF-8" -#DB_TYPE=POSTGRESQL -#DB_PORT=5432 -DB_TYPE=MYSQL -DB_PORT=3306 +DB_TYPE=POSTGRESQL +DB_PORT=5432 +#DB_TYPE=MYSQL +#DB_PORT=3306 #------------------------------------------------ #Dovecot storage directory diff --git a/lib/gessql.c b/lib/gessql.c index 8dda6a6..e05b832 100644 --- a/lib/gessql.c +++ b/lib/gessql.c @@ -711,8 +711,13 @@ return isok; PUBLIC char **sql_getnewrmtip(SQLPTR *sqlptr) { +static char *cmd="select remoteip from "RMTTBL" where lastscan<='2020-01-01' order by lastupdate asc"; + char **rmtip; +int num; rmtip=(char **)0; +num=sql_request(sqlptr,cmd); +(void) rou_alert(0,"JMPDG NUM='%d'",num); return rmtip; } -- 2.47.3