NNCP_SENDER envvar while sendmail calling

[nncp.git] / src / cypherpunks.ru / nncp / toss.go

diff --git a/src/cypherpunks.ru/nncp/toss.go b/src/cypherpunks.ru/nncp/toss.go
index fec62ae365a2c105e36f40b626298879ee13eca5..962b240152626e4f9299cb4a9584e47b2797677d 100644 (file)
--- a/src/cypherpunks.ru/nncp/toss.go
+++ b/src/cypherpunks.ru/nncp/toss.go
@@ -48,11 +48,6 @@ func newNotification(fromTo *FromToYAML, subject string) io.Reader {
 }
 
 func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
-       dirLock, err := ctx.LockDir(nodeId, TRx)
-       if err != nil {
-               return false
-       }
-       defer ctx.UnlockDir(dirLock)
        isBad := false
        for job := range ctx.Jobs(nodeId, TRx) {
                pktName := filepath.Base(job.Fd.Name())
@@ -103,7 +98,8 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                        if err != nil {
                                log.Fatalln(err)
                        }
-                       sendmail := ctx.Neigh[*job.PktEnc.Sender].Sendmail
+                       sender := ctx.Neigh[*job.PktEnc.Sender]
+                       sendmail := sender.Sendmail
                        if len(sendmail) == 0 {
                                ctx.LogE("rx", SdsAdd(sds, SDS{"err": "No sendmail configured"}), "")
                                isBad = true
@@ -117,6 +113,7 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                                                strings.Split(recipients, " ")...,
                                        )...,
                                )
+                               cmd.Env = append(cmd.Env, "NNCP_SENDER=" + sender.Id.String())
                                cmd.Stdin = decompressor
                                if err = cmd.Run(); err != nil {
                                        ctx.LogE("rx", SdsAdd(sds, SDS{"err": err}), "sendmail")