r14721: Fix a couple of warnings.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 25 Mar 2006 16:23:42 +0000 (16:23 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:59:13 +0000 (13:59 -0500)
source/client/client.c
source/librpc/idl/krb5pac.idl
source/torture/ldap/cldapbench.c
source/torture/local/socket.c

index 80b3f00e585493eefd8f9fbf0258cdb176bc24cb..6a2ba6e98ecbf43cc03675a8aaad9b163b3423a7 100644 (file)
@@ -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, "\\");
index dc7e551116d50e2aa116c73995b54aa955a2b539..5fa6d5525f08a41a2c2d5fa29de81f294cd08ce3 100644 (file)
@@ -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"),
index fc45f883e7d0c05eafc40d4d66d0db5f2b750877..c49e4eb687a01ebf009a81ba97b1aea334aea84b 100644 (file)
@@ -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;
index acea977331faf75426d0579b8a8c45207d30f38f..9a29ef0fec65ce89c6e9387aadb95a50e4c43429 100644 (file)
@@ -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)) { \