Author: jelmer Date: 2007-12-02 16:20:29 +0000 (Sun, 02 Dec 2007) New Revision: 26223
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26223 Log: Move loadparm context up in the stack. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/libcli/cldap/cldap.c branches/SAMBA_4_0/source/libcli/cldap/cldap.h branches/SAMBA_4_0/source/libcli/dgram/browse.c branches/SAMBA_4_0/source/libcli/dgram/libdgram.h branches/SAMBA_4_0/source/torture/ldap/cldap.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/libcli/cldap/cldap.c =================================================================== --- branches/SAMBA_4_0/source/libcli/cldap/cldap.c 2007-12-02 16:20:25 UTC (rev 26222) +++ branches/SAMBA_4_0/source/libcli/cldap/cldap.c 2007-12-02 16:20:29 UTC (rev 26223) @@ -317,7 +317,7 @@ req->dest = socket_address_from_strings(req, cldap->sock->backend_name, io->in.dest_address, - lp_cldap_port(global_loadparm)); + io->in.dest_port); if (!req->dest) goto failed; req->message_id = idr_get_new_random(cldap->idr, req, UINT16_MAX); @@ -572,6 +572,7 @@ if (filter == NULL) goto failed; search.in.dest_address = io->in.dest_address; + search.in.dest_port = lp_cldap_port(global_loadparm); search.in.filter = filter; search.in.attributes = attr; search.in.timeout = 2; Modified: branches/SAMBA_4_0/source/libcli/cldap/cldap.h =================================================================== --- branches/SAMBA_4_0/source/libcli/cldap/cldap.h 2007-12-02 16:20:25 UTC (rev 26222) +++ branches/SAMBA_4_0/source/libcli/cldap/cldap.h 2007-12-02 16:20:29 UTC (rev 26223) @@ -98,6 +98,7 @@ struct cldap_search { struct { const char *dest_address; + uint16_t dest_port; const char *filter; const char **attributes; int timeout; Modified: branches/SAMBA_4_0/source/libcli/dgram/browse.c =================================================================== --- branches/SAMBA_4_0/source/libcli/dgram/browse.c 2007-12-02 16:20:25 UTC (rev 26222) +++ branches/SAMBA_4_0/source/libcli/dgram/browse.c 2007-12-02 16:20:29 UTC (rev 26223) @@ -56,6 +56,7 @@ NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, const char *mailslot_name, + const char *my_netbios_name, struct nbt_browse_packet *reply) { NTSTATUS status; @@ -72,7 +73,7 @@ return ndr_map_error2ntstatus(ndr_err); } - make_nbt_name_client(&myname, lp_netbios_name(global_loadparm)); + make_nbt_name_client(&myname, my_netbios_name); dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name, request->src_addr, request->src_port); Modified: branches/SAMBA_4_0/source/libcli/dgram/libdgram.h =================================================================== --- branches/SAMBA_4_0/source/libcli/dgram/libdgram.h 2007-12-02 16:20:25 UTC (rev 26222) +++ branches/SAMBA_4_0/source/libcli/dgram/libdgram.h 2007-12-02 16:20:29 UTC (rev 26223) @@ -154,6 +154,7 @@ NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, const char *mailslot_name, + const char *my_netbios_name, struct nbt_browse_packet *reply); NTSTATUS dgram_mailslot_browse_parse(struct dgram_mailslot_handler *dgmslot, Modified: branches/SAMBA_4_0/source/torture/ldap/cldap.c =================================================================== --- branches/SAMBA_4_0/source/torture/ldap/cldap.c 2007-12-02 16:20:25 UTC (rev 26222) +++ branches/SAMBA_4_0/source/torture/ldap/cldap.c 2007-12-02 16:20:29 UTC (rev 26223) @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/ndr_nbt.h" #include "torture/torture.h" #include "lib/ldb/include/ldb.h" +#include "param/param.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ @@ -215,6 +216,7 @@ ZERO_STRUCT(search); search.in.dest_address = dest; + search.in.dest_port = lp_cldap_port(global_loadparm); search.in.timeout = 10; search.in.retries = 3;
