diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-09-15 10:11:45 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-09-15 10:38:53 -0700 |
| commit | 5a01071692db91a4ea7131e31c41b6426d184758 (patch) | |
| tree | a7ae326383af4133ac1875816d073cafc373da58 /lib/util/util.h | |
| parent | 9a209ac252508bc9a5b1eaaaf256610aceb37736 (diff) | |
| download | samba-5a01071692db91a4ea7131e31c41b6426d184758.tar.gz samba-5a01071692db91a4ea7131e31c41b6426d184758.tar.bz2 samba-5a01071692db91a4ea7131e31c41b6426d184758.zip | |
libcli:nbt put util_net.c protos in new header file
This fixed a very odd build problem due to util.h importing
system/network.h being imported before the uid_wapper code.
Andrew Bartlett
Diffstat (limited to 'lib/util/util.h')
| -rw-r--r-- | lib/util/util.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index 8438602cc6..385a3ae07a 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -21,8 +21,6 @@ #ifndef _SAMBA_UTIL_H_ #define _SAMBA_UTIL_H_ -#include "system/network.h" - #if _SAMBA_BUILD_ == 4 #include "../lib/util/charset/charset.h" #endif @@ -842,24 +840,5 @@ bool add_uid_to_array_unique(TALLOC_CTX *mem_ctx, uid_t uid, bool add_gid_to_array_unique(TALLOC_CTX *mem_ctx, gid_t gid, gid_t **gids, size_t *num_gids); -/* The following definitions come from lib/util/util_net.c */ - -void zero_sockaddr(struct sockaddr_storage *pss); - -bool interpret_string_addr_internal(struct addrinfo **ppres, - const char *str, int flags); - -bool interpret_string_addr(struct sockaddr_storage *pss, - const char *str, - int flags); - -/******************************************************************* - Map a text hostname or IP address (IPv4 or IPv6) into a - struct sockaddr_storage. Version that prefers IPv4. -******************************************************************/ - -bool interpret_string_addr_prefer_ipv4(struct sockaddr_storage *pss, - const char *str, - int flags); #endif /* _SAMBA_UTIL_H_ */ |