Author: metze Date: 2005-10-12 14:52:34 +0000 (Wed, 12 Oct 2005) New Revision: 10923
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10923 Log: fix the build becuse of conflicts with main SAMBA_4_0 tree metze Modified: branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c Changeset: Modified: branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c =================================================================== --- branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c 2005-10-12 14:35:12 UTC (rev 10922) +++ branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c 2005-10-12 14:52:34 UTC (rev 10923) @@ -248,7 +248,7 @@ encode the winsdb_addr("address") attribute like this: "172.31.1.1;winsOwner:172.31.9.202;expireTime:20050923032330.0Z;" */ -static int ldb_msg_add_winsdb_addr(struct ldb_context *ldb, struct ldb_message *msg, +static int ldb_msg_add_winsdb_addr(struct ldb_message *msg, const char *attr_name, struct winsdb_addr *addr) { struct ldb_val val; @@ -262,7 +262,7 @@ val.data = discard_const_p(uint8_t, str); val.length = strlen(str); - return ldb_msg_add_value(ldb, msg, attr_name, &val); + return ldb_msg_add_value(msg, attr_name, &val); } struct winsdb_addr **winsdb_addr_list_make(TALLOC_CTX *mem_ctx) @@ -523,7 +523,7 @@ ret |= ldb_msg_add_fmt(msg, "versionID", "%llu", rec->version); ret |= ldb_msg_add_string(msg, "winsOwner", rec->wins_owner); for (i=0;rec->addresses[i];i++) { - ret |= ldb_msg_add_winsdb_addr(ldb, msg, "address", rec->addresses[i]); + ret |= ldb_msg_add_winsdb_addr(msg, "address", rec->addresses[i]); } ret |= ldb_msg_add_string(msg, "registeredBy", rec->registered_by); if (ret != 0) goto failed; @@ -545,7 +545,6 @@ int trans = -1; int ret = 0; - trans = ldb_transaction_start(ldb); if (trans != LDB_SUCCESS) goto failed;
