Merge "playground: Restructure security packages"
diff --git a/client/bundles/fortune/src/server/server.go b/client/bundles/fortune/src/server/server.go
index df41c3d..a7a204f 100644
--- a/client/bundles/fortune/src/server/server.go
+++ b/client/bundles/fortune/src/server/server.go
@@ -14,9 +14,9 @@
"v.io/v23"
"v.io/v23/rpc"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/security/securityflag"
"v.io/x/ref/lib/signals"
_ "v.io/x/ref/profiles"
- vflag "v.io/x/ref/security/flag"
"fortune"
)
@@ -78,7 +78,7 @@
}
// Start the fortune server at "fortune".
- if err := server.Serve("bakery/cookie/fortune", fortuneServer, vflag.NewAuthorizerOrDie()); err == nil {
+ if err := server.Serve("bakery/cookie/fortune", fortuneServer, securityflag.NewAuthorizerOrDie()); err == nil {
fmt.Printf("Fortune server serving under: bakery/cookie/fortune\n")
} else {
vlog.Panic("error serving fortune server: ", err)
diff --git a/client/lib/shell/shell_test.sh b/client/lib/shell/shell_test.sh
index 541f79c..1b524bd 100755
--- a/client/lib/shell/shell_test.sh
+++ b/client/lib/shell/shell_test.sh
@@ -265,7 +265,7 @@
# main "$@"
shell_test::enable_agent() {
if [[ ! -n ${shell_test_RUNNING_UNDER_AGENT+1} ]]; then
- local -r AGENTD="$(shell_test::build_go_binary 'v.io/x/ref/security/agent/agentd')"
+ local -r AGENTD="$(shell_test::build_go_binary 'v.io/x/ref/services/agent/agentd')"
local -r WORKDIR="${shell_test_WORK_DIR}"
export shell_test_RUNNING_UNDER_AGENT=1
V23_CREDENTIALS="${WORKDIR}/credentials" exec ${AGENTD} --no-passphrase --additional-principals="${WORKDIR}/childcredentials" bash -"$-" "$0" "$@"
