#include "includes.h"
#include "librpc/gen_ndr/ndr_netlogon.h"
#include "lib/ldb/include/ldb.h"
+#include "system/time.h"
+#include "system/filesys.h"
+#include "db_wrap.h"
/*
connect to the SAM database
return an opaque context pointer on success, or NULL on failure
*/
-void *samdb_connect(TALLOC_CTX *mem_ctx)
+struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx)
{
return ldb_wrap_connect(mem_ctx, lp_sam_url(), 0, NULL);
}
/*
- search the sam for the specified attributes - varargs variant
+ search the sam for the specified attributes in a specific domain, filter on
+ objectSid being in domain_sid.
*/
-int samdb_search(void *ctx,
- TALLOC_CTX *mem_ctx,
- const char *basedn,
- struct ldb_message ***res,
- const char * const *attrs,
- const char *format, ...) _PRINTF_ATTRIBUTE(6,7)
+int samdb_search_domain(struct ldb_context *sam_ldb,
+ TALLOC_CTX *mem_ctx,
+ const char *basedn,
+ struct ldb_message ***res,
+ const char * const *attrs,
+ const struct dom_sid *domain_sid,
+ const char *format, ...) _PRINTF_ATTRIBUTE(7,8)
{
- struct ldb_wrap *sam_ctx = ctx;
va_list ap;
- int count;
+ int i, count;
va_start(ap, format);
- count = gendb_search_v(sam_ctx->ldb, mem_ctx, basedn, res, attrs, format, ap);
+ count = gendb_search_v(sam_ldb, mem_ctx, basedn,
+ res, attrs, format, ap);
va_end(ap);
- return count;
-}
+ i=0;
-/*
- free up a search result
-*/
-int samdb_search_free(void *ctx,
- TALLOC_CTX *mem_ctx, struct ldb_message **res)
-{
- struct ldb_wrap *sam_ctx = ctx;
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_search_free(sam_ctx->ldb, res);
+ while (i<count) {
+ struct dom_sid *entry_sid;
+
+ entry_sid = samdb_result_dom_sid(mem_ctx, (*res)[i], "objectSid");
+
+ if ((entry_sid == NULL) ||
+ (!dom_sid_in_domain(domain_sid, entry_sid))) {
+ /* Delete that entry from the result set */
+ (*res)[i] = (*res)[count-1];
+ count -= 1;
+ talloc_free(entry_sid);
+ continue;
+ }
+ talloc_free(entry_sid);
+ i += 1;
+ }
+
+ return count;
}
/*
search the sam for a single string attribute in exactly 1 record
*/
-const char *samdb_search_string_v(void *ctx,
+const char *samdb_search_string_v(struct ldb_context *sam_ldb,
TALLOC_CTX *mem_ctx,
const char *basedn,
const char *attr_name,
const char *format, va_list ap) _PRINTF_ATTRIBUTE(5,0)
{
- struct ldb_wrap *sam_ctx = ctx;
int count;
const char * const attrs[2] = { attr_name, NULL };
struct ldb_message **res = NULL;
- count = gendb_search_v(sam_ctx->ldb, mem_ctx, basedn, &res, attrs, format, ap);
+ count = gendb_search_v(sam_ldb, mem_ctx, basedn, &res, attrs, format, ap);
if (count > 1) {
DEBUG(1,("samdb: search for %s %s not single valued (count=%d)\n",
attr_name, format, count));
}
if (count != 1) {
- samdb_search_free(ctx, mem_ctx, res);
+ talloc_free(res);
return NULL;
}
/*
search the sam for a single string attribute in exactly 1 record
*/
-const char *samdb_search_string(void *ctx,
+const char *samdb_search_string(struct ldb_context *sam_ldb,
TALLOC_CTX *mem_ctx,
const char *basedn,
const char *attr_name,
const char *str;
va_start(ap, format);
- str = samdb_search_string_v(ctx, mem_ctx, basedn, attr_name, format, ap);
+ str = samdb_search_string_v(sam_ldb, mem_ctx, basedn, attr_name, format, ap);
va_end(ap);
return str;
}
+/*
+ search the sam for a dom_sid attribute in exactly 1 record
+*/
+struct dom_sid *samdb_search_dom_sid(struct ldb_context *sam_ldb,
+ TALLOC_CTX *mem_ctx,
+ const char *basedn,
+ const char *attr_name,
+ const char *format, ...) _PRINTF_ATTRIBUTE(5,6)
+{
+ va_list ap;
+ int count;
+ struct ldb_message **res;
+ const char * const attrs[2] = { attr_name, NULL };
+ struct dom_sid *sid;
+
+ va_start(ap, format);
+ count = gendb_search_v(sam_ldb, mem_ctx, basedn, &res, attrs, format, ap);
+ va_end(ap);
+ if (count > 1) {
+ DEBUG(1,("samdb: search for %s %s not single valued (count=%d)\n",
+ attr_name, format, count));
+ }
+ if (count != 1) {
+ talloc_free(res);
+ return NULL;
+ }
+ sid = samdb_result_dom_sid(mem_ctx, res[0], attr_name);
+ talloc_free(res);
+ return sid;
+}
+
/*
return the count of the number of records in the sam matching the query
*/
-int samdb_search_count(void *ctx,
+int samdb_search_count(struct ldb_context *sam_ldb,
TALLOC_CTX *mem_ctx,
const char *basedn,
const char *format, ...) _PRINTF_ATTRIBUTE(4,5)
{
- struct ldb_wrap *samdb_ctx = ctx;
va_list ap;
struct ldb_message **res;
const char * const attrs[] = { NULL };
int ret;
va_start(ap, format);
- ret = gendb_search_v(samdb_ctx->ldb, mem_ctx, basedn, &res, attrs, format, ap);
+ ret = gendb_search_v(sam_ldb, mem_ctx, basedn, &res, attrs, format, ap);
va_end(ap);
return ret;
/*
search the sam for a single integer attribute in exactly 1 record
*/
-uint_t samdb_search_uint(void *ctx,
+uint_t samdb_search_uint(struct ldb_context *sam_ldb,
TALLOC_CTX *mem_ctx,
uint_t default_value,
const char *basedn,
const char *attr_name,
const char *format, ...) _PRINTF_ATTRIBUTE(6,7)
{
- struct ldb_wrap *samdb_ctx = ctx;
va_list ap;
int count;
struct ldb_message **res;
const char * const attrs[2] = { attr_name, NULL };
va_start(ap, format);
- count = gendb_search_v(samdb_ctx->ldb, mem_ctx, basedn, &res, attrs, format, ap);
+ count = gendb_search_v(sam_ldb, mem_ctx, basedn, &res, attrs, format, ap);
va_end(ap);
if (count != 1) {
/*
search the sam for a single signed 64 bit integer attribute in exactly 1 record
*/
-int64_t samdb_search_int64(void *ctx,
+int64_t samdb_search_int64(struct ldb_context *sam_ldb,
TALLOC_CTX *mem_ctx,
int64_t default_value,
const char *basedn,
const char *attr_name,
const char *format, ...) _PRINTF_ATTRIBUTE(6,7)
{
- struct ldb_wrap *samdb_ctx = ctx;
va_list ap;
int count;
struct ldb_message **res;
const char * const attrs[2] = { attr_name, NULL };
va_start(ap, format);
- count = gendb_search_v(samdb_ctx->ldb, mem_ctx, basedn, &res, attrs, format, ap);
+ count = gendb_search_v(sam_ldb, mem_ctx, basedn, &res, attrs, format, ap);
va_end(ap);
if (count != 1) {
search the sam for multipe records each giving a single string attribute
return the number of matches, or -1 on error
*/
-int samdb_search_string_multiple(void *ctx,
+int samdb_search_string_multiple(struct ldb_context *sam_ldb,
TALLOC_CTX *mem_ctx,
const char *basedn,
const char ***strs,
const char *attr_name,
const char *format, ...) _PRINTF_ATTRIBUTE(6,7)
{
- struct ldb_wrap *samdb_ctx = ctx;
va_list ap;
int count, i;
const char * const attrs[2] = { attr_name, NULL };
struct ldb_message **res = NULL;
va_start(ap, format);
- count = gendb_search_v(samdb_ctx->ldb, mem_ctx, basedn, &res, attrs, format, ap);
+ count = gendb_search_v(sam_ldb, mem_ctx, basedn, &res, attrs, format, ap);
va_end(ap);
if (count <= 0) {
if (res[i]->num_elements != 1) {
DEBUG(1,("samdb: search for %s %s not single valued\n",
attr_name, format));
- samdb_search_free(ctx, mem_ctx, res);
+ talloc_free(res);
return -1;
}
}
- *strs = talloc_array_p(mem_ctx, const char *, count+1);
+ *strs = talloc_array(mem_ctx, const char *, count+1);
if (! *strs) {
- samdb_search_free(ctx, mem_ctx, res);
+ talloc_free(res);
return -1;
}
pull a rid from a objectSid in a result set.
*/
uint32_t samdb_result_rid_from_sid(TALLOC_CTX *mem_ctx, struct ldb_message *msg,
- const char *attr, uint32_t default_value)
+ const char *attr, uint32_t default_value)
{
struct dom_sid *sid;
- const char *sidstr = ldb_msg_find_string(msg, attr, NULL);
- if (!sidstr) return default_value;
+ uint32_t rid;
- sid = dom_sid_parse_talloc(mem_ctx, sidstr);
- if (!sid) return default_value;
-
- return sid->sub_auths[sid->num_auths-1];
+ sid = samdb_result_dom_sid(mem_ctx, msg, attr);
+ if (sid == NULL) {
+ return default_value;
+ }
+ rid = sid->sub_auths[sid->num_auths-1];
+ talloc_free(sid);
+ return rid;
}
/*
struct dom_sid *samdb_result_dom_sid(TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr)
{
- const char *sidstr = ldb_msg_find_string(msg, attr, NULL);
- if (!sidstr) return NULL;
-
- return dom_sid_parse_talloc(mem_ctx, sidstr);
+ const struct ldb_val *v;
+ struct dom_sid *sid;
+ NTSTATUS status;
+ v = ldb_msg_find_ldb_val(msg, attr);
+ if (v == NULL) {
+ return NULL;
+ }
+ sid = talloc(mem_ctx, struct dom_sid);
+ if (sid == NULL) {
+ return NULL;
+ }
+ status = ndr_pull_struct_blob(v, sid, sid,
+ (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(sid);
+ return NULL;
+ }
+ return sid;
}
/*
*/
struct GUID samdb_result_guid(struct ldb_message *msg, const char *attr)
{
+ const struct ldb_val *v;
NTSTATUS status;
struct GUID guid;
- const char *guidstr = ldb_msg_find_string(msg, attr, NULL);
+ TALLOC_CTX *mem_ctx;
ZERO_STRUCT(guid);
- if (!guidstr) return guid;
+ v = ldb_msg_find_ldb_val(msg, attr);
+ if (!v) return guid;
- status = GUID_from_string(guidstr, &guid);
+ mem_ctx = talloc_named_const(NULL, 0, "samdb_result_guid");
+ if (!mem_ctx) return guid;
+ status = ndr_pull_struct_blob(v, mem_ctx, &guid,
+ (ndr_pull_flags_fn_t)ndr_pull_GUID);
+ talloc_free(mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
- ZERO_STRUCT(guid);
return guid;
}
pull a sid prefix from a objectSid in a result set.
this is used to find the domain sid for a user
*/
-const char *samdb_result_sid_prefix(TALLOC_CTX *mem_ctx, struct ldb_message *msg,
- const char *attr)
+struct dom_sid *samdb_result_sid_prefix(TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+ const char *attr)
{
struct dom_sid *sid = samdb_result_dom_sid(mem_ctx, msg, attr);
if (!sid || sid->num_auths < 1) return NULL;
-
sid->num_auths--;
-
- return dom_sid_string(mem_ctx, sid);
+ return sid;
}
/*
construct the allow_password_change field from the PwdLastSet attribute and the
domain password settings
*/
-NTTIME samdb_result_allow_password_change(void *ctx, TALLOC_CTX *mem_ctx,
+NTTIME samdb_result_allow_password_change(struct ldb_context *sam_ldb,
+ TALLOC_CTX *mem_ctx,
const char *domain_dn,
struct ldb_message *msg,
const char *attr)
return 0;
}
- minPwdAge = samdb_search_int64(ctx, mem_ctx, 0, NULL,
- "minPwdAge", "dn=%s", domain_dn);
+ minPwdAge = samdb_search_int64(sam_ldb, mem_ctx, 0,
+ domain_dn, "minPwdAge", "dn=%s", domain_dn);
/* yes, this is a -= not a += as minPwdAge is stored as the negative
of the number of 100-nano-seconds */
construct the force_password_change field from the PwdLastSet attribute and the
domain password settings
*/
-NTTIME samdb_result_force_password_change(void *ctx, TALLOC_CTX *mem_ctx,
+NTTIME samdb_result_force_password_change(struct ldb_context *sam_ldb,
+ TALLOC_CTX *mem_ctx,
const char *domain_dn,
struct ldb_message *msg,
const char *attr)
return 0;
}
- maxPwdAge = samdb_search_int64(ctx, mem_ctx, 0, NULL, "maxPwdAge", "dn=%s", domain_dn);
+ maxPwdAge = samdb_search_int64(sam_ldb, mem_ctx, 0, domain_dn,
+ "maxPwdAge", "dn=%s", domain_dn);
if (maxPwdAge == 0) {
return 0;
} else {
return 0;
}
- *hashes = talloc_array_p(mem_ctx, struct samr_Password, count);
+ *hashes = talloc_array(mem_ctx, struct samr_Password, count);
if (! *hashes) {
return 0;
}
struct samr_Password *lmPwdHash, *ntPwdHash;
if (unicodePwd) {
if (nt_pwd) {
- ntPwdHash = talloc_p(mem_ctx, struct samr_Password);
+ ntPwdHash = talloc(mem_ctx, struct samr_Password);
if (!ntPwdHash) {
return NT_STATUS_NO_MEMORY;
}
if (lm_pwd) {
BOOL lm_hash_ok;
- lmPwdHash = talloc_p(mem_ctx, struct samr_Password);
+ lmPwdHash = talloc(mem_ctx, struct samr_Password);
if (!lmPwdHash) {
return NT_STATUS_NO_MEMORY;
}
const int units_per_week = 168;
const struct ldb_val *val = ldb_msg_find_ldb_val(msg, attr);
ZERO_STRUCT(hours);
- hours.bitmap = talloc_array_p(mem_ctx, uint8, units_per_week);
- if (!hours.bitmap) {
+ hours.bits = talloc_array(mem_ctx, uint8_t, units_per_week);
+ if (!hours.bits) {
return hours;
}
hours.units_per_week = units_per_week;
- memset(hours.bitmap, 0xFF, units_per_week);
+ memset(hours.bits, 0xFF, units_per_week);
if (val) {
- memcpy(hours.bitmap, val->data, MIN(val->length, units_per_week));
+ memcpy(hours.bits, val->data, MIN(val->length, units_per_week));
}
return hours;
}
/*
copy from a template record to a message
*/
-int samdb_copy_template(void *ctx, TALLOC_CTX *mem_ctx,
+int samdb_copy_template(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx,
struct ldb_message *msg, const char *expression)
{
struct ldb_message **res, *t;
/* pull the template record */
- ret = samdb_search(ctx, mem_ctx, NULL, &res, NULL, "%s", expression);
+ ret = gendb_search(sam_ldb, mem_ctx, NULL, &res, NULL, "%s", expression);
if (ret != 1) {
DEBUG(1,("samdb: ERROR: template '%s' matched %d records\n",
expression, ret));
(strcasecmp((char *)el->values[j].data, "Template") == 0 ||
strcasecmp((char *)el->values[j].data, "userTemplate") == 0 ||
strcasecmp((char *)el->values[j].data, "groupTemplate") == 0 ||
- strcasecmp((char *)el->values[j].data, "aliasTemplate") == 0)) {
+ strcasecmp((char *)el->values[j].data, "foreignSecurityTemplate") == 0 ||
+ strcasecmp((char *)el->values[j].data, "aliasTemplate") == 0 ||
+ strcasecmp((char *)el->values[j].data, "trustedDomainTemplate") == 0 ||
+ strcasecmp((char *)el->values[j].data, "secretTemplate") == 0)) {
continue;
}
- samdb_msg_add_string(ctx, mem_ctx, msg, el->name,
+ samdb_msg_add_string(sam_ldb, mem_ctx, msg, el->name,
(char *)el->values[j].data);
}
}
allocate a new id, attempting to do it atomically
return 0 on failure, the id on success
*/
-static NTSTATUS _samdb_allocate_next_id(void *ctx, TALLOC_CTX *mem_ctx, const char *dn,
+static NTSTATUS _samdb_allocate_next_id(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, const char *dn,
const char *attr, uint32_t *id)
{
- struct ldb_wrap *sam_ctx = ctx;
struct ldb_message msg;
int ret;
const char *str;
struct ldb_val vals[2];
struct ldb_message_element els[2];
- str = samdb_search_string(ctx, mem_ctx, NULL, attr, "dn=%s", dn);
+ str = samdb_search_string(sam_ldb, mem_ctx, dn, attr, "dn=%s", dn);
if (!str) {
DEBUG(1,("id not found at %s %s\n", dn, attr));
return NT_STATUS_OBJECT_NAME_INVALID;
els[1].flags = LDB_FLAG_MOD_ADD;
els[1].name = els[0].name;
- vals[0].data = talloc_asprintf(mem_ctx, "%u", *id);
+ vals[0].data = (uint8_t *)talloc_asprintf(mem_ctx, "%u", *id);
if (!vals[0].data) {
return NT_STATUS_NO_MEMORY;
}
- vals[0].length = strlen(vals[0].data);
+ vals[0].length = strlen((const char *)vals[0].data);
- vals[1].data = talloc_asprintf(mem_ctx, "%u", (*id)+1);
+ vals[1].data = (uint8_t *)talloc_asprintf(mem_ctx, "%u", (*id)+1);
if (!vals[1].data) {
return NT_STATUS_NO_MEMORY;
}
- vals[1].length = strlen(vals[1].data);
+ vals[1].length = strlen((const char *)vals[1].data);
- ret = ldb_modify(sam_ctx->ldb, &msg);
+ ret = ldb_modify(sam_ldb, &msg);
if (ret != 0) {
return NT_STATUS_UNEXPECTED_IO_ERROR;
}
allocate a new id, attempting to do it atomically
return 0 on failure, the id on success
*/
-NTSTATUS samdb_allocate_next_id(void *ctx, TALLOC_CTX *mem_ctx, const char *dn, const char *attr,
+NTSTATUS samdb_allocate_next_id(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, const char *dn, const char *attr,
uint32_t *id)
{
int tries = 10;
/* we need to try multiple times to cope with two account
creations at the same time */
while (tries--) {
- status = _samdb_allocate_next_id(ctx, mem_ctx, dn, attr, id);
+ status = _samdb_allocate_next_id(sam_ldb, mem_ctx, dn, attr, id);
if (!NT_STATUS_EQUAL(NT_STATUS_UNEXPECTED_IO_ERROR, status)) {
break;
}
/*
add a string element to a message
*/
-int samdb_msg_add_string(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_string(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, const char *str)
{
- struct ldb_wrap *sam_ctx = ctx;
char *s = talloc_strdup(mem_ctx, str);
char *a = talloc_strdup(mem_ctx, attr_name);
if (s == NULL || a == NULL) {
return -1;
}
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_msg_add_string(sam_ctx->ldb, msg, a, s);
+ return ldb_msg_add_string(sam_ldb, msg, a, s);
+}
+
+/*
+ add a dom_sid element to a message
+*/
+int samdb_msg_add_dom_sid(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+ const char *attr_name, struct dom_sid *sid)
+{
+ struct ldb_val v;
+ NTSTATUS status;
+ status = ndr_push_struct_blob(&v, mem_ctx, sid,
+ (ndr_push_flags_fn_t)ndr_push_dom_sid);
+ if (!NT_STATUS_IS_OK(status)) {
+ return -1;
+ }
+ return ldb_msg_add_value(sam_ldb, msg, attr_name, &v);
}
+
/*
add a delete element operation to a message
*/
-int samdb_msg_add_delete(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_delete(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name)
{
- struct ldb_wrap *sam_ctx = ctx;
char *a = talloc_strdup(mem_ctx, attr_name);
if (a == NULL) {
return -1;
}
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
/* we use an empty replace rather than a delete, as it allows for
samdb_replace() to be used everywhere */
- return ldb_msg_add_empty(sam_ctx->ldb, msg, a, LDB_FLAG_MOD_REPLACE);
+ return ldb_msg_add_empty(sam_ldb, msg, a, LDB_FLAG_MOD_REPLACE);
}
/*
add a add attribute value to a message
*/
-int samdb_msg_add_addval(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_addval(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, const char *value)
{
- struct ldb_wrap *sam_ctx = ctx;
struct ldb_message_element *el;
char *a, *v;
int ret;
v = talloc_strdup(mem_ctx, value);
if (v == NULL)
return -1;
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- ret = ldb_msg_add_string(sam_ctx->ldb, msg, a, v);
+ ret = ldb_msg_add_string(sam_ldb, msg, a, v);
if (ret != 0)
return ret;
el = ldb_msg_find_element(msg, a);
/*
add a delete attribute value to a message
*/
-int samdb_msg_add_delval(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_delval(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, const char *value)
{
- struct ldb_wrap *sam_ctx = ctx;
struct ldb_message_element *el;
char *a, *v;
int ret;
v = talloc_strdup(mem_ctx, value);
if (v == NULL)
return -1;
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- ret = ldb_msg_add_string(sam_ctx->ldb, msg, a, v);
+ ret = ldb_msg_add_string(sam_ldb, msg, a, v);
if (ret != 0)
return ret;
el = ldb_msg_find_element(msg, a);
/*
add a uint_t element to a message
*/
-int samdb_msg_add_uint(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_uint(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, uint_t v)
{
const char *s = talloc_asprintf(mem_ctx, "%u", v);
- return samdb_msg_add_string(ctx, mem_ctx, msg, attr_name, s);
+ return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s);
}
/*
add a (signed) int64_t element to a message
*/
-int samdb_msg_add_int64(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_int64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, int64_t v)
{
const char *s = talloc_asprintf(mem_ctx, "%lld", v);
- return samdb_msg_add_string(ctx, mem_ctx, msg, attr_name, s);
+ return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s);
}
/*
add a uint64_t element to a message
*/
-int samdb_msg_add_uint64(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_uint64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, uint64_t v)
{
const char *s = talloc_asprintf(mem_ctx, "%llu", v);
- return samdb_msg_add_string(ctx, mem_ctx, msg, attr_name, s);
+ return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s);
}
/*
add a samr_Password element to a message
*/
-int samdb_msg_add_hash(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
- const char *attr_name, struct samr_Password hash)
+int samdb_msg_add_hash(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+ const char *attr_name, struct samr_Password *hash)
{
- struct ldb_wrap *sam_ctx = ctx;
struct ldb_val val;
- val.data = talloc(mem_ctx, 16);
- val.length = 16;
+ val.data = talloc_memdup(mem_ctx, hash->hash, 16);
if (!val.data) {
return -1;
}
- memcpy(val.data, hash.hash, 16);
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_msg_add_value(sam_ctx->ldb, msg, attr_name, &val);
+ val.length = 16;
+ return ldb_msg_add_value(sam_ldb, msg, attr_name, &val);
}
/*
add a samr_Password array to a message
*/
-int samdb_msg_add_hashes(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_hashes(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, struct samr_Password *hashes, uint_t count)
{
- struct ldb_wrap *sam_ctx = ctx;
struct ldb_val val;
int i;
- val.data = talloc(mem_ctx, count*16);
+ val.data = talloc_array_size(mem_ctx, 16, count);
val.length = count*16;
if (!val.data) {
return -1;
for (i=0;i<count;i++) {
memcpy(i*16 + (char *)val.data, hashes[i].hash, 16);
}
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_msg_add_value(sam_ctx->ldb, msg, attr_name, &val);
+ return ldb_msg_add_value(sam_ldb, msg, attr_name, &val);
}
/*
add a acct_flags element to a message
*/
-int samdb_msg_add_acct_flags(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_acct_flags(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, uint32_t v)
{
- return samdb_msg_add_uint(ctx, mem_ctx, msg, attr_name, samdb_acb2uf(v));
+ return samdb_msg_add_uint(sam_ldb, mem_ctx, msg, attr_name, samdb_acb2uf(v));
}
/*
add a logon_hours element to a message
*/
-int samdb_msg_add_logon_hours(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_add_logon_hours(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, struct samr_LogonHours *hours)
{
- struct ldb_wrap *sam_ctx = ctx;
struct ldb_val val;
val.length = hours->units_per_week / 8;
- val.data = hours->bitmap;
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_msg_add_value(sam_ctx->ldb, msg, attr_name, &val);
+ val.data = hours->bits;
+ return ldb_msg_add_value(sam_ldb, msg, attr_name, &val);
+}
+
+/*
+ add a general value element to a message
+*/
+int samdb_msg_add_value(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+ const char *attr_name, const struct ldb_val *val)
+{
+ return ldb_msg_add_value(sam_ldb, msg, attr_name, val);
+}
+
+/*
+ sets a general value element to a message
+*/
+int samdb_msg_set_value(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+ const char *attr_name, const struct ldb_val *val)
+{
+ struct ldb_message_element *el;
+
+ el = ldb_msg_find_element(msg, attr_name);
+ if (el) {
+ el->num_values = 0;
+ }
+ return ldb_msg_add_value(sam_ldb, msg, attr_name, val);
}
/*
set a string element in a message
*/
-int samdb_msg_set_string(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_set_string(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, const char *str)
{
- struct ldb_wrap *sam_ctx = ctx;
struct ldb_message_element *el;
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
-
el = ldb_msg_find_element(msg, attr_name);
if (el) {
el->num_values = 0;
}
- return samdb_msg_add_string(ctx, mem_ctx, msg, attr_name, str);
+ return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, str);
}
/*
set a ldaptime element in a message
*/
-int samdb_msg_set_ldaptime(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
+int samdb_msg_set_ldaptime(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
const char *attr_name, time_t t)
{
char *str = ldap_timestring(mem_ctx, t);
if (!str) {
return -1;
}
- return samdb_msg_set_string(ctx, mem_ctx, msg, attr_name, str);
+ return samdb_msg_set_string(sam_ldb, mem_ctx, msg, attr_name, str);
}
/*
add a record
*/
-int samdb_add(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
+int samdb_add(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
{
- struct ldb_wrap *sam_ctx = ctx;
-
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_add(sam_ctx->ldb, msg);
+ return ldb_add(sam_ldb, msg);
}
/*
delete a record
*/
-int samdb_delete(void *ctx, TALLOC_CTX *mem_ctx, const char *dn)
+int samdb_delete(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, const char *dn)
{
- struct ldb_wrap *sam_ctx = ctx;
-
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_delete(sam_ctx->ldb, dn);
+ return ldb_delete(sam_ldb, dn);
}
/*
modify a record
*/
-int samdb_modify(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
+int samdb_modify(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
{
- struct ldb_wrap *sam_ctx = ctx;
-
- ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
- return ldb_modify(sam_ctx->ldb, msg);
+ return ldb_modify(sam_ldb, msg);
}
/*
replace elements in a record
*/
-int samdb_replace(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
+int samdb_replace(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
{
int i;
}
/* modify the samdb record */
- return samdb_modify(ctx, mem_ctx, msg);
+ return samdb_modify(sam_ldb, mem_ctx, msg);
}
/*
git.samba.org / sfrench / samba-autobuild / .git / blobdiff