svn commit: samba r14721 - in branches/SAMBA_4_0/source: client
librpc/idl torture/ldap torture/local
jelmer at samba.org
jelmer at samba.org
Sat Mar 25 16:23:43 GMT 2006
Author: jelmer
Date: 2006-03-25 16:23:42 +0000 (Sat, 25 Mar 2006)
New Revision: 14721
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14721
Log:
Fix a couple of warnings.
Modified:
branches/SAMBA_4_0/source/client/client.c
branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl
branches/SAMBA_4_0/source/torture/ldap/cldapbench.c
branches/SAMBA_4_0/source/torture/local/socket.c
Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c 2006-03-25 16:01:28 UTC (rev 14720)
+++ branches/SAMBA_4_0/source/client/client.c 2006-03-25 16:23:42 UTC (rev 14721)
@@ -2966,19 +2966,24 @@
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, "\\");
Modified: branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl 2006-03-25 16:01:28 UTC (rev 14720)
+++ branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl 2006-03-25 16:23:42 UTC (rev 14721)
@@ -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"),
Modified: branches/SAMBA_4_0/source/torture/ldap/cldapbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/cldapbench.c 2006-03-25 16:01:28 UTC (rev 14720)
+++ branches/SAMBA_4_0/source/torture/ldap/cldapbench.c 2006-03-25 16:23:42 UTC (rev 14721)
@@ -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;
Modified: branches/SAMBA_4_0/source/torture/local/socket.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/socket.c 2006-03-25 16:01:28 UTC (rev 14720)
+++ branches/SAMBA_4_0/source/torture/local/socket.c 2006-03-25 16:23:42 UTC (rev 14721)
@@ -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)) { \
More information about the samba-cvs
mailing list