dsdb: add defines for sessionInfo and networkSessionInfo

Replace uses of the string "sessionInfo" with the constant
DSDB_SESSION_INFO, and "networkSessionInfo" with the constant
DSDB_NETWORK_SESSION_INFO.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/ldb-samba/ldb_ildap.c b/lib/ldb-samba/ldb_ildap.c
index 0cdf738e0be2e1af1c70ee0a2e31bbadafefcde5..1b9a25ea3a7bcd3762919e1d59597865ea21b692 100644 (file)
--- a/lib/ldb-samba/ldb_ildap.c
+++ b/lib/ldb-samba/ldb_ildap.c
@@ -48,6 +48,7 @@
 #include "libcli/ldap/ldap_client.h"
 #include "auth/auth.h"
 #include "auth/credentials/credentials.h"
+#include "dsdb/common/util.h"
 
 struct ildb_private {
        struct ldap_connection *ldap;
@@ -833,7 +834,9 @@ static int ildb_connect(struct ldb_context *ldb, const char *url,
        /* caller can optionally setup credentials using the opaque token 'credentials' */
        creds = talloc_get_type(ldb_get_opaque(ldb, "credentials"), struct cli_credentials);
        if (creds == NULL) {
-               struct auth_session_info *session_info = talloc_get_type(ldb_get_opaque(ldb, "sessionInfo"), struct auth_session_info);
+               struct auth_session_info *session_info = talloc_get_type(
+                       ldb_get_opaque(ldb, DSDB_SESSION_INFO),
+                       struct auth_session_info);
                if (session_info) {
                        creds = session_info->credentials;
                }

diff --git a/lib/ldb-samba/ldb_matching_rules.c b/lib/ldb-samba/ldb_matching_rules.c
index aa8697941c6325f3313228fd76f4bca8293c40f4..063a5d3c3a322bcd363815f65136fdf39e3a97ec 100644 (file)
--- a/lib/ldb-samba/ldb_matching_rules.c
+++ b/lib/ldb-samba/ldb_matching_rules.c
@@ -361,7 +361,7 @@ static int dsdb_match_for_expunge(struct ldb_context *ldb,
        }
 
        session_info
-               = talloc_get_type(ldb_get_opaque(ldb, "sessionInfo"),
+               = talloc_get_type(ldb_get_opaque(ldb, DSDB_SESSION_INFO),
                                  struct auth_session_info);
        if (security_session_user_level(session_info, NULL) != SECURITY_SYSTEM) {
                return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;

diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
index 34148a13ab31f8619502364ea7985087a4a24e45..6c2c707284e9bf5b093c491fd7a3e4c17b8e4842 100644 (file)
--- a/lib/ldb-samba/ldb_wrap.c
+++ b/lib/ldb-samba/ldb_wrap.c
@@ -33,6 +33,7 @@
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
+#include "dsdb/common/util.h"
 #include "param/param.h"
 #include "../lib/util/dlinklist.h"
 #include "lib/util/util_paths.h"
@@ -146,7 +147,7 @@ char *wrap_casefold(void *context, void *mem_ctx, const char *s, size_t n)
        ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
 
        if (session_info) {
-               if (ldb_set_opaque(ldb, "sessionInfo", session_info)) {
+               if (ldb_set_opaque(ldb, DSDB_SESSION_INFO, session_info)) {
                        talloc_free(ldb);
                        return NULL;
                }

diff --git a/lib/ldb-samba/pyldb.c b/lib/ldb-samba/pyldb.c
index dfcb5510e6dc9e4035c496e7c45276ed33727c1a..57c5397bc0689ebc09edd8a2370f974666c91508 100644 (file)
--- a/lib/ldb-samba/pyldb.c
+++ b/lib/ldb-samba/pyldb.c
@@ -29,6 +29,7 @@
 #include "ldb_wrap.h"
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "auth/pyauth.h"
+#include "source4/dsdb/common/util.h"
 
 
 static PyObject *pyldb_module;
@@ -194,7 +195,7 @@ static PyObject *py_ldb_set_session_info(PyObject *self, PyObject *args)
 
        info = PyAuthSession_AsSession(py_session_info);
 
-       ldb_set_opaque(ldb, "sessionInfo", info);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, info);
 
        Py_RETURN_NONE;
 }

diff --git a/lib/ldb-samba/samba_extensions.c b/lib/ldb-samba/samba_extensions.c
index 28c820ecbee34f6e3b5c112ac05cc4d54eb16fb2..45b01e1b447acb3d4bb1e76f0bf3469bc3fffdd5 100644 (file)
--- a/lib/ldb-samba/samba_extensions.c
+++ b/lib/ldb-samba/samba_extensions.c
@@ -29,6 +29,7 @@
 #include "auth/auth.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
+#include "dsdb/common/util.h"
 #include "ldb_wrap.h"
 #include "popt.h"
 
@@ -84,7 +85,11 @@ static int extensions_hook(struct ldb_context *ldb, enum ldb_module_hook_type t)
                }
                gensec_init();
 
-               if (ldb_set_opaque(ldb, "sessionInfo", system_session(cmdline_lp_ctx))) {
+               if (ldb_set_opaque(
+                       ldb,
+                       DSDB_SESSION_INFO,
+                       system_session(cmdline_lp_ctx))) {
+
                        return ldb_operr(ldb);
                }
                if (ldb_set_opaque(ldb, "credentials",

diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index 9cb85f62933309197834c81a8caf6a0c664db246..ac785f0d4f3eb761f7602de00a83835a27a97747 100644 (file)
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -1596,7 +1596,10 @@ static bool b9_set_session_info(struct dlz_bind9_data *state, const char *name)
                return true;
        }
 
-       ret = ldb_set_opaque(state->samdb, "sessionInfo", state->session_info);
+       ret = ldb_set_opaque(
+               state->samdb,
+               DSDB_SESSION_INFO,
+               state->session_info);
        if (ret != LDB_SUCCESS) {
                state->log(ISC_LOG_ERROR, "samba_dlz: unable to set session info");
                return false;
@@ -1610,7 +1613,10 @@ static bool b9_set_session_info(struct dlz_bind9_data *state, const char *name)
  */
 static void b9_reset_session_info(struct dlz_bind9_data *state)
 {
-       ldb_set_opaque(state->samdb, "sessionInfo", system_session(state->lp));
+       ldb_set_opaque(
+               state->samdb,
+               DSDB_SESSION_INFO,
+               system_session(state->lp));
 }
 
 /*

diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index 94f3d9bea3eddf1da33bd433b450d5a330c562c7..a48f27bd992f435d670906e6e09ee697b793a9d7 100644 (file)
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -661,7 +661,10 @@ static WERROR handle_updates(struct dns_server *dns,
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
        if (tkey != NULL) {
-               ret = ldb_set_opaque(dns->samdb, "sessionInfo", tkey->session_info);
+               ret = ldb_set_opaque(
+                       dns->samdb,
+                       DSDB_SESSION_INFO,
+                       tkey->session_info);
                if (ret != LDB_SUCCESS) {
                        DEBUG(1, ("unable to set session info\n"));
                        werror = DNS_ERR(SERVER_FAILURE);
@@ -693,8 +696,10 @@ static WERROR handle_updates(struct dns_server *dns,
        TALLOC_FREE(tmp_ctx);
 
        if (tkey != NULL) {
-               ldb_set_opaque(dns->samdb, "sessionInfo",
-                              system_session(dns->task->lp_ctx));
+               ldb_set_opaque(
+                       dns->samdb,
+                       DSDB_SESSION_INFO,
+                       system_session(dns->task->lp_ctx));
        }
 
        return WERR_OK;
@@ -703,8 +708,10 @@ failed:
        ldb_transaction_cancel(dns->samdb);
 
        if (tkey != NULL) {
-               ldb_set_opaque(dns->samdb, "sessionInfo",
-                              system_session(dns->task->lp_ctx));
+               ldb_set_opaque(
+                       dns->samdb,
+                       DSDB_SESSION_INFO,
+                       system_session(dns->task->lp_ctx));
        }
 
        TALLOC_FREE(tmp_ctx);

diff --git a/source4/dsdb/common/util.h b/source4/dsdb/common/util.h
index 85fabde3c2969ff5fbc8fbd428cc2c8447f66e2d..c188c68fc95a894048b943a10ce92e0ac1f6ce37 100644 (file)
--- a/source4/dsdb/common/util.h
+++ b/source4/dsdb/common/util.h
@@ -71,6 +71,12 @@ bool is_attr_in_list(const char * const * attrs, const char *attr);
        "unicodePwd", \
        "dBCSPwd"
 
+/*
+ * ldb opaque values used to pass the user session information to ldb modules
+ */
+#define DSDB_SESSION_INFO "sessionInfo"
+#define DSDB_NETWORK_SESSION_INFO "networkSessionInfo"
+
 struct GUID;
 
 char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid);

diff --git a/source4/dsdb/samdb/ldb_modules/acl_util.c b/source4/dsdb/samdb/ldb_modules/acl_util.c
index 1f64ab18658621db220483aff31abfea70342015..6d645b10fe2b623103499ae77ae52010bd7c5cf5 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/acl_util.c
+++ b/source4/dsdb/samdb/ldb_modules/acl_util.c
@@ -39,7 +39,9 @@ struct security_token *acl_user_token(struct ldb_module *module)
 {
        struct ldb_context *ldb = ldb_module_get_ctx(module);
        struct auth_session_info *session_info
-               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
+               = (struct auth_session_info *)ldb_get_opaque(
+                       ldb,
+                       DSDB_SESSION_INFO);
        if(!session_info) {
                return NULL;
        }
@@ -67,7 +69,9 @@ int dsdb_module_check_access_on_dn(struct ldb_module *module,
        };
        struct ldb_context *ldb = ldb_module_get_ctx(module);
        struct auth_session_info *session_info
-               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
+               = (struct auth_session_info *)ldb_get_opaque(
+                       ldb,
+                       DSDB_SESSION_INFO);
        if(!session_info) {
                return ldb_operr(ldb);
        }
@@ -231,7 +235,9 @@ const char *acl_user_name(TALLOC_CTX *mem_ctx, struct ldb_module *module)
 {
        struct ldb_context *ldb = ldb_module_get_ctx(module);
        struct auth_session_info *session_info
-               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
+               = (struct auth_session_info *)ldb_get_opaque(
+                       ldb,
+                       DSDB_SESSION_INFO);
        if (!session_info) {
                return "UNKNOWN (NULL)";
        }

diff --git a/source4/dsdb/samdb/ldb_modules/audit_util.c b/source4/dsdb/samdb/ldb_modules/audit_util.c
index 9e2d2d5b8a9dde46b9591642e7b660b35a967fb0..e36ddcb90eb15af444a56753f7083767525ce60d 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/audit_util.c
+++ b/source4/dsdb/samdb/ldb_modules/audit_util.c
@@ -134,7 +134,7 @@ const struct dom_sid *dsdb_audit_get_actual_sid(struct ldb_context *ldb)
        struct auth_session_info *session = NULL;
        struct security_token *user_token = NULL;
 
-       opaque_session = ldb_get_opaque(ldb, "networkSessionInfo");
+       opaque_session = ldb_get_opaque(ldb, DSDB_NETWORK_SESSION_INFO);
        if (opaque_session == NULL) {
                return NULL;
        }
@@ -240,7 +240,7 @@ const struct GUID *dsdb_audit_get_unique_session_token(
        struct auth_session_info *session_info
                = (struct auth_session_info *)ldb_get_opaque(
                        ldb,
-                       "sessionInfo");
+                       DSDB_SESSION_INFO);
        if(!session_info) {
                return NULL;
        }
@@ -265,7 +265,7 @@ const struct GUID *dsdb_audit_get_actual_unique_session_token(
        struct auth_session_info *session_info
                = (struct auth_session_info *)ldb_get_opaque(
                        ldb,
-                       "networkSessionInfo");
+                       DSDB_NETWORK_SESSION_INFO);
        if(!session_info) {
                return NULL;
        }

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 4c45e9b8f826ee0692ffbe9166ca9facd95a31a7..9018b750ab5837e2adc4a4bb2ed17aa1eb1a1579 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -256,7 +256,7 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
        enum ndr_err_code ndr_err;
        struct ldb_context *ldb = ldb_module_get_ctx(module);
        struct auth_session_info *session_info
-               = ldb_get_opaque(ldb, "sessionInfo");
+               = ldb_get_opaque(ldb, DSDB_SESSION_INFO);
        const struct dom_sid *domain_sid = samdb_domain_sid(ldb);
        char *sddl_sd;
        struct dom_sid *default_owner;

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 751fe15d1a17b8de3789131de5a55e622efb737c..c5849818411a7286d2974673fc1b858a4e2b9d10 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -468,7 +468,9 @@ static int rootdse_add_dynamic(struct rootdse_context *ac, struct ldb_message *m
        if (do_attribute_explicit(attrs, "tokenGroups")) {
                /* Obtain the user's session_info */
                struct auth_session_info *session_info
-                       = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
+                       = (struct auth_session_info *)ldb_get_opaque(
+                               ldb,
+                               DSDB_SESSION_INFO);
                if (session_info && session_info->security_token) {
                        /* The list of groups this user is in */
                        for (i = 0; i < session_info->security_token->num_sids; i++) {
@@ -734,7 +736,9 @@ static int rootdse_filter_operations(struct ldb_module *module, struct ldb_reque
                return LDB_SUCCESS;
        }
 
-       session_info = (struct auth_session_info *)ldb_get_opaque(ldb_module_get_ctx(module), "sessionInfo");
+       session_info = (struct auth_session_info *)ldb_get_opaque(
+               ldb_module_get_ctx(module),
+               DSDB_SESSION_INFO);
        if (session_info) {
                is_anonymous = security_token_is_anonymous(session_info->security_token);
        }
@@ -1273,7 +1277,9 @@ static int rootdse_enableoptionalfeature(struct ldb_module *module, struct ldb_r
        struct ldb_dn *op_feature_scope_dn;
        struct ldb_message *op_feature_msg;
        struct auth_session_info *session_info =
-                               (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
+               (struct auth_session_info *)ldb_get_opaque(
+                       ldb,
+                       DSDB_SESSION_INFO);
        TALLOC_CTX *tmp_ctx = talloc_new(ldb);
        int ret;
        const char *guid_string;
@@ -1549,7 +1555,9 @@ static int rootdse_become_master(struct ldb_module *module,
        struct fsmo_transfer_state *fsmo;
        struct tevent_req *treq;
 
-       session_info = (struct auth_session_info *)ldb_get_opaque(ldb_module_get_ctx(module), "sessionInfo");
+       session_info = (struct auth_session_info *)ldb_get_opaque(
+               ldb_module_get_ctx(module),
+               DSDB_SESSION_INFO);
        level = security_session_user_level(session_info, NULL);
        if (level < SECURITY_ADMINISTRATOR) {
                return ldb_error(ldb, LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS, "Denied rootDSE modify for non-administrator");

diff --git a/source4/dsdb/samdb/ldb_modules/tests/test_audit_log.c b/source4/dsdb/samdb/ldb_modules/tests/test_audit_log.c
index 1e355042b48e30638444c1f7077794a71fb331fa..55e4335efce02cf0c8f56a31ed3851c66e0cb861 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/tests/test_audit_log.c
+++ b/source4/dsdb/samdb/ldb_modules/tests/test_audit_log.c
@@ -444,7 +444,7 @@ static void test_operation_json(void **state)
        sess->security_token = token;
        GUID_from_string(SESSION, &session_id);
        sess->unique_session_token = session_id;
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
 
        msg = talloc_zero(ctx, struct ldb_message);
        dn = ldb_dn_new(ctx, ldb, DN);
@@ -639,7 +639,7 @@ static void test_as_system_operation_json(void **state)
        sess->security_token = token;
        GUID_from_string(SESSION, &session_id);
        sess->unique_session_token = session_id;
-       ldb_set_opaque(ldb, "networkSessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_NETWORK_SESSION_INFO, sess);
 
        sys_sess = talloc_zero(ctx, struct auth_session_info);
        sys_token = talloc_zero(ctx, struct security_token);
@@ -648,7 +648,7 @@ static void test_as_system_operation_json(void **state)
        sys_sess->security_token = sys_token;
        GUID_from_string(SYS_SESSION, &sys_session_id);
        sess->unique_session_token = sys_session_id;
-       ldb_set_opaque(ldb, "sessionInfo", sys_sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sys_sess);
 
        msg = talloc_zero(ctx, struct ldb_message);
        dn = ldb_dn_new(ctx, ldb, DN);
@@ -913,7 +913,7 @@ static void test_password_change_json(void **state)
        sess->security_token = token;
        GUID_from_string(SESSION, &session_id);
        sess->unique_session_token = session_id;
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
 
        msg = talloc_zero(ctx, struct ldb_message);
        dn = ldb_dn_new(ctx, ldb, DN);
@@ -1512,7 +1512,7 @@ static void test_operation_hr(void **state)
        sess->security_token = token;
        GUID_from_string(SESSION, &session_id);
        sess->unique_session_token = session_id;
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
 
        msg = talloc_zero(ctx, struct ldb_message);
        dn = ldb_dn_new(ctx, ldb, DN);
@@ -1614,7 +1614,7 @@ static void test_as_system_operation_hr(void **state)
        sess->security_token = token;
        GUID_from_string(SESSION, &session_id);
        sess->unique_session_token = session_id;
-       ldb_set_opaque(ldb, "networkSessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_NETWORK_SESSION_INFO, sess);
 
        sys_sess = talloc_zero(ctx, struct auth_session_info);
        sys_token = talloc_zero(ctx, struct security_token);
@@ -1623,7 +1623,7 @@ static void test_as_system_operation_hr(void **state)
        sys_sess->security_token = sys_token;
        GUID_from_string(SYS_SESSION, &sys_session_id);
        sess->unique_session_token = sys_session_id;
-       ldb_set_opaque(ldb, "sessionInfo", sys_sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sys_sess);
 
        msg = talloc_zero(ctx, struct ldb_message);
        dn = ldb_dn_new(ctx, ldb, DN);
@@ -1770,7 +1770,7 @@ static void test_password_change_hr(void **state)
        sess->security_token = token;
        GUID_from_string(SESSION, &session_id);
        sess->unique_session_token = session_id;
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
 
        msg = talloc_zero(ctx, struct ldb_message);
        dn = ldb_dn_new(ctx, ldb, DN);

diff --git a/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c b/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c
index 7f7e1b5c769619a3a4c97b661e0dec6134314e54..ed27e97330babb46aab8fe3c42de566fd6c1e3c4 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c
+++ b/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c
@@ -557,7 +557,7 @@ static void test_dsdb_audit_get_user_sid(void **state)
        /*
         * Now add a NULL session info
         */
-       ldb_set_opaque(ldb, "sessionInfo", NULL);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
        sid = dsdb_audit_get_user_sid(module);
        assert_null(sid);
 
@@ -565,7 +565,7 @@ static void test_dsdb_audit_get_user_sid(void **state)
         * Now add a session info with no user sid
         */
        sess = talloc_zero(ctx, struct auth_session_info);
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
        sid = dsdb_audit_get_user_sid(module);
        assert_null(sid);
 
@@ -636,7 +636,7 @@ static void test_dsdb_audit_get_actual_sid(void **state)
        /*
         * Now add a NULL session info
         */
-       ldb_set_opaque(ldb, "networkSessionInfo", NULL);
+       ldb_set_opaque(ldb, DSDB_NETWORK_SESSION_INFO, NULL);
        sid = dsdb_audit_get_actual_sid(ldb);
        assert_null(sid);
 
@@ -644,7 +644,7 @@ static void test_dsdb_audit_get_actual_sid(void **state)
         * Now add a session info with no user sid
         */
        sess = talloc_zero(ctx, struct auth_session_info);
-       ldb_set_opaque(ldb, "networkSessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_NETWORK_SESSION_INFO, sess);
        sid = dsdb_audit_get_actual_sid(ldb);
        assert_null(sid);
 
@@ -716,14 +716,14 @@ static void test_dsdb_audit_is_system_session(void **state)
        /*
         * Now add a NULL session info
         */
-       ldb_set_opaque(ldb, "sessionInfo", NULL);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, NULL);
        assert_false(dsdb_audit_is_system_session(module));
 
        /*
         * Now add a session info with no user sid
         */
        sess = talloc_zero(ctx, struct auth_session_info);
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
        assert_false(dsdb_audit_is_system_session(module));
 
        /*
@@ -805,7 +805,7 @@ static void test_dsdb_audit_get_unique_session_token(void **state)
        /*
         * Now add a NULL session info
         */
-       ldb_set_opaque(ldb, "sessionInfo", NULL);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, NULL);
        guid = dsdb_audit_get_unique_session_token(module);
        assert_null(guid);
 
@@ -815,7 +815,7 @@ static void test_dsdb_audit_get_unique_session_token(void **state)
         *      probably off.
         */
        sess = talloc_zero(ctx, struct auth_session_info);
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
        guid = dsdb_audit_get_unique_session_token(module);
        /*
         * We will get a GUID, but it's contents will be undefined
@@ -861,7 +861,7 @@ static void test_dsdb_audit_get_actual_unique_session_token(void **state)
        /*
         * Now add a NULL session info
         */
-       ldb_set_opaque(ldb, "networkSessionInfo", NULL);
+       ldb_set_opaque(ldb, DSDB_NETWORK_SESSION_INFO, NULL);
        guid = dsdb_audit_get_actual_unique_session_token(ldb);
        assert_null(guid);
 
@@ -871,7 +871,7 @@ static void test_dsdb_audit_get_actual_unique_session_token(void **state)
         *      probably off.
         */
        sess = talloc_zero(ctx, struct auth_session_info);
-       ldb_set_opaque(ldb, "networkSessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_NETWORK_SESSION_INFO, sess);
        guid = dsdb_audit_get_actual_unique_session_token(ldb);
        /*
         * We will get a GUID, but it's contents will be undefined

diff --git a/source4/dsdb/samdb/ldb_modules/tests/test_group_audit.c b/source4/dsdb/samdb/ldb_modules/tests/test_group_audit.c
index d59da6226b61bc1a7105d8a86532b68126be465c..566028cab98e157a379622f8db74629987f0184c 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/tests/test_group_audit.c
+++ b/source4/dsdb/samdb/ldb_modules/tests/test_group_audit.c
@@ -198,7 +198,7 @@ static void add_session_data(
        sess->security_token = token;
        GUID_from_string(session, &session_id);
        sess->unique_session_token = session_id;
-       ldb_set_opaque(ldb, "sessionInfo", sess);
+       ldb_set_opaque(ldb, DSDB_SESSION_INFO, sess);
 }
 
 static void test_get_transaction_id(void **state)

diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c
index 738b773611d9058499d36273437e1aefcad16d28..ba1cfffe57417aedc1452aade4ef031338f690ea 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/util.c
+++ b/source4/dsdb/samdb/ldb_modules/util.c
@@ -1050,7 +1050,9 @@ bool dsdb_module_am_system(struct ldb_module *module)
 {
        struct ldb_context *ldb = ldb_module_get_ctx(module);
        struct auth_session_info *session_info
-               = talloc_get_type(ldb_get_opaque(ldb, "sessionInfo"), struct auth_session_info);
+               = talloc_get_type(
+                       ldb_get_opaque(ldb, DSDB_SESSION_INFO),
+                       struct auth_session_info);
        return security_session_user_level(session_info, NULL) == SECURITY_SYSTEM;
 }
 
@@ -1058,7 +1060,9 @@ bool dsdb_module_am_administrator(struct ldb_module *module)
 {
        struct ldb_context *ldb = ldb_module_get_ctx(module);
        struct auth_session_info *session_info
-               = talloc_get_type(ldb_get_opaque(ldb, "sessionInfo"), struct auth_session_info);
+               = talloc_get_type(
+                       ldb_get_opaque(ldb, DSDB_SESSION_INFO),
+                       struct auth_session_info);
        return security_session_user_level(session_info, NULL) == SECURITY_ADMINISTRATOR;
 }
 

diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index 7229457b54f8efea07e7fe01efc1edac7ae7c824..836e6d10f84bbfa519d915b1287b47e9faeecbd0 100644 (file)
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/srvsvc.h"
 #include "rpc_server/dcerpc_server.h"
 #include "dsdb/samdb/samdb.h"
+#include "dsdb/common/util.h"
 #include "auth/auth.h"
 #include "param/param.h"
 #include "rpc_server/common/common.h"
@@ -207,7 +208,7 @@ struct ldb_context *dcesrv_samdb_connect_as_system(
        if (samdb) {
                ldb_set_opaque(
                        samdb,
-                       "networkSessionInfo",
+                       DSDB_NETWORK_SESSION_INFO,
                        dce_call->conn->auth_state.session_info);
        }
        return samdb;