Great! I don't see it in my checkouts yet... are you on a branch, or maybe
the CVS server is taking its time ;-)
Here's another patch, this time with auth_disconnect() calls. I grepped
and thought they were there already, but actually only in a few places.
This patch puts an auth_disconnect(); next to every db_disconnect();
Aaron
On Wed, 12 Feb 2003, Roel Rozendaal - IC&S wrote:
> applied & committed :-)
>
> Aaron Stone heeft op dinsdag, 11 feb 2003 om 18:48 (Europe/Amsterdam)
> het volgende geschreven:
>
> > Ok, here is a corrected version... with some spots cleaned up
> > a little bit, \n's in printf's and the like, too.
> >
> > Aaron
> >
> >
> > On Sun, 9 Feb 2003, Aaron Stone wrote:
> >
> >> Looks like user.c has a double-up db_connect(). FYI!
> >>
> >> Aaron
> >>
> >>
> >> On Sun, 9 Feb 2003, Aaron Stone wrote:
> >>
> >>> Here ya go :-)
> >>>
> >>> Aaron
> >>>
> >>>
> >>> On Sat, 8 Feb 2003, Roel Rozendaal - IC&S wrote:
> >>>
> >>>> As long as it works safely i certainly don't mind including those
> >>>> calls. A patch would be very nice :-)
> >>>>
> >>>> regards roel
> >>>>
> >>>> Aaron Stone heeft op zaterdag, 8 feb 2003 om 06:06
> >>>> (Europe/Amsterdam)
> >>>> het volgende geschreven:
> >>>>
> >>>>> Roel,
> >>>>>
> >>>>> Would you consider also including my changes to auth_connect() so
> >>>>> that
> >>>>> it
> >>>>> can be safely called alongside every db_connect() call without
> >>>>> wasting
> >>>>> a
> >>>>> database connection? If you specifically want it as a patch I
> >>>>> can...
> >>>>>
> >>>>> Aaron
> >>>>>
> >>>>>
> >>>>> On Fri, 7 Feb 2003, Roel Rozendaal - IC&S wrote:
> >>>>>
> >>>>>> Hi all,
> >>>>>>
> >>>>>> could some of you verify the autoconf now in CVS? If it works
> >>>>>> correctly
> >>>>>> we'll submit dbmail-1.1 :-)
> >>>>>>
> >>>>>> Ulrich: i've applied your patches (4 feb 2003) for freebsd
> >>>>>> compiling -
> >>>>>> could you check wheter current cvs works immediately?
> >>>>>>
> >>>>>> regards roel
> >>>>>>
> >>>>>> Met vriendelijke groet,
> >>>>>>
> >>>>>>
> >>>>>> Roel Rozendaal
> >>>>>>
> >>>>>>
> >>>>>> _________________________
> >>>>>> R.A. Rozendaal
> >>>>>> ICT Manager
> >>>>>> IC&S
> >>>>>> T: +31 30 2322878
> >>>>>> F: +31 30 2322305
> >>>>>> www.ic-s.nl
> >>>>>>
> >>>>>> _______________________________________________
> >>>>>> Dbmail mailing list
> >>>>>> Dbmail@dbmail.org
> >>>>>> https://mailman.fastxs.nl/mailman/listinfo/dbmail
> >>>>>>
> >>>>>
> >>>>> _______________________________________________
> >>>>> Dbmail mailing list
> >>>>> Dbmail@dbmail.org
> >>>>> https://mailman.fastxs.nl/mailman/listinfo/dbmail
> >>>>>
> >>>> Met vriendelijke groet,
> >>>>
> >>>>
> >>>> Roel Rozendaal
> >>>>
> >>>>
> >>>> _________________________
> >>>> R.A. Rozendaal
> >>>> ICT Manager
> >>>> IC&S
> >>>> T: +31 30 2322878
> >>>> F: +31 30 2322305
> >>>> www.ic-s.nl
> >>>>
> >>>> _______________________________________________
> >>>> Dbmail mailing list
> >>>> Dbmail@dbmail.org
> >>>> https://mailman.fastxs.nl/mailman/listinfo/dbmail
> >>>>
> >>>
> >>
> >> _______________________________________________
> >> Dbmail mailing list
> >> Dbmail@dbmail.org
> >> https://mailman.fastxs.nl/mailman/listinfo/dbmail
> >>
> > <dbmail-auth_connect-patch2.txt>
> Met vriendelijke groet,
>
>
> Roel Rozendaal
>
>
> _________________________
> R.A. Rozendaal
> ICT Manager
> IC&S
> T: +31 30 2322878
> F: +31 30 2322305
> www.ic-s.nl
>
> _______________________________________________
> Dbmail mailing list
> Dbmail@dbmail.org
> https://mailman.fastxs.nl/mailman/listinfo/dbmail
>
diff -cr dbmail/main.c dbmail-auth/main.c
*** dbmail/main.c 2003-02-12 08:36:53.000000000 -0800
--- dbmail-auth/main.c 2003-02-12 08:27:34.000000000 -0800
***************
*** 175,180 ****
--- 175,181 ----
trace (TRACE_DEBUG,"main(): they're all free. we're done.");
db_disconnect();
+ auth_disconnect();
return 0;
}
diff -cr dbmail/maintenance.c dbmail-auth/maintenance.c
*** dbmail/maintenance.c 2003-02-12 08:36:53.000000000 -0800
--- dbmail-auth/maintenance.c 2003-02-12 08:29:22.000000000 -0800
***************
*** 165,170 ****
--- 165,171 ----
{
printf ("Failed. An error occured. Please check log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
printf ("Ok. [%llu] messages deleted.\n",deleted_messages);
***************
*** 179,184 ****
--- 180,186 ----
{
printf ("Failed. An error occured. Please check log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
printf ("Ok. [%llu] messages set for
deletion.\n",messages_set_to_delete);
***************
*** 193,198 ****
--- 195,201 ----
{
printf ("Failed. An error occured. Please check log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
***************
*** 240,245 ****
--- 243,249 ----
{
printf ("Failed. An error occured. Please check log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
***************
*** 289,294 ****
--- 293,299 ----
{
printf ("Failed. An error occured. Please check log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
***************
*** 339,344 ****
--- 344,350 ----
{
printf ("Failed. An error occured. Please check log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
***************
*** 390,395 ****
--- 396,402 ----
{
printf("Failed. Invalid argument [%s] specified\n",timespec);
db_disconnect();
+ auth_disconnect();
return -1;
}
***************
*** 397,402 ****
--- 404,410 ----
{
printf("Failed. Please check the log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
***************
*** 410,415 ****
--- 418,424 ----
{
printf("Failed. Please check the log.\n");
db_disconnect();
+ auth_disconnect();
return -1;
}
***************
*** 419,424 ****
--- 428,434 ----
printf ("Maintenance done.\n\n");
db_disconnect();
+ auth_disconnect();
return 0;
}
diff -cr dbmail/mini-injector.c dbmail-auth/mini-injector.c
*** dbmail/mini-injector.c 2003-02-12 08:36:53.000000000 -0800
--- dbmail-auth/mini-injector.c 2003-02-12 08:30:14.000000000 -0800
***************
*** 67,72 ****
--- 67,73 ----
if ((len = process_header(blk, &newlines)) == -1)
{
db_disconnect();
+ auth_disconnect();
trace(TRACE_FATAL, "main(): error processing header");
return -1;
}
***************
*** 84,89 ****
--- 85,91 ----
if (db_insert_message_block(blk, len, msgid) == -1)
{
db_disconnect();
+ auth_disconnect();
trace(TRACE_FATAL, "main(): error inserting message block");
return -1;
}
***************
*** 100,105 ****
--- 102,108 ----
/* cleanup */
db_disconnect();
+ auth_disconnect();
return 0;
}
diff -cr dbmail/raw-convert.c dbmail-auth/raw-convert.c
*** dbmail/raw-convert.c 2003-02-12 08:37:52.000000000 -0800
--- dbmail-auth/raw-convert.c 2003-02-12 08:30:36.000000000 -0800
***************
*** 195,200 ****
--- 195,201 ----
printf ("Table loading finished @ %s", ctime(&stop));
db_disconnect();
+ auth_disconnect();
return result;
}
diff -cr dbmail/serverchild.c dbmail-auth/serverchild.c
*** dbmail/serverchild.c 2003-02-12 08:37:52.000000000 -0800
--- dbmail-auth/serverchild.c 2003-02-12 08:31:11.000000000 -0800
***************
*** 100,105 ****
--- 100,106 ----
{
trace(TRACE_DEBUG, "ChildSighandler(): database connection still
open, closing");
db_disconnect();
+ auth_disconnect();
connected = 0;
}
***************
*** 145,150 ****
--- 146,152 ----
{
trace(TRACE_DEBUG, "ChildSighandler(): database connection still
open, closing");
db_disconnect();
+ auth_disconnect();
}
connected = 0;
***************
*** 338,343 ****
--- 340,346 ----
}
db_disconnect();
+ auth_disconnect();
connected = 0; /* FIXME a signal between this line and the previous
one
* would screw things up. Would like to have all this
in
* db_disconnect() making 'connected' obsolete
diff -cr dbmail/user.c dbmail-auth/user.c
*** dbmail/user.c 2003-02-12 08:37:52.000000000 -0800
--- dbmail-auth/user.c 2003-02-12 08:25:56.000000000 -0800
***************
*** 124,136 ****
default:
show_help();
db_disconnect();
! // auth_disconnect();
return 0;
}
db_disconnect();
! // auth_disconnect();
return result;
}
--- 124,136 ----
default:
show_help();
db_disconnect();
! auth_disconnect();
return 0;
}
db_disconnect();
! auth_disconnect();
return result;
}
