Ability to forcefully override umask

[nncp.git] / src / cfg.go

diff --git a/src/cfg.go b/src/cfg.go
index deebd1981d8d5c3cb80417e5ab1ebcbf40d68032..a4450e0ae9ff7877d4961322b8abc0bd90d41942 100644 (file)
--- a/src/cfg.go
+++ b/src/cfg.go
@@ -24,6 +24,7 @@ import (
        "log"
        "os"
        "path"
+       "strconv"
 
        "github.com/gorhill/cronexpr"
        "github.com/hjson/hjson-go"
@@ -97,8 +98,10 @@ type NotifyJSON struct {
 }
 
 type CfgJSON struct {
-       Spool  string      `json:"spool"`
-       Log    string      `json:"log"`
+       Spool string `json:"spool"`
+       Log   string `json:"log"`
+       Umask string `json:"umask",omitempty`
+
        Notify *NotifyJSON `json:"notify,omitempty"`
 
        Self  *NodeOurJSON        `json:"self"`
@@ -397,12 +400,22 @@ func CfgParse(data []byte) (*Ctx, error) {
        if !path.IsAbs(logPath) {
                return nil, errors.New("Log path must be absolute")
        }
+       var umaskForce *int
+       if cfgJSON.Umask != "" {
+               r, err := strconv.ParseUint(cfgJSON.Umask, 8, 16)
+               if err != nil {
+                       return nil, err
+               }
+               rInt := int(r)
+               umaskForce = &rInt
+       }
        ctx := Ctx{
-               Spool:   spoolPath,
-               LogPath: logPath,
-               Self:    self,
-               Neigh:   make(map[NodeId]*Node, len(cfgJSON.Neigh)),
-               Alias:   make(map[string]*NodeId),
+               Spool:      spoolPath,
+               LogPath:    logPath,
+               UmaskForce: umaskForce,
+               Self:       self,
+               Neigh:      make(map[NodeId]*Node, len(cfgJSON.Neigh)),
+               Alias:      make(map[string]*NodeId),
        }
        if cfgJSON.Notify != nil {
                if cfgJSON.Notify.File != nil {