Repository: qpid-dispatch Updated Branches: refs/heads/crolke-DISPATCH-188-1 04c9040f1 -> 5ca5f43d8
Clear stats object unconditionally to fix self tests Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/5ca5f43d Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/5ca5f43d Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/5ca5f43d Branch: refs/heads/crolke-DISPATCH-188-1 Commit: 5ca5f43d8ce185f1362cd483b8ade6b30610877c Parents: 04c9040 Author: Chuck Rolke <[email protected]> Authored: Fri Feb 12 15:06:42 2016 -0500 Committer: Chuck Rolke <[email protected]> Committed: Fri Feb 12 15:06:42 2016 -0500 ---------------------------------------------------------------------- python/qpid_dispatch_internal/policy/policy_manager.py | 8 ++++++++ src/policy.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5ca5f43d/python/qpid_dispatch_internal/policy/policy_manager.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/policy/policy_manager.py b/python/qpid_dispatch_internal/policy/policy_manager.py index 2d48d58..a2823c8 100644 --- a/python/qpid_dispatch_internal/policy/policy_manager.py +++ b/python/qpid_dispatch_internal/policy/policy_manager.py @@ -146,4 +146,12 @@ def policy_close_connection(mgr, conn_id): # # def policy_lookup_settings(mgr, appname, name, upolicy): + """ + Return settings for <app, usergroup> in upolicy map + @param mgr: + @param appname: + @param name: + @param upolicy: + @return: + """ return mgr.lookup_settings(appname, name, upolicy) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5ca5f43d/src/policy.c ---------------------------------------------------------------------- diff --git a/src/policy.c b/src/policy.c index 53e46ef..7e06199 100644 --- a/src/policy.c +++ b/src/policy.c @@ -269,7 +269,6 @@ bool qd_policy_open_lookup_user( uint64_t conn_id, qd_policy_settings_t *settings) { - memset(settings, 0, sizeof(*settings)); // Lookup the user/host/app for allow/deny and to get settings name qd_python_lock_state_t lock_state = qd_python_lock(); PyObject *module = PyImport_ImportModule("qpid_dispatch_internal.policy.policy_manager"); @@ -281,6 +280,9 @@ bool qd_policy_open_lookup_user( if (!result) { Py_XDECREF(module); qd_python_unlock(lock_state); + qd_log(policy->log_source, + POLICY_LOG_LEVEL, + "PyObject lookup_user is Null"); return false; } const char *res_string = PyString_AsString(result); @@ -298,6 +300,9 @@ bool qd_policy_open_lookup_user( if (!result2) { Py_XDECREF(upolicy); qd_python_unlock(lock_state); + qd_log(policy->log_source, + POLICY_LOG_LEVEL, + "PyObject lookup_settings is Null"); return false; } Py_XDECREF(result2); @@ -360,6 +365,7 @@ void qd_policy_amqp_open(void *context, bool discard) char settings_name[SETTINGS_NAME_SIZE]; uint32_t conn_id = qd_conn->connection_id; qd_policy_settings_t settings; + memset(&settings, 0, sizeof(settings)); if (!policy->enableAccessRules || (qd_policy_open_lookup_user(policy, username, hostip, app, conn_name, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
