[SCM] Samba Shared Repository - branch master updated - 25988f13696547e70b5e3155cb5bcea2f0786312

Jelmer Vernooij jelmer at samba.org
Thu Oct 23 21:21:49 GMT 2008


The branch, master has been updated
       via  25988f13696547e70b5e3155cb5bcea2f0786312 (commit)
       via  ce0ac322b4a673e59e6e04467b2ceaf7a9637a68 (commit)
      from  8baf1695492300fd8c2ce7e4f106a14f510357e5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 25988f13696547e70b5e3155cb5bcea2f0786312
Merge: ce0ac322b4a673e59e6e04467b2ceaf7a9637a68 8baf1695492300fd8c2ce7e4f106a14f510357e5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Oct 23 23:21:16 2008 +0200

    Merge branch 'master' of git://git.samba.org/samba

commit ce0ac322b4a673e59e6e04467b2ceaf7a9637a68
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Oct 23 23:20:50 2008 +0200

    Fix prototype for set_sockaddr_port.

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h |    2 +-
 source3/lib/interface.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7a5cd3b..83cd740 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1507,7 +1507,7 @@ char *print_sockaddr(char *dest,
 			const struct sockaddr_storage *psa);
 char *print_canonical_sockaddr(TALLOC_CTX *ctx,
 			const struct sockaddr_storage *pss);
-void set_sockaddr_port(struct sockaddr_storage *psa, uint16 port);
+void set_sockaddr_port(struct sockaddr *psa, uint16_t port);
 const char *client_name(int fd);
 const char *client_addr(int fd, char *addr, size_t addrlen);
 const char *client_socket_addr(int fd, char *addr, size_t addr_len);
diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index 4536990..f533ec9 100644
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -289,7 +289,7 @@ const struct sockaddr_storage *iface_ip(const struct sockaddr *ip)
 
 bool iface_local(const struct sockaddr *ip)
 {
-	return iface_find(ip, True) ? true : false;
+	return iface_find(ip, true) ? true : false;
 }
 
 /****************************************************************************


-- 
Samba Shared Repository


More information about the samba-cvs mailing list