X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/942561da2455ee50a1eb82c8c4f2bdb5e25133d1..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/sendsbr.c diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 6bfc548e..ab4f73ce 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -1,33 +1,52 @@ - -/* - * sendsbr.c -- routines to help WhatNow/Send along +/* sendsbr.c -- routines to help WhatNow/Send along * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "sbr/folder_read.h" +#include "sbr/folder_free.h" +#include "sbr/context_find.h" +#include "sbr/brkstring.h" +#include "sbr/pidstatus.h" +#include "sbr/arglist.h" +#include "sbr/error.h" +#include "h/fmt_scan.h" +#include "h/fmt_compile.h" +#include "h/signals.h" #include #include -#include -#include -#include -#include +#include "h/mime.h" +#include "h/tws.h" +#include "h/utils.h" +#include "h/mts.h" #ifdef HAVE_SYS_TIME_H # include #endif #include +#ifdef OAUTH_SUPPORT +#include "h/oauth.h" +#endif +#include "h/done.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" +#include "sbr/message_id.h" + +#ifdef OAUTH_SUPPORT +static int setup_oauth_params(char *[], int *, const char *, const char **); +#endif /* OAUTH_SUPPORT */ + int debugsw = 0; /* global */ -int forwsw = 1; +bool forwsw = true; int inplace = 1; -int pushsw = 0; +bool pushsw; int splitsw = -1; -int unique = 0; -int verbsw = 0; +bool unique; +bool verbsw; char *altmsg = NULL; /* .. */ char *annotext = NULL; @@ -38,14 +57,17 @@ static jmp_buf env; /* * static prototypes */ -static void armed_done (int) NORETURN; static void alert (char *, int); static int tmp_fd (void); static void anno (int, struct stat *); static void annoaux (int); static int splitmsg (char **, int, char *, char *, struct stat *, int); static int sendaux (char **, int, char *, char *, struct stat *); - +static void handle_sendfrom(char **, int *, char *, const char *); +static int get_from_header_info(const char *, const char **, const char **, const char **); +static const char *get_message_header_info(FILE *, char *); +static void merge_profile_entry(const char *, const char *, char *[], int *); +static void armed_done (int) NORETURN; /* * Entry point into (back-end) routines to send message. @@ -53,7 +75,7 @@ static int sendaux (char **, int, char *, char *, struct stat *); int sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, - int rename_drft) + int rename_drft, const char *auth_svc) { int status, i; pid_t child; @@ -61,6 +83,10 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, struct stat sts; char **buildvec, *buildprogram; char *volatile drft = draft; + /* nvecs is volatile to prevent warning from gcc about possible clobbering + by longjmp. */ + volatile int nvecs = vecp; + int *nvecsp = (int *) &nvecs; /* * Run the mimebuildproc (which is by default mhbuild) on the message @@ -73,7 +99,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, break; case OK: - buildvec = argsplit(buildmimeproc, &buildprogram, &i); + buildvec = argsplit(buildmimeproc, &buildprogram, &i); buildvec[i++] = "-auto"; if (distfile) buildvec[i++] = "-dist"; @@ -82,7 +108,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, execvp(buildprogram, buildvec); fprintf(stderr, "unable to exec "); perror(buildmimeproc); - _exit(-1); + _exit(1); break; default: @@ -91,9 +117,9 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, break; } - done=armed_done; + set_done(armed_done); switch (setjmp (env)) { - case OK: + case OK: /* * If given -push and -unique (which is undocumented), then * rename the draft file. I'm not quite sure why. @@ -101,24 +127,47 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, if (pushsw && unique) { char *cp = m_mktemp2(drft, invo_name, NULL, NULL); if (cp == NULL) { - adios(NULL, "unable to create temporary file in %s", - get_temp_dir()); + die("unable to create temporary file"); } if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK) adios (file, "unable to rename %s to", drft); drft = file; } + /* + * Add in any necessary profile entries for xoauth + */ + + if (auth_svc) { +#ifdef OAUTH_SUPPORT + const char *errmsg; + if (setup_oauth_params(vec, nvecsp, auth_svc, &errmsg) != OK) { + die("%s", errmsg); + } +#else + die("send built without OAUTH_SUPPORT, " + "so auth_svc %s is not supported", auth_svc); +#endif /* OAUTH_SUPPORT */ + } + + /* + * Rework the vec based on From: header in draft, as specified + * by sendfrom-address entries in profile. + */ + if (context_find_prefix("sendfrom-")) { + handle_sendfrom(vec, nvecsp, draft, auth_svc); + } + /* * Check if we need to split the message into * multiple messages of type "message/partial". */ if (splitsw >= 0 && !distfile && stat ((char *) drft, &sts) != NOTOK && sts.st_size >= CPERMSG) { - status = splitmsg (vec, vecp, program, drft, + status = splitmsg (vec, nvecs, program, drft, st, splitsw) ? NOTOK : OK; } else { - status = sendaux (vec, vecp, program, drft, st) ? NOTOK : OK; + status = sendaux (vec, nvecs, program, drft, st) ? NOTOK : OK; } /* rename the original draft */ @@ -128,12 +177,12 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, advise (buffer, "unable to rename %s to", drft); break; - default: + default: status = DONE; break; } - done=exit; + set_done(exit); if (distfile) (void) m_unlink (distfile); @@ -152,11 +201,11 @@ splitmsg (char **vec, int vecp, char *program, char *drft, int compnum, nparts, partno, state, status; long pos, start; time_t clock; - char *cp, *dp, buffer[BUFSIZ], msgid[BUFSIZ]; + char *cp, *dp, buffer[NMH_BUFSIZ], msgid[BUFSIZ]; char subject[BUFSIZ]; char name[NAMESZ], partnum[BUFSIZ]; FILE *in; - m_getfld_state_t gstate = 0; + m_getfld_state_t gstate; if ((in = fopen (drft, "r")) == NULL) adios (drft, "unable to open for reading"); @@ -168,10 +217,11 @@ splitmsg (char **vec, int vecp, char *program, char *drft, * Scan through the message and examine the various header fields, * as well as locate the beginning of the message body. */ - m_getfld_track_filepos (&gstate, in); + gstate = m_getfld_state_init(in); + m_getfld_track_filepos2(&gstate); for (compnum = 1;;) { int bufsz = sizeof buffer; - switch (state = m_getfld (&gstate, name, buffer, &bufsz, in)) { + switch (state = m_getfld2(&gstate, name, buffer, &bufsz)) { case FLD: case FLDPLUS: compnum++; @@ -182,7 +232,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, if (!strcasecmp (name, "Message-ID")) { while (state == FLDPLUS) { bufsz = sizeof buffer; - state = m_getfld (&gstate, name, buffer, &bufsz, in); + state = m_getfld2(&gstate, name, buffer, &bufsz); } } else if (uprf (name, XXX_FIELD_PRF) || !strcasecmp (name, VRSN_FIELD) @@ -208,7 +258,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, dp = add (concat (name, ":", buffer, NULL), dp); while (state == FLDPLUS) { bufsz = sizeof buffer; - state = m_getfld (&gstate, name, buffer, &bufsz, in); + state = m_getfld2(&gstate, name, buffer, &bufsz); dp = add (buffer, dp); } } else { @@ -219,7 +269,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, cp = add (concat (name, ":", buffer, NULL), cp); while (state == FLDPLUS) { bufsz = sizeof buffer; - state = m_getfld (&gstate, name, buffer, &bufsz, in); + state = m_getfld2(&gstate, name, buffer, &bufsz); cp = add (buffer, cp); } } @@ -233,21 +283,21 @@ splitmsg (char **vec, int vecp, char *program, char *drft, case LENERR: case FMTERR: - adios (NULL, "message format error in component #%d", compnum); + die("message format error in component #%d", compnum); default: - adios (NULL, "getfld () returned %d", state); + die("getfld () returned %d", state); } break; } m_getfld_state_destroy (&gstate); if (cp == NULL) - adios (NULL, "headers missing from draft"); + die("headers missing from draft"); nparts = 1; pos = start; - while (fgets (buffer, sizeof(buffer) - 1, in)) { + while (fgets (buffer, sizeof buffer, in)) { long len; if ((pos += (len = strlen (buffer))) > CPERMSG) { @@ -259,8 +309,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, /* Only one part, nothing to split */ if (nparts == 1) { free (cp); - if (dp) - free (dp); + free(dp); fclose (in); return sendaux (vec, vecp, program, drft, st); @@ -287,8 +336,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, char *cp = m_mktemp2(drft, invo_name, NULL, &out); if (cp == NULL) { - adios(NULL, "unable to create temporary file in %s", - get_temp_dir()); + die("unable to create temporary file"); } strncpy(tmpdrf, cp, sizeof(tmpdrf)); @@ -318,12 +366,12 @@ splitmsg (char **vec, int vecp, char *program, char *drft, for (;;) { long len; - if (!fgets (buffer, sizeof(buffer) - 1, in)) { + if (!fgets (buffer, sizeof buffer, in)) { if (partno == nparts) break; - adios (NULL, "premature eof"); + die("premature eof"); } - + if ((pos += (len = strlen (buffer))) > CPERMSG) { fseek (in, -len, SEEK_CUR); break; @@ -338,7 +386,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, fclose (out); if (!pushsw && verbsw) { - printf ("\n"); + putchar('\n'); fflush (stdout); } @@ -366,8 +414,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, } free (cp); - if (dp) - free (dp); + free(dp); fclose (in); /* close the draft */ return status; @@ -383,7 +430,7 @@ static int sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) { pid_t child_id; - int i, status, fd, fd2; + int status, fd, fd2; char backup[BUFSIZ], buf[BUFSIZ]; fd = pushsw ? tmp_fd () : NOTOK; @@ -395,8 +442,8 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) snprintf (buf, sizeof(buf), "%d", fd2); vec[vecp++] = buf; } else { - admonish (NULL, "unable to create temporary file in %s " - "for annotation list", get_temp_dir()); + inform("unable to create temporary file in %s for " + "annotation list, continuing...", get_temp_dir()); } } vec[vecp++] = drft; @@ -404,9 +451,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) done (1); vec[vecp] = NULL; - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep (5); - + child_id = fork(); switch (child_id) { case -1: /* oops -- fork error */ @@ -417,7 +462,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) /* * child process -- send it * - * If fd is ok, then we are pushing and fd points to temp + * If fd is OK, then we are pushing and fd points to temp * file, so capture anything on stdout and stderr there. */ if (fd != NOTOK) { @@ -428,7 +473,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (postproc); - _exit (-1); + _exit(1); default: /* @@ -447,7 +492,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) alert (drft, fd); close (fd); } else { - advise (NULL, "message not delivered to anyone"); + inform("message not delivered to anyone"); } if (annotext && fd2 != NOTOK) close (fd2); @@ -473,18 +518,17 @@ static void alert (char *file, int out) { pid_t child_id; - int i, in, argp; + int in, argp; char buf[BUFSIZ]; char *program; char **arglist; - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep (5); - + child_id = fork(); switch (child_id) { case NOTOK: /* oops -- fork error */ advise ("fork", "unable to"); + /* FALLTHRU */ case OK: /* child process -- send it */ @@ -496,7 +540,7 @@ alert (char *file, int out) if ((in = open (file, O_RDONLY)) == NOTOK) { admonish (file, "unable to re-open"); } else { - lseek (out, (off_t) 0, SEEK_END); + lseek(out, 0, SEEK_END); strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf)); if (write (out, buf, strlen (buf)) < 0) { advise (file, "write"); @@ -515,7 +559,7 @@ alert (char *file, int out) admonish (buf, "unable to rename %s to", file); } } - lseek (out, (off_t) 0, SEEK_SET); + lseek(out, 0, SEEK_SET); dup2 (out, fileno (stdin)); close (out); /* create subject for error notification */ @@ -532,7 +576,7 @@ alert (char *file, int out) execvp (program, arglist); fprintf (stderr, "unable to exec "); perror (mailproc); - _exit (-1); + _exit(1); default: /* no waiting... */ break; @@ -549,10 +593,9 @@ tmp_fd (void) if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) return NOTOK; if (debugsw) - advise (NULL, "temporary file %s selected", tfile); - else - if (m_unlink (tfile) == NOTOK) - advise (tfile, "unable to remove"); + inform("temporary file %s selected", tfile); + else if (m_unlink (tfile) == NOTOK) + advise (tfile, "unable to remove"); return fd; } @@ -572,7 +615,7 @@ anno (int fd, struct stat *st) || st->st_dev != st2.st_dev || st->st_ino != st2.st_ino)) { if (debugsw) - admonish (NULL, "$mhaltmsg mismatch"); + inform("$mhaltmsg mismatch, continuing..."); return; } @@ -580,12 +623,12 @@ anno (int fd, struct stat *st) switch (child_id) { case NOTOK: /* oops */ if (!debugsw) - advise (NULL, - "unable to fork, so doing annotations by hand..."); + inform("unable to fork, so doing annotations by hand..."); if (cwd == NULL) - cwd = getcpy (pwd ()); + cwd = mh_xstrdup(pwd ()); + /* FALLTHRU */ - case OK: + case OK: /* block a few signals */ sigemptyset (&set); sigaddset (&set, SIGHUP); @@ -626,7 +669,7 @@ annoaux (int fd) if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) { if (debugsw) - admonish (NULL, "$mhfolder not set"); + inform("$mhfolder not set, continuing..."); return; } maildir = m_maildir (folder); @@ -637,20 +680,20 @@ annoaux (int fd) } if (!(mp = folder_read (folder, 0))) { if (debugsw) - admonish (NULL, "unable to read folder %s", folder); + inform("unable to read folder %s, continuing...", folder); return; } /* check for empty folder */ if (mp->nummsg == 0) { if (debugsw) - admonish (NULL, "no messages in %s", folder); + inform("no messages in %s, continuing...", folder); goto oops; } if ((cp = getenv ("mhmessages")) == NULL || *cp == 0) { if (debugsw) - admonish (NULL, "$mhmessages not set"); + inform("$mhmessages not set, continuing..."); goto oops; } if (!debugsw /* MOBY HACK... */ @@ -662,21 +705,21 @@ annoaux (int fd) } else fd2 = NOTOK; - for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++) + for (ap = brkstring (cp = mh_xstrdup(cp), " ", NULL); *ap; ap++) m_convert (mp, *ap); free (cp); if (fd2 != NOTOK) dup2 (fd2, fileno (stderr)); if (mp->numsel == 0) { if (debugsw) - admonish (NULL, "no messages to annotate"); + inform("no messages to annotate, continuing..."); goto oops; } - lseek (fd, (off_t) 0, SEEK_SET); + lseek(fd, 0, SEEK_SET); if ((fp = fdopen (fd, "r")) == NULL) { if (debugsw) - admonish (NULL, "unable to fdopen annotation list"); + inform("unable to fdopen annotation list, continuing..."); goto oops; } cp = NULL; @@ -685,12 +728,12 @@ annoaux (int fd) fclose (fp); if (debugsw) - advise (NULL, "annotate%s with %s: \"%s\"", + inform("annotate%s with %s: \"%s\"", inplace ? " inplace" : "", annotext, cp); for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { if (debugsw) - advise (NULL, "annotate message %d", msgnum); + inform("annotate message %d", msgnum); annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0); } } @@ -703,6 +746,278 @@ oops: static void +handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) +{ + const char *addr, *host; + const char *message; + + /* Extract address and host from From: header line in draft. */ + if (get_from_header_info(draft, &addr, &host, &message) != OK) { + adios(draft, "%s", message); + } + + /* Merge in any address or host specific switches to post(1) from profile. */ + merge_profile_entry(addr, host, vec, vecp); + free((void *) host); + free((void *) addr); + + vec[*vecp] = NULL; + + { + char **vp; + + for (vp = vec; *vp; ++vp) { + if (strcmp(*vp, "xoauth2") == 0) { +#ifdef OAUTH_SUPPORT + if (setup_oauth_params(vec, vecp, auth_svc, &message) != OK) { + die("%s", message); + } + break; +#else + NMH_UNUSED(auth_svc); + die("send built without OAUTH_SUPPORT, " + "so -saslmech xoauth2 is not supported"); +#endif /* OAUTH_SUPPORT */ + } + } + } +} + + +#ifdef OAUTH_SUPPORT +/* + * For XOAUTH2, append profile entries so post can do the heavy lifting + */ +static int +setup_oauth_params(char *vec[], int *vecp, const char *auth_svc, + const char **message) +{ + const char *saslmech = NULL, *user = NULL; + mh_oauth_service_info svc; + char errbuf[256]; + int i; + + /* Make sure we have all the information we need. */ + for (i = 1; i < *vecp; ++i) { + /* Don't support abbreviated switches, to avoid collisions in the + future if new ones are added. */ + if (! strcmp(vec[i-1], "-saslmech")) { + saslmech = vec[i]; + } else if (! strcmp(vec[i-1], "-user")) { + user = vec[i]; + } else if (! strcmp(vec[i-1], "-authservice")) { + auth_svc = vec[i]; + } + } + + if (auth_svc == NULL) { + if (saslmech && ! strcasecmp(saslmech, "xoauth2")) { + *message = "must specify -authservice with -saslmech xoauth2"; + return NOTOK; + } + } else { + if (user == NULL) { + *message = "must specify -user with -saslmech xoauth2"; + return NOTOK; + } + + if (saslmech && ! strcasecmp(saslmech, "xoauth2")) { + if (! mh_oauth_get_service_info(auth_svc, &svc, errbuf, + sizeof(errbuf))) + die("Unable to retrieve oauth profile entries: %s", + errbuf); + + vec[(*vecp)++] = mh_xstrdup("-authservice"); + vec[(*vecp)++] = mh_xstrdup(auth_svc); + vec[(*vecp)++] = mh_xstrdup("-oauthcredfile"); + vec[(*vecp)++] = mh_oauth_cred_fn(auth_svc); + vec[(*vecp)++] = mh_xstrdup("-oauthclientid"); + vec[(*vecp)++] = getcpy(svc.client_id); + vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret"); + vec[(*vecp)++] = getcpy(svc.client_secret); + vec[(*vecp)++] = mh_xstrdup("-oauthauthendpoint"); + vec[(*vecp)++] = getcpy(svc.auth_endpoint); + vec[(*vecp)++] = mh_xstrdup("-oauthredirect"); + vec[(*vecp)++] = getcpy(svc.redirect_uri); + vec[(*vecp)++] = mh_xstrdup("-oauthtokenendpoint"); + vec[(*vecp)++] = getcpy(svc.token_endpoint); + vec[(*vecp)++] = mh_xstrdup("-oauthscope"); + vec[(*vecp)++] = getcpy(svc.scope); + } + } + + return 0; +} +#endif /* OAUTH_SUPPORT */ + + +/* + * Extract user and domain from From: header line in draft. + */ +static int +get_from_header_info(const char *filename, const char **addr, const char **host, const char **message) +{ + struct stat st; + FILE *in; + + if (stat (filename, &st) == NOTOK) { + *message = "unable to stat draft file"; + return NOTOK; + } + + if ((in = fopen (filename, "r")) != NULL) { + /* There must be a non-blank Envelope-From or {Resent-}Sender or + {Resent-}From header. */ + char *addrformat = "%(addr{Envelope-From})"; + char *hostformat = "%(host{Envelope-From})"; + + if ((*addr = get_message_header_info (in, addrformat)) == NULL || + !**addr) { + addrformat = distfile == NULL ? "%(addr{Sender})" : "%(addr{Resent-Sender})"; + hostformat = distfile == NULL ? "%(host{Sender})" : "%(host{Resent-Sender})"; + + if ((*addr = get_message_header_info (in, addrformat)) == NULL) { + addrformat = distfile == NULL ? "%(addr{From})" : "%(addr{Resent-From})"; + hostformat = distfile == NULL ? "%(host{From})" : "%(host{Resent-From})"; + + if ((*addr = get_message_header_info (in, addrformat)) == NULL) { + *message = "unable to find sender address in"; + fclose(in); + return NOTOK; + } + } + } + + /* Use the hostformat that corresponds to the successful addrformat. */ + if ((*host = get_message_header_info(in, hostformat)) == NULL) { + *message = "unable to find sender host"; + fclose(in); + return NOTOK; + } + fclose(in); + + return OK; + } + + *message = "unable to open"; + return NOTOK; +} + + +/* + * Get formatted information from header of a message. + * Adapted from process_single_file() in uip/fmttest.c. + */ +static const char * +get_message_header_info(FILE *in, char *format) +{ + int dat[5]; + struct format *fmt; + struct stat st; + bool parsing_header; + m_getfld_state_t gstate; + charstring_t buffer = charstring_create(0); + char *retval; + + dat[0] = dat[1] = dat[4] = 0; + dat[2] = fstat(fileno(in), &st) == 0 ? st.st_size : 0; + dat[3] = INT_MAX; + + (void) fmt_compile(new_fs(NULL, NULL, format), &fmt, 1); + free_fs(); + + /* + * Read in the message and process the header. + */ + rewind (in); + parsing_header = true; + gstate = m_getfld_state_init(in); + do { + char name[NAMESZ], rbuf[NMH_BUFSIZ]; + int bufsz = sizeof rbuf; + int state = m_getfld2(&gstate, name, rbuf, &bufsz); + + switch (state) { + case FLD: + case FLDPLUS: { + int bucket = fmt_addcomptext(name, rbuf); + + if (bucket != -1) { + while (state == FLDPLUS) { + bufsz = sizeof rbuf; + state = m_getfld2(&gstate, name, rbuf, &bufsz); + fmt_appendcomp(bucket, name, rbuf); + } + } + + while (state == FLDPLUS) { + bufsz = sizeof rbuf; + state = m_getfld2(&gstate, name, rbuf, &bufsz); + } + break; + } + default: + parsing_header = false; + } + } while (parsing_header); + m_getfld_state_destroy(&gstate); + + fmt_scan(fmt, buffer, INT_MAX, dat, NULL); + fmt_free(fmt, 1); + + /* Trim trailing newline, if any. */ + retval = rtrim(charstring_buffer_copy((buffer))); + charstring_free(buffer); + if (*retval) + return retval; + + free(retval); + return NULL; +} + + +/* + * Look in profile for entry corresponding to addr or host, and add its contents to vec. + * + * Could do some of this automatically, by looking for: + * 1) access-$(mbox{from}) in oauth-svc file using mh_oauth_cred_load(), which isn't + * static and doesn't have side effects; free the result with mh_oauth_cred_free()) + * 2) machine $(mbox{from}) in creds + * If no -server passed in from profile or commandline, could use smtp..com for gmail, + * but that might not generalize for other svcs. + */ +static void +merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp) +{ + char *addr_entry = concat("sendfrom-", addr, NULL); + char *profile_entry = context_find(addr_entry); + + free(addr_entry); + if (profile_entry == NULL) { + /* No entry for the user. Look for one for the host. */ + char *host_entry = concat("sendfrom-", host, NULL); + + profile_entry = context_find(host_entry); + free(host_entry); + } + + /* Use argsplit() to do the real work of splitting the args in the profile entry. */ + if (profile_entry && *profile_entry) { + int profile_vecp; + char *file; + char **profile_vec = argsplit(profile_entry, &file, &profile_vecp); + int i; + + for (i = 0; i < profile_vecp; ++i) { + vec[(*vecp)++] = getcpy(profile_vec[i]); + } + + arglist_free(file, profile_vec); + } +} + + +static void NORETURN armed_done (int status) { longjmp (env, status ? status : NOTOK);