sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

libcli:nbt put util_net.c protos in new header file

Browse Source 
This fixed a very odd build problem due to util.h importing
system/network.h being imported before the uid_wapper code.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2009-09-15 10:11:45 -07:00
parent 9a209ac252
commit 5a01071692
4 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/util/util.h
View File

@ -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_ */

46
lib/util/util_net.h Normal file
View File

@ -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_ */

1
libcli/nbt/lmhosts.c
View File

@ -23,6 +23,7 @@
#include "includes.h"
#include "lib/util/xfile.h"
#include "lib/util/util_net.h"
#include "system/filesys.h"
#include "system/network.h"

1
source3/include/includes.h
View File

@ -612,6 +612,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
/* Lists, trees, caching, database... */
#include "../lib/util/util.h"
#include "../lib/util/util_net.h"
#include "../lib/util/xfile.h"
#include "../lib/util/memory.h"
#include "../lib/util/attr.h"