diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-27 12:56:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-27 12:16:25 +0200 |
| commit | dc00df2adddfe23e5ebb61f9f7c16ec7d3f2c03e (patch) | |
| tree | d6d3e1c86529378fe9f48578d7929a2881db58a5 /source3 | |
| parent | b181a0b96b8313206923e6f5b46b0803aaf64907 (diff) | |
| download | samba-dc00df2adddfe23e5ebb61f9f7c16ec7d3f2c03e.tar.gz samba-dc00df2adddfe23e5ebb61f9f7c16ec7d3f2c03e.tar.bz2 samba-dc00df2adddfe23e5ebb61f9f7c16ec7d3f2c03e.zip | |
lib/param: Rename "socket address" to "nbt client socket address" to clarify role
This parameter is only used in our NBT client code and in nmbd as a
fallback when we fail to select a better interface from "interfaces"
to use directly.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Jul 27 12:16:25 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/libsmb/namequery.c | 4 | ||||
| -rw-r--r-- | source3/nmbd/nmbd.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/utils/nmblookup.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 0b4f093537..101d62d3a3 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1046,7 +1046,7 @@ char *lp_remote_browse_sync(TALLOC_CTX *ctx); bool lp_nmbd_bind_explicit_broadcast(void); const char **lp_wins_server_list(void); const char **lp_interfaces(void); -const char *lp_socket_address(void); +const char *lp_nbt_client_socket_address(void); char *lp_nis_home_map_name(TALLOC_CTX *ctx); const char **lp_netbios_aliases(void); const char *lp_passdb_backend(void); diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index e4dda16659..b62b52bc70 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -216,7 +216,7 @@ char *saf_fetch( const char *domain ) static void set_socket_addr_v4(struct sockaddr_storage *addr) { - if (!interpret_string_addr(addr, lp_socket_address(), + if (!interpret_string_addr(addr, lp_nbt_client_socket_address(), AI_NUMERICHOST|AI_PASSIVE)) { zero_sockaddr(addr); } @@ -2071,7 +2071,7 @@ struct tevent_req *resolve_wins_send(TALLOC_CTX *mem_ctx, } /* the address we will be sending from */ - if (!interpret_string_addr(&src_ss, lp_socket_address(), + if (!interpret_string_addr(&src_ss, lp_nbt_client_socket_address(), AI_NUMERICHOST|AI_PASSIVE)) { zero_sockaddr(&src_ss); } diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index a28ed7c393..1728bb9c5a 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -692,7 +692,7 @@ static void process(struct messaging_context *msg) static bool open_sockets(bool isdaemon, int port) { struct sockaddr_storage ss; - const char *sock_addr = lp_socket_address(); + const char *sock_addr = lp_nbt_client_socket_address(); /* * The sockets opened here will be used to receive broadcast diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4bfcbc2494..59f74d7c8e 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -738,7 +738,7 @@ static void init_globals(bool reinit_globals) string_set(&Globals.szStateDir, get_dyn_STATEDIR()); string_set(&Globals.szCacheDir, get_dyn_CACHEDIR()); string_set(&Globals.szPidDir, get_dyn_PIDDIR()); - string_set(&Globals.szSocketAddress, "0.0.0.0"); + string_set(&Globals.nbt_client_socket_address, "0.0.0.0"); /* * By default support explicit binding to broadcast * addresses. diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c index b767b412e4..0d5e64a8e4 100644 --- a/source3/utils/nmblookup.c +++ b/source3/utils/nmblookup.c @@ -40,7 +40,7 @@ static bool find_status = false; static bool open_sockets(void) { struct sockaddr_storage ss; - const char *sock_addr = lp_socket_address(); + const char *sock_addr = lp_nbt_client_socket_address(); if (!interpret_string_addr(&ss, sock_addr, AI_NUMERICHOST|AI_PASSIVE)) { |