diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util/util.h | 21 | ||||
| -rw-r--r-- | lib/util/util_net.h | 46 |
2 files changed, 46 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_ */ diff --git a/lib/util/util_net.h b/lib/util/util_net.h new file mode 100644 index 0000000000..6eacfc395f --- /dev/null +++ b/lib/util/util_net.h @@ -0,0 +1,46 @@ +/* + Unix SMB/CIFS implementation. + Utility functions for Samba + Copyright (C) Andrew Tridgell 1992-1999 + Copyright (C) Jelmer Vernooij 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef _SAMBA_UTIL_NET_H_ +#define _SAMBA_UTIL_NET_H_ + +#include "system/network.h" + +/* 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_NET_H_ */ |