From 27022587e31769718ab53f4d114e03ac2f205f27 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 6 May 2011 11:47:43 +0200 Subject: s3-libsmb: move protos to libsmb/proto.h Guenther --- source3/utils/netlookup.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/utils/netlookup.c') diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c index b160ee5586..d2a79640e9 100644 --- a/source3/utils/netlookup.c +++ b/source3/utils/netlookup.c @@ -24,6 +24,7 @@ #include "rpc_client/cli_pipe.h" #include "../librpc/gen_ndr/ndr_lsa.h" #include "rpc_client/cli_lsarpc.h" +#include "libsmb/libsmb.h" /******************************************************** Connection cachine struct. Goes away when ctx destroyed. -- cgit From d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 7 Jun 2011 11:38:41 +1000 Subject: s3-talloc Change TALLOC_P() to talloc() Using the standard macro makes it easier to move code into common, as TALLOC_P isn't standard talloc. --- source3/utils/netlookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/utils/netlookup.c') diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c index d2a79640e9..c115e2d29d 100644 --- a/source3/utils/netlookup.c +++ b/source3/utils/netlookup.c @@ -78,7 +78,7 @@ static struct con_struct *create_cs(struct net_context *c, return cs; } - cs = TALLOC_P(ctx, struct con_struct); + cs = talloc(ctx, struct con_struct); if (!cs) { *perr = NT_STATUS_NO_MEMORY; return NULL; -- cgit From 74eed8f3ed5c333728350df1d23a4318e9104909 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 9 Jun 2011 15:31:03 +1000 Subject: s3-param Remove special case for global_myname(), rename to lp_netbios_name() There is no reason this can't be a normal constant string in the loadparm system, now that we have lp_set_cmdline() to handle overrides correctly. Andrew Bartlett --- source3/utils/netlookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/utils/netlookup.c') diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c index c115e2d29d..5d81d43634 100644 --- a/source3/utils/netlookup.c +++ b/source3/utils/netlookup.c @@ -98,7 +98,7 @@ static struct con_struct *create_cs(struct net_context *c, } #endif - nt_status = cli_full_connection(&cs->cli, global_myname(), global_myname(), + nt_status = cli_full_connection(&cs->cli, lp_netbios_name(), lp_netbios_name(), &loopback_ss, 0, "IPC$", "IPC", #if 0 -- cgit