diff options
author | Gary Lockyer <gary@catalyst.net.nz> | 2018-05-31 15:12:46 +1200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2018-06-09 15:02:11 +0200 |
commit | 1b07f1337291409688815e5261921ee4f557ab7d (patch) | |
tree | 205fb9a170202cc25e4b8023338bb48086d4550e /lib/ldb-samba | |
parent | d4deb800e2f472a91752b764918ffa49b878073d (diff) | |
download | samba-1b07f1337291409688815e5261921ee4f557ab7d.tar.gz |
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>
Diffstat (limited to 'lib/ldb-samba')
-rw-r--r-- | lib/ldb-samba/ldb_ildap.c | 5 | ||||
-rw-r--r-- | lib/ldb-samba/ldb_matching_rules.c | 2 | ||||
-rw-r--r-- | lib/ldb-samba/ldb_wrap.c | 3 | ||||
-rw-r--r-- | lib/ldb-samba/pyldb.c | 3 | ||||
-rw-r--r-- | lib/ldb-samba/samba_extensions.c | 7 |
5 files changed, 15 insertions, 5 deletions
diff --git a/lib/ldb-samba/ldb_ildap.c b/lib/ldb-samba/ldb_ildap.c index 0cdf738e0be..1b9a25ea3a7 100644 --- 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 aa8697941c6..063a5d3c3a3 100644 --- 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 34148a13ab3..6c2c707284e 100644 --- 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 dfcb5510e6d..57c5397bc06 100644 --- 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 28c820ecbee..45b01e1b447 100644 --- 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", |