diff options
| -rw-r--r-- | source4/client/client.c | 13 | ||||
| -rw-r--r-- | source4/librpc/idl/krb5pac.idl | 2 | ||||
| -rw-r--r-- | source4/torture/ldap/cldapbench.c | 1 | ||||
| -rw-r--r-- | source4/torture/local/socket.c | 1 |
4 files changed, 12 insertions, 5 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 80b3f00e58..6a2ba6e98e 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -2966,19 +2966,24 @@ static int process_stdin(struct smbclient_context *ctx) return a connection to a server *******************************************************/ static struct smbclient_context *do_connect(TALLOC_CTX *mem_ctx, - const char *server, const char *share, struct cli_credentials *cred) + const char *specified_server, const char *specified_share, struct cli_credentials *cred) { NTSTATUS status; struct smbclient_context *ctx = talloc_zero(mem_ctx, struct smbclient_context); + char *server, *share; + if (!ctx) { return NULL; } rl_ctx = ctx; /* Ugly hack */ - if (strncmp(share, "\\\\", 2) == 0 || - strncmp(share, "//", 2) == 0) { - smbcli_parse_unc(share, ctx, &server, &share); + if (strncmp(specified_share, "\\\\", 2) == 0 || + strncmp(specified_share, "//", 2) == 0) { + smbcli_parse_unc(specified_share, ctx, &server, &share); + } else { + share = talloc_strdup(ctx, specified_share); + server = talloc_strdup(ctx, specified_server); } ctx->remote_cur_dir = talloc_strdup(ctx, "\\"); diff --git a/source4/librpc/idl/krb5pac.idl b/source4/librpc/idl/krb5pac.idl index dc7e551116..5fa6d5525f 100644 --- a/source4/librpc/idl/krb5pac.idl +++ b/source4/librpc/idl/krb5pac.idl @@ -5,7 +5,7 @@ #include "idl_types.h" [ - uuid("5-6-7-8"), + uuid("5-6-7-8-9"), version(0.0), pointer_default(unique), helpstring("Active Directory KRB5 PAC"), diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c index fc45f883e7..c49e4eb687 100644 --- a/source4/torture/ldap/cldapbench.c +++ b/source4/torture/ldap/cldapbench.c @@ -24,6 +24,7 @@ #include "lib/events/events.h" #include "libcli/cldap/cldap.h" #include "libcli/resolve/resolve.h" +#include "torture/torture.h" struct bench_state { int pass_count, fail_count; diff --git a/source4/torture/local/socket.c b/source4/torture/local/socket.c index acea977331..9a29ef0fec 100644 --- a/source4/torture/local/socket.c +++ b/source4/torture/local/socket.c @@ -25,6 +25,7 @@ #include "lib/events/events.h" #include "system/network.h" #include "netif/netif.h" +#include "torture/torture.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ |