OK, oops. I'm relying to my own mail here.

It seems that the function get_user_mysql in mdmysql.c only ever returns NULL if any problems are encountered.

Would it not be better to return an exit code if there is a:

1) database connection error - so that main.C can return EX_TEMPFAIL

2) general database error - that main.C can return EX_TEMPFAIL

3) connot find user error - so that main.C can return EX_NOUSER

If there is any uncertainty about the database (ldap or mysql) being up and correct tempfail rather than bounce!

Anyone?

Do I feel a patch coming on?

--- Chris Masters <roti...@yahoo.com> wrote:

__________________________________ Do you Yahoo!? The New Yahoo! Shopping - with improved product search http://shopping.yahoo.com

This SF.net email is sponsored by: SF.net Giveback Program. SourceForge.net hosts over 70,000 Open Source Projects. See the people who have HELPED US provide better services: Click here: http://sourceforge.net/supporters.php

_______________________________________________ Courier-maildrop mailing list Cour...@lists.sourceforge.net

static void dberror() { errexit=EX_TEMPFAIL; throw "Data source error. Please try again later."; }

mdmysqlrec *mrec = NULL;

if(mrec->error == 1) { free_mysql_rec(&mrec); return -1; } else if(mrec->error == 2) { free_mysql_rec(&mrec); return 0; }

setgroupid(mrec->gidnumber); setuid(mrec->uidnumber); 385a403,413 if(rec->error == 1) { free_ldap_rec(&rec); return -1; } else if(rec->error == 2) { free_ldap_rec(&rec); return 0; }

if(found == -1) { dberror(); } 761a795,800 #if USEMYSQL char *tempname, *slash; struct stat stat_buf2; #endif

#if USEMYSQL //create home directory if it does not exist if (VerboseLevel() > 1) merr << "maildrop: Creating directory " << h <<
"\n";

tempname = strdup(h); slash=tempname; while(*slash == '/') slash++;

while((slash = strchr(slash, '/'))) { *slash = '\0';

if(stat( (const char *)tempname, &stat_buf2 ) || !
S_ISDIR(stat_buf2.st_mode)) if(mkdir(tempname, 0755)) { if (VerboseLevel() > 1) merr << "maildrop: Error
making directory " << tempname << "\n";

errexit=EX_TEMPFAIL; throw "Could not make directory."; } else { if (VerboseLevel() > 1) merr << "maildrop: Made
directory " << tempname << "\n"; }

*slash++ = '/'; while(*slash == '/') slash++; } free(tempname); if (chdir(h) < 0) { errexit=EX_TEMPFAIL; throw "Could not change to directory."; }

#else

throw "Could not change to directory."; #endif 766a849

#include <signal.h> 14a16,17 void timed_out(){}

struct sigaction action; 24a29,31 char *tempname = NULL; char temphn2[64]; int pos1 = 0,pos2 = 0,i,timeout = 5; 25a33,37 //alarm timeout initialisation for databse connect bzero(&action, sizeof(action)); action.sa_handler = timed_out; action.sa_flags = 0; sigaction(SIGALRM, &action, 0); 26a39,59 tempname = (char*)strdup(cfg->hostname);

rec = (mdmysqlrec*)malloc(sizeof(mdmysqlrec)+1); rec->uid = NULL; rec->homedir = NULL; rec->maildir = NULL; rec->quota = NULL; rec->mailstatus = NULL; rec->error = 0;

for(i=0;i<strlen(tempname)+1;i++) { if(tempname[i] == ',' || tempname[i] == '\0') { pos2 = i; memset(temphn2,'\0',64); strncpy(temphn2,tempname+pos1,pos2-pos1); pos1 = pos2+1;

alarm(timeout);

mysql_init(&mysql_buf); mysql=mysql_real_connect(&mysql_buf, temphn2, cfg->dbuser,
cfg->dbpw,

mysql=mysql_connect(&mysql_buf, server, userid, password); 33a68 alarm(0); 34a70,77 if(mysql) break;

fprintf(stderr, "Could not connect to database %s\n", temphn2); } } free(tempname);

{ rec->error = 1; return rec; }

mysql_close(mysql); mysql=0; rec->error = 1; return rec;

mysql_close(mysql); rec->error = 1; return rec;

mysql_close(mysql); free(querybuf); rec->error = 1; return rec;

if (! result) { mysql_close(mysql); rec->error = 1; return rec;

mysql_free_result(result); mysql_close(mysql); rec->error = 2; return rec;

//following lines added my cmasters 27-09-2003 for virtual base capability rec->homedir=malloc(sizeof(char) * (strlen(row[3]) + strlen(cfg->maildir_base)
+ 1)); memset(rec->homedir,'\0',(strlen(row[3]) + strlen(cfg->maildir_base) + 1)); strcpy(rec->homedir,cfg->maildir_base); strcat(rec->homedir,row[3]); //rec->homedir=strdup(row[3]); rec->maildir=malloc(sizeof(char) * (strlen(row[3]) + strlen(cfg->maildir_base)
+ 1)); memset(rec->maildir,'\0',(strlen(row[4]) + strlen(cfg->maildir_base) + 1)); strcpy(rec->maildir,cfg->maildir_base); strcat(rec->maildir,row[4]); //rec->maildir=strdup(row[4]);

{ rec->error = 2; return rec; }

int error;

#include <signal.h> 11a13,14 void ldap_timed_out(){}

struct sigaction action; LDAP *ldap = NULL; 24a29,31 char *tempname = NULL; char temphn2[64]; int pos1 = 0,pos2 = 0,i,timeout = 5,bind_result = 0;

//alarm timeout initialisation for databse connect bzero(&action, sizeof(action)); action.sa_handler = ldap_timed_out; action.sa_flags = 0; sigaction(SIGALRM, &action, 0);

tempname = (char*)strdup(cfg->hostname); rec = (mdldaprec*)malloc(sizeof(mdldaprec)+1); rec->dn = NULL; rec->maildir = NULL; rec->mail = NULL; rec->homedirectory = NULL; rec->quota = NULL; rec->error = 0; 36a48,84 for(i=0;i<strlen(tempname)+1;i++) { if(tempname[i] == ',' || tempname[i] == '\0') { pos2 = i; memset(temphn2,'\0',64); strncpy(temphn2,tempname+pos1,pos2-pos1); pos1 = pos2+1;

alarm(timeout);

ldap = ldap_init(temphn2,cfg->port); if ( !ldap ) return NULL;

if ( cfg->binddn && cfg->bindpw ) { needbind = 1; bind_result =
ldap_simple_bind_s(ldap,cfg->binddn,cfg->bindpw); }

alarm(0);

if(bind_result == 0) break;

fprintf(stderr, "Could not connect to ldap %s\n", temphn2); } } free(tempname);

if (bind_result != 0) { rec->error = 1; return rec; }

if ( needbind ) ldap_unbind(ldap); free(mail_filter); free(filter); rec->error = 1; return rec;

if ( needbind ) ldap_unbind(ldap); free(mail_filter); free(filter); rec->error = 2; return rec;

rec->maildir= malloc(sizeof(char) * (strlen(values[0]) +
strlen(cfg->maildir_base_ldap) + 1)); strcpy(rec->maildir,cfg->maildir_base_ldap); strcat(rec->maildir,values[0]);

//rec->maildir = strdup(values[0]);

rec->homedirectory = malloc(sizeof(char) * (strlen(values[0]) +
strlen(cfg->maildir_base_ldap) + 1)); strcpy(rec->homedirectory,cfg->maildir_base_ldap); strcat(rec->homedirectory,values[0]); //rec->homedirectory = strdup(values[0]);

int error;