Improving mailleur restart with postgresql and mysql spec file

diff --git a/lib/lvleml.h b/lib/lvleml.h
index 589f753309b14629004cdcab39b750f312908a97..7e2e5967d17b2317c69f66a6f06f70925b757cec 100644 (file)
--- a/lib/lvleml.h
+++ b/lib/lvleml.h
@@ -31,7 +31,7 @@ typedef struct  {
         char *mailfrom;         //current mail from originator
         RCPTYP **recipients;    //List of email recipient
         LOGPTR *logptr;         //reference to session log
-        char *transout;          //data to be flush out to remote
+        char *transout;         //data to be flush out to remote
         }CONTYP;
 
 

diff --git a/lib/modrec.c b/lib/modrec.c
index 51bc6f46fed49e6c4755cebbe2df877170b8dca6..d4b989dc186d4cdfbeb72e02858692ba840336ab 100644 (file)
--- a/lib/modrec.c
+++ b/lib/modrec.c
@@ -202,7 +202,19 @@ while (proceed==true) {
           break;
         }
       break;
-    case 3      :       //connection terminated
+    case 3      :       //check local delivery
+      if (contact->recipients!=(RCPTYP **)0) {
+        RCPTYP **ptr;
+
+        ptr=contact->recipients;
+        while (*ptr!=(RCPTYP *)0) {
+          (void) rou_alert(0,"%s JMPDBG code='%c' rcpt=<%s>",
+                              OPEP,(*ptr)->code,(*ptr)->userid);
+          ptr++;
+          }
+        } 
+      break;
+    case 4      :       //connection terminated
       contact=eml_dropcontact(contact);
       (void) rou_checkleak(false);
       break;

diff --git a/mailleur.spec.in b/mailleur.spec.in
index dcd042399ce7cd58a90aa4f97e92f40c40b91a6e..0f3cac81bc97fe106b875281d99ac2ae9c5ed007 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -132,20 +132,6 @@ if [ "$1" = 1 ]; then
       ;;
     esac
   fi
-case "$OS" in
-  "sysv"       |                                       \
-  "osukiss"    )
-    for action in %{name}
-      do
-      %{_sbindir}/chkconfig --add ${action}
-      %{_sysconfdir}/rc.d/init.d/${action} condrestart > /dev/null 2>&1 || :
-      done
-    ;;
-  *            )
-    echo "Unable to find distribution"
-    exit -1
-    ;;
-  esac
 
 #=============================================================================
 %package               postgresql
@@ -170,6 +156,7 @@ Obsoletes   :       %{name}-mysql           <= %{version}-%{release}
 %attr(0755,%{name},mail) %{_sbindir}/srtrpsql
 
 %post                  postgresql
+OS=`%{_libdir}/%{name}/shell/getsysos.sh`
 if [ "$1" = 1 ]; then
   sed -i                                       \
        -e "s/^DB_TYPE=.*$/DB_TYPE=POSTGRESQL/" \
@@ -188,6 +175,21 @@ if [ "$1" = 1 ]; then
        ./srtrpsql                              \
        %{_sbindir}/sorter
 
+case "$OS" in
+  "sysv"       |                                       \
+  "osukiss"    )
+    for action in %{name}
+      do
+      %{_sbindir}/chkconfig --add ${action}
+      %{_sysconfdir}/rc.d/init.d/${action} condrestart > /dev/null 2>&1 || :
+      done
+    ;;
+  *            )
+    echo "Unable to find distribution"
+    exit -1
+    ;;
+  esac
+
 %postun                        postgresql
 if [ "$1" = 0 ]; then
   rm -f %{_sbindir}/receiver
@@ -218,6 +220,7 @@ Obsoletes   :       %{name}-postgresql      <= %{version}-%{release}
 %attr(0755,%{name},mail) %{_sbindir}/srtrmsql
 
 %post                  mysql
+OS=`%{_libdir}/%{name}/shell/getsysos.sh`
 if [ "$1" = 1 ]; then
   sed -i                                       \
        -e "s/^DB_TYPE=.*$/DB_TYPE=MYSQL/"      \
@@ -235,6 +238,21 @@ if [ "$1" = 1 ]; then
        ./srtrmsql                              \
        %{_sbindir}/sorter
 
+case "$OS" in
+  "sysv"       |                               \
+  "osukiss"    )
+    for action in %{name}
+      do
+      %{_sbindir}/chkconfig --add ${action}
+      %{_sysconfdir}/rc.d/init.d/${action} condrestart > /dev/null 2>&1 || :
+      done
+    ;;
+  *            )
+    echo "Unable to find distribution"
+    exit -1
+    ;;
+  esac
+
 %postun                        mysql
 if [ "$1" = 0 ]; then
   rm -f %{_sbindir}/receiver