The branch, master has been updated
via 97af358 s4:libcli/raw/raw*.c - add unhandled enum values
via bf5e625 s4:torture/ndr/string.c - fix type-punned warning and
remove unused variables
via 62a1e13 s4:ntvfs/smb2/vfs_smb2.c - remove unused variable
via cda2fa2 s4:auth/ntlm/auth_unix.c - remove unused variables
from 8963e80 Revert "s3:idmap_autorid: add a talloc_stackframe() to
idmap_autorid_initialize()"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 97af3586567ff7ad4f22e083d32e5cfa2ebbb96e
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Jun 11 16:55:16 2011 +0200
s4:libcli/raw/raw*.c - add unhandled enum values
Reviewed-by: Jelmer
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Sat Jun 11 18:46:13 CEST 2011 on sn-devel-104
commit bf5e625393776b82c6f0d39852b76647716aab27
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Jun 11 15:25:11 2011 +0200
s4:torture/ndr/string.c - fix type-punned warning and remove unused
variables
Reviewed-by: Jelmer
commit 62a1e13b294d26f44d764810344ead5b58b8eb53
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Jun 11 15:22:34 2011 +0200
s4:ntvfs/smb2/vfs_smb2.c - remove unused variable
Reviewed-by: Jelmer
commit cda2fa21eb007b57960ab8a7eb9ddd996887e5bf
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Jun 11 15:07:50 2011 +0200
s4:auth/ntlm/auth_unix.c - remove unused variables
Relicts from commit 323c7445713d17989452b99bbb541248bb2388eb
Reviewed-by: Jelmer
-----------------------------------------------------------------------
Summary of changes:
source4/auth/ntlm/auth_unix.c | 2 --
source4/libcli/raw/rawfile.c | 1 +
source4/libcli/raw/rawsetfileinfo.c | 4 ++--
source4/ntvfs/smb2/vfs_smb2.c | 1 -
source4/torture/ndr/string.c | 5 ++---
5 files changed, 5 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c
index 9e92a04..d79ebc1 100644
--- a/source4/auth/ntlm/auth_unix.c
+++ b/source4/auth/ntlm/auth_unix.c
@@ -607,12 +607,10 @@ static NTSTATUS check_unix_password(TALLOC_CTX *ctx,
struct loadparm_context *lp
{
char *username;
char *password;
- char *pwcopy;
char *salt;
char *crypted;
struct passwd *pws;
NTSTATUS nt_status;
- int level = lpcfg_passwordlevel(lp_ctx);
*ret_passwd = NULL;
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 626067a..1cacaab 100644
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -904,6 +904,7 @@ struct smbcli_request *smb_raw_lock_send(struct smbcli_tree
*tree, union smb_loc
break;
}
case RAW_LOCK_SMB2:
+ case RAW_LOCK_SMB2_BREAK:
return NULL;
}
diff --git a/source4/libcli/raw/rawsetfileinfo.c
b/source4/libcli/raw/rawsetfileinfo.c
index 6ad3e9e..ff36d50 100644
--- a/source4/libcli/raw/rawsetfileinfo.c
+++ b/source4/libcli/raw/rawsetfileinfo.c
@@ -262,11 +262,11 @@ static bool smb_raw_setinfo_backend(struct smbcli_tree
*tree,
return smb_raw_setfileinfo_passthru(mem_ctx,
parms->generic.level,
parms, blob);
- /* Unhandled levels */
-
+ /* Unhandled levels */
case RAW_SFILEINFO_UNIX_LINK:
case RAW_SFILEINFO_UNIX_HLINK:
case RAW_SFILEINFO_RENAME_INFORMATION_SMB2:
+ case RAW_SFILEINFO_LINK_INFORMATION:
break;
}
diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c
index 24f0c33..889c534 100644
--- a/source4/ntvfs/smb2/vfs_smb2.c
+++ b/source4/ntvfs/smb2/vfs_smb2.c
@@ -162,7 +162,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context
*ntvfs,
NTSTATUS status;
struct cvfs_private *p;
const char *host, *user, *pass, *domain, *remote_share, *sharename;
- struct composite_context *creq;
struct share_config *scfg = ntvfs->ctx->config;
struct smb2_tree *tree;
struct cli_credentials *credentials;
diff --git a/source4/torture/ndr/string.c b/source4/torture/ndr/string.c
index 9214b59..30ed1e4 100644
--- a/source4/torture/ndr/string.c
+++ b/source4/torture/ndr/string.c
@@ -51,7 +51,8 @@ test_ndr_push_string (struct torture_context *tctx, const
char *string,
torture_assert(tctx, ndr->data != NULL,
"ndr_push_string: succeeded but NULL data");
- torture_assert(tctx, strcmp_pass == !strcmp(string, ndr->data),
+ torture_assert(tctx,
+ strcmp_pass == !strcmp(string, (char
*)ndr->data),
"ndr_push_string: post-push strcmp");
}
@@ -104,8 +105,6 @@ test_ndr_pull_string (struct torture_context *tctx, const
char *string,
static bool
torture_ndr_string(struct torture_context *torture)
{
- bool ok;
- int i;
const char *saved_dos_cp = lpcfg_dos_charset(torture->lp_ctx);
torture_assert(torture,
--
Samba Shared Repository
