sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r8734: fixed the wins server for the new ldb DN restrictions.

Browse Source 
This gets it working, but I'm rather worried about the speed. We used
to get more than 5000 ops/sec, but now we are down to around 15
ops/sec. I suspect a bug in ldb.
(This used to be commit 83727bf72c)
This commit is contained in:
Andrew Tridgell 2005-07-24 12:18:11 +00:00 committed by Gerald (Jerry) Carter
parent 6b2d6ce604
commit f4b488ec01
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source4/nbt_server/wins/winsdb.c
View File

@ -83,6 +83,31 @@ static void winsdb_remove_version(struct wins_server *winssrv, uint64_t version)
} }
} }
/*
return a DN for a nbt_name
*/
static char *winsdb_dn(TALLOC_CTX *mem_ctx, struct nbt_name *name)
{
char *ret = talloc_asprintf(mem_ctx, "type=%02x", name->type);
if (ret == NULL) {
return ret;
}
if (name->name && *name->name) {
ret = talloc_asprintf_append(ret, ",name=%s", name->name);
}
if (ret == NULL) {
return ret;
}
if (name->scope && *name->scope) {
ret = talloc_asprintf_append(ret, ",scope=%s", name->scope);
}
if (ret == NULL) {
return ret;
}
return ret;
}
/* /*
load a WINS entry from the database load a WINS entry from the database
*/ */
@ -97,7 +122,7 @@ struct winsdb_record *winsdb_load(struct wins_server *winssrv,
const char *expr; const char *expr;
int i; int i;
expr = talloc_asprintf(tmp_ctx, "dn=NAME=%s", nbt_name_string(tmp_ctx, name)); expr = talloc_asprintf(tmp_ctx, "dn=%s", winsdb_dn(tmp_ctx, name));
if (expr == NULL) goto failed; if (expr == NULL) goto failed;
/* find the record in the WINS database */ /* find the record in the WINS database */
@ -159,8 +184,9 @@ static struct ldb_message *winsdb_message(struct wins_server *winssrv,
struct ldb_message *msg = ldb_msg_new(mem_ctx); struct ldb_message *msg = ldb_msg_new(mem_ctx);
if (msg == NULL) goto failed; if (msg == NULL) goto failed;
msg->dn = talloc_asprintf(msg, "NAME=%s", nbt_name_string(msg, rec->name)); msg->dn = winsdb_dn(msg, rec->name);
if (msg->dn == NULL) goto failed; if (msg->dn == NULL) goto failed;
ret |= ldb_msg_add_fmt(ldb, msg, "objectClass", "wins");
ret |= ldb_msg_add_fmt(ldb, msg, "active", "%u", rec->state); ret |= ldb_msg_add_fmt(ldb, msg, "active", "%u", rec->state);
ret |= ldb_msg_add_fmt(ldb, msg, "nbFlags", "0x%04x", rec->nb_flags); ret |= ldb_msg_add_fmt(ldb, msg, "nbFlags", "0x%04x", rec->nb_flags);
ret |= ldb_msg_add_string(ldb, msg, "registeredBy", rec->registered_by); ret |= ldb_msg_add_string(ldb, msg, "registeredBy", rec->registered_by);
@ -250,7 +276,7 @@ uint8_t winsdb_delete(struct wins_server *winssrv, struct winsdb_record *rec)
winsdb_remove_version(winssrv, rec->version); winsdb_remove_version(winssrv, rec->version);
dn = talloc_asprintf(tmp_ctx, "NAME=%s", nbt_name_string(tmp_ctx, rec->name)); dn = winsdb_dn(tmp_ctx, rec->name);
if (dn == NULL) goto failed; if (dn == NULL) goto failed;
ret = ldb_delete(ldb, dn); ret = ldb_delete(ldb, dn);