sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-16 00:23:52 +03:00
Code Activity

r26397: Fix circular dependency in samba-socket.

Browse Source 
(This used to be commit 801c8c766c)
This commit is contained in:
Jelmer Vernooij
2007-12-11 13:38:54 +01:00
committed by Stefan Metzmacher
parent cbefb13474
commit 1ea47faa97
10 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source4/libcli/resolve/resolve.c
View File

@@ -228,26 +228,4 @@ void make_nbt_name_server(struct nbt_name *nbt, const char *name)
make_nbt_name(nbt, name, NBT_NAME_SERVER);
}
struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
{
const char **methods = lp_name_resolve_order(lp_ctx);
int i;
struct resolve_context *ret = resolve_context_init(lp_ctx);
if (ret == NULL)
return NULL;
for (i = 0; methods != NULL && methods[i] != NULL; i++) {
if (!strcmp(methods[i], "wins")) {
resolve_context_add_wins_method(ret, lp_wins_server_list(lp_ctx));
} else if (!strcmp(methods[i], "bcast")) {
resolve_context_add_bcast_method(ret, lp_ctx);
} else if (!strcmp(methods[i], "host")) {
resolve_context_add_host_method(ret);
} else {
DEBUG(0, ("Unknown resolve method '%s'\n", methods[i]));
}
}
return ret;
}

1
source4/libcli/resolve/resolve.h
View File

@@ -26,5 +26,6 @@
typedef struct composite_context *(*resolve_name_send_fn)(TALLOC_CTX *mem_ctx, struct event_context *, void *privdata, struct nbt_name *);
typedef NTSTATUS (*resolve_name_recv_fn)(struct composite_context *, TALLOC_CTX *, const char **);
#include "libcli/resolve/proto.h"
#include "libcli/resolve/lp_proto.h"
#endif /* __RESOLVE_H__ */

46
source4/libcli/resolve/resolve_lp.c Normal file
View File

@@ -0,0 +1,46 @@
/*
Unix SMB/CIFS implementation.
Samba utility functions
Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
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/>.
*/
#include "includes.h"
#include "libcli/resolve/resolve.h"
#include "param/param.h"
struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
{
const char **methods = lp_name_resolve_order(lp_ctx);
int i;
struct resolve_context *ret = resolve_context_init(lp_ctx);
if (ret == NULL)
return NULL;
for (i = 0; methods != NULL && methods[i] != NULL; i++) {
if (!strcmp(methods[i], "wins")) {
resolve_context_add_wins_method(ret, lp_wins_server_list(lp_ctx));
} else if (!strcmp(methods[i], "bcast")) {
resolve_context_add_bcast_method(ret, lp_ctx);
} else if (!strcmp(methods[i], "host")) {
resolve_context_add_host_method(ret);
} else {
DEBUG(0, ("Unknown resolve method '%s'\n", methods[i]));
}
}
return ret;
}