← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to state/apiserver/apiserver.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/apiserver/apiserver.go
16
16
        "sync"
17
17
)
18
18
 
19
 
// TODO(rog) remove this when the rest of the system
20
 
// has been updated to set passwords appropriately.
21
 
var AuthenticationEnabled = false
22
 
 
23
19
// srvRoot represents a single client's connection to the state.
24
20
type srvRoot struct {
25
21
        admin    *srvAdmin
558
554
        if err != nil && !state.IsNotFound(err) {
559
555
                return err
560
556
        }
561
 
        // TODO(rog) remove
562
 
        if !AuthenticationEnabled {
563
 
                u.entity = entity
564
 
                return nil
565
 
        }
566
557
        // We return the same error when an entity
567
558
        // does not exist as for a bad password, so that
568
559
        // we don't allow unauthenticated users to find information