r12021: remove shortpath for winsdb_lookup, this isn't needed

metze

diff --git a/source/nbt_server/wins/winsdb.c b/source/nbt_server/wins/winsdb.c
index bcec8da2139307d2725ec503dfa721cf6eaef153..a81c3d55dcac4dfdd1f17eeb0d4ba8aa9d46252d 100644 (file)
--- a/source/nbt_server/wins/winsdb.c
+++ b/source/nbt_server/wins/winsdb.c
@@ -395,7 +395,7 @@ NTSTATUS winsdb_lookup(struct ldb_context *wins_db,
 
        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 @@ failed:
        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 @@ NTSTATUS winsdb_record(struct ldb_message *msg, struct nbt_name *name, TALLOC_CT
                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;

diff --git a/source/wrepl_server/wrepl_in_call.c b/source/wrepl_server/wrepl_in_call.c
index 0dd8095dd2ee42e80af31a959768e244782c6319..718442a2884dc8a44b3dd5db9ba3fb1d3bd1e753 100644 (file)
--- a/source/wrepl_server/wrepl_in_call.c
+++ b/source/wrepl_server/wrepl_in_call.c
@@ -265,7 +265,7 @@ static NTSTATUS wreplsrv_in_send_request(struct wreplsrv_in_call *call)
        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);