Author: metze Date: 2005-12-02 15:30:25 +0000 (Fri, 02 Dec 2005) New Revision: 12021
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12021 Log: remove shortpath for winsdb_lookup, this isn't needed metze Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c Changeset: Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c =================================================================== --- branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c 2005-12-02 15:02:21 UTC (rev 12020) +++ branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c 2005-12-02 15:30:25 UTC (rev 12021) @@ -395,7 +395,7 @@ talloc_steal(tmp_ctx, res); - status = winsdb_record(res->msgs[0], name, tmp_ctx, &rec); + status = winsdb_record(res->msgs[0], tmp_ctx, &rec); if (!NT_STATUS_IS_OK(status)) goto failed; /* see if it has already expired */ @@ -416,11 +416,12 @@ return status; } -NTSTATUS winsdb_record(struct ldb_message *msg, struct nbt_name *name, TALLOC_CTX *mem_ctx, struct winsdb_record **_rec) +NTSTATUS winsdb_record(struct ldb_message *msg, TALLOC_CTX *mem_ctx, struct winsdb_record **_rec) { NTSTATUS status; struct winsdb_record *rec; struct ldb_message_element *el; + struct nbt_name *name; uint32_t i, num_values; rec = talloc(mem_ctx, struct winsdb_record); @@ -429,10 +430,8 @@ goto failed; } - if (!name) { - status = winsdb_nbt_name(rec, msg->dn, &name); - if (!NT_STATUS_IS_OK(status)) goto failed; - } + status = winsdb_nbt_name(rec, msg->dn, &name); + if (!NT_STATUS_IS_OK(status)) goto failed; if (strlen(name->name) > 15) { status = NT_STATUS_INTERNAL_DB_CORRUPTION; Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c =================================================================== --- branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c 2005-12-02 15:02:21 UTC (rev 12020) +++ branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c 2005-12-02 15:30:25 UTC (rev 12021) @@ -265,7 +265,7 @@ NT_STATUS_HAVE_NO_MEMORY(names); for (i = 0; i < res->count; i++) { - status = winsdb_record(res->msgs[i], NULL, call, &rec); + status = winsdb_record(res->msgs[i], call, &rec); NT_STATUS_NOT_OK_RETURN(status); status = wreplsrv_record2wins_name(names, call->wreplconn->our_ip, &names[i], rec);
