master
brl 9 years ago
parent fbe929474b
commit e03b9ce9cc

@ -6,11 +6,11 @@ import (
) )
type Config struct { type Config struct {
ProfileDir string `json:"profile_dir"` ProfileDir string `json:"profile_dir"`
ShellPath string `json:"shell_path"` ShellPath string `json:"shell_path"`
SandboxPath string `json:"sandbox_path"` SandboxPath string `json:"sandbox_path"`
AllowRootShell bool `json:"allow_root_shell"` AllowRootShell bool `json:"allow_root_shell"`
LogXpra bool `json:"log_xpra"` LogXpra bool `json:"log_xpra"`
} }
const DefaultConfigPath = "/etc/oz/oz.conf" const DefaultConfigPath = "/etc/oz/oz.conf"

@ -34,11 +34,11 @@ func testConnect(handler func(*TestMsg, *Message) error) (*testConnection, error
tc.wg.Done() tc.wg.Done()
return err return err
} }
s,err := NewServer(testSocket, testFactory, nil, wrapper) s, err := NewServer(testSocket, testFactory, nil, wrapper)
if err != nil { if err != nil {
return nil, err return nil, err
} }
c,err := Connect(testSocket, testFactory, nil) c, err := Connect(testSocket, testFactory, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }

@ -187,12 +187,12 @@ func (sbox *Sandbox) startXpraClient() {
} }
func (sbox *Sandbox) setupXpraLogging() { func (sbox *Sandbox) setupXpraLogging() {
stdout,err := sbox.xpra.Process.StdoutPipe() stdout, err := sbox.xpra.Process.StdoutPipe()
if err != nil { if err != nil {
sbox.daemon.Warning("Failed to create xpra stdout pipe: %v", err) sbox.daemon.Warning("Failed to create xpra stdout pipe: %v", err)
return return
} }
stderr,err := sbox.xpra.Process.StderrPipe() stderr, err := sbox.xpra.Process.StderrPipe()
if err != nil { if err != nil {
stdout.Close() stdout.Close()
sbox.daemon.Warning("Failed to create xpra stderr pipe: %v", err) sbox.daemon.Warning("Failed to create xpra stderr pipe: %v", err)

Loading…
Cancel
Save