The branch, master has been updated
via ef334b9 s4:torture/rpc/winreg.c - set "error_message" to NULL in
"test_HKLM_wellknown"
via e736ace s4:torture/spoolss_access.c - fix discarded const warning
via a133d83 s4:torture/raw/notify.c - freeable stuff shouldn't be
"const"
via 4def677 s4:ntvfs/posix/pvfs_*.c - quiet Solaris warnings
via e4afcd6 s4:credentials_krb5.c - quiet a Solaris warning
from e8cfc2f s3: Cache results of finding printer names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ef334b95faaa8b8d97ff091299c454dfc8fd390c
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Fri Aug 27 19:02:49 2010 +0200
s4:torture/rpc/winreg.c - set "error_message" to NULL in
"test_HKLM_wellknown"
Hopefully this fixes the build on Solaris 8.
commit e736ace470cec34fe51ee0a7b03981ab9b16d6cd
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Aug 26 22:48:27 2010 +0200
s4:torture/spoolss_access.c - fix discarded const warning
"discard_const_p" seems the most appropriate here.
commit a133d83607ce9db9a4725b170001e934648150da
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Aug 26 22:43:05 2010 +0200
s4:torture/raw/notify.c - freeable stuff shouldn't be "const"
commit 4def6775b56242590b4f7d9cb0f5b0442e33248f
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Aug 26 22:35:09 2010 +0200
s4:ntvfs/posix/pvfs_*.c - quiet Solaris warnings
Fix the function argument of "pvfs_xattr_ndr_load/save".
commit e4afcd62bccf04f2afc779d7292f49e10c29b970
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Aug 26 22:30:04 2010 +0200
s4:credentials_krb5.c - quiet a Solaris warning
-----------------------------------------------------------------------
Summary of changes:
source4/auth/credentials/credentials_krb5.c | 3 ++-
source4/ntvfs/posix/pvfs_acl_nfs4.c | 4 ++--
source4/ntvfs/posix/pvfs_acl_xattr.c | 6 ++----
source4/ntvfs/posix/pvfs_xattr.c | 18 +++++++++---------
source4/torture/raw/notify.c | 2 +-
source4/torture/rpc/spoolss_access.c | 5 +++--
source4/torture/rpc/winreg.c | 27 ++++++++++++++++++---------
7 files changed, 37 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/credentials/credentials_krb5.c
b/source4/auth/credentials/credentials_krb5.c
index 622f674..4021146 100644
--- a/source4/auth/credentials/credentials_krb5.c
+++ b/source4/auth/credentials/credentials_krb5.c
@@ -479,7 +479,8 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct
cli_credentials *cred,
for (num_ktypes = 0; etypes[num_ktypes]; num_ktypes++);
maj_stat = gss_krb5_set_allowable_enctypes(&min_stat,
gcc->creds,
- num_ktypes, etypes);
+ num_ktypes,
+ (int32_t *) etypes);
krb5_xfree (etypes);
if (maj_stat) {
talloc_free(gcc);
diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c
b/source4/ntvfs/posix/pvfs_acl_nfs4.c
index 8824602..ea620ba 100644
--- a/source4/ntvfs/posix/pvfs_acl_nfs4.c
+++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c
@@ -47,7 +47,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs,
struct pvfs_filename
status = pvfs_xattr_ndr_load(pvfs, mem_ctx, name->full_name, fd,
NFS4ACL_XATTR_NAME,
- acl, ndr_pull_nfs4acl);
+ acl, (void *) ndr_pull_nfs4acl);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(acl);
return status;
@@ -184,7 +184,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs,
struct pvfs_filename
privs = root_privileges();
status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd,
NFS4ACL_XATTR_NAME,
- &acl, ndr_push_nfs4acl);
+ &acl, (void *) ndr_push_nfs4acl);
talloc_free(privs);
talloc_free(tmp_ctx);
diff --git a/source4/ntvfs/posix/pvfs_acl_xattr.c
b/source4/ntvfs/posix/pvfs_acl_xattr.c
index 87bb6bc..dbeee82 100644
--- a/source4/ntvfs/posix/pvfs_acl_xattr.c
+++ b/source4/ntvfs/posix/pvfs_acl_xattr.c
@@ -43,8 +43,7 @@ static NTSTATUS pvfs_acl_load_xattr(struct pvfs_state *pvfs,
struct pvfs_filenam
status = pvfs_xattr_ndr_load(pvfs, mem_ctx, name->full_name, fd,
XATTR_NTACL_NAME,
- acl,
- (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL);
+ acl, (void *) ndr_pull_xattr_NTACL);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(acl);
@@ -83,8 +82,7 @@ static NTSTATUS pvfs_acl_save_xattr(struct pvfs_state *pvfs,
struct pvfs_filenam
privs = root_privileges();
status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd,
XATTR_NTACL_NAME,
- &acl,
- (ndr_push_flags_fn_t)ndr_push_xattr_NTACL);
+ &acl, (void *) ndr_push_xattr_NTACL);
talloc_free(privs);
return status;
}
diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c
index 1eb7c31..04ad178 100644
--- a/source4/ntvfs/posix/pvfs_xattr.c
+++ b/source4/ntvfs/posix/pvfs_xattr.c
@@ -176,8 +176,8 @@ NTSTATUS pvfs_dosattrib_load(struct pvfs_state *pvfs,
struct pvfs_filename *name
status = pvfs_xattr_ndr_load(pvfs, mem_ctx, name->full_name,
fd, XATTR_DOSATTRIB_NAME,
- &attrib,
-
(ndr_pull_flags_fn_t)ndr_pull_xattr_DosAttrib);
+ &attrib,
+ (void *) ndr_pull_xattr_DosAttrib);
/* not having a DosAttrib is not an error */
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -271,7 +271,7 @@ NTSTATUS pvfs_dosattrib_save(struct pvfs_state *pvfs,
struct pvfs_filename *name
return pvfs_xattr_ndr_save(pvfs, name->full_name, fd,
XATTR_DOSATTRIB_NAME, &attrib,
-
(ndr_push_flags_fn_t)ndr_push_xattr_DosAttrib);
+ (void *) ndr_push_xattr_DosAttrib);
}
@@ -287,7 +287,7 @@ NTSTATUS pvfs_doseas_load(struct pvfs_state *pvfs, struct
pvfs_filename *name, i
return NT_STATUS_OK;
}
status = pvfs_xattr_ndr_load(pvfs, eas, name->full_name, fd,
XATTR_DOSEAS_NAME,
- eas,
(ndr_pull_flags_fn_t)ndr_pull_xattr_DosEAs);
+ eas, (void *) ndr_pull_xattr_DosEAs);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
return NT_STATUS_OK;
}
@@ -304,7 +304,7 @@ NTSTATUS pvfs_doseas_save(struct pvfs_state *pvfs, struct
pvfs_filename *name, i
return NT_STATUS_OK;
}
return pvfs_xattr_ndr_save(pvfs, name->full_name, fd,
XATTR_DOSEAS_NAME, eas,
- (ndr_push_flags_fn_t)ndr_push_xattr_DosEAs);
+ (void *) ndr_push_xattr_DosEAs);
}
@@ -322,7 +322,7 @@ NTSTATUS pvfs_streams_load(struct pvfs_state *pvfs, struct
pvfs_filename *name,
status = pvfs_xattr_ndr_load(pvfs, streams, name->full_name, fd,
XATTR_DOSSTREAMS_NAME,
streams,
-
(ndr_pull_flags_fn_t)ndr_pull_xattr_DosStreams);
+ (void *) ndr_pull_xattr_DosStreams);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
return NT_STATUS_OK;
}
@@ -341,7 +341,7 @@ NTSTATUS pvfs_streams_save(struct pvfs_state *pvfs, struct
pvfs_filename *name,
return pvfs_xattr_ndr_save(pvfs, name->full_name, fd,
XATTR_DOSSTREAMS_NAME,
streams,
-
(ndr_push_flags_fn_t)ndr_push_xattr_DosStreams);
+ (void *) ndr_push_xattr_DosStreams);
}
@@ -359,7 +359,7 @@ NTSTATUS pvfs_acl_load(struct pvfs_state *pvfs, struct
pvfs_filename *name, int
status = pvfs_xattr_ndr_load(pvfs, acl, name->full_name, fd,
XATTR_NTACL_NAME,
acl,
- (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL);
+ (void *) ndr_pull_xattr_NTACL);
return status;
}
@@ -382,7 +382,7 @@ NTSTATUS pvfs_acl_save(struct pvfs_state *pvfs, struct
pvfs_filename *name, int
status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd,
XATTR_NTACL_NAME,
acl,
- (ndr_push_flags_fn_t)ndr_push_xattr_NTACL);
+ (void *) ndr_push_xattr_NTACL);
talloc_free(privs);
return status;
}
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index dd3aae3..6fc0059 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -1619,7 +1619,7 @@ static bool test_notify_alignment(struct smbcli_state
*cli,
"abc",
"abcd" };
int num_names = ARRAY_SIZE(fnames);
- const char *fpath = NULL;
+ char *fpath = NULL;
torture_comment(tctx, "TESTING CHANGE NOTIFY REPLY ALIGNMENT\n");
diff --git a/source4/torture/rpc/spoolss_access.c
b/source4/torture/rpc/spoolss_access.c
index 08d1375..cd531d7 100644
--- a/source4/torture/rpc/spoolss_access.c
+++ b/source4/torture/rpc/spoolss_access.c
@@ -314,7 +314,7 @@ static bool test_SetPrinter(struct torture_context *tctx,
static bool spoolss_access_setup_sd(struct torture_context *tctx,
struct dcerpc_pipe *p,
const char *printername,
- struct dom_sid *user_sid,
+ const struct dom_sid *user_sid,
struct security_descriptor **sd_orig)
{
struct dcerpc_binding_handle *b = p->binding_handle;
@@ -453,7 +453,8 @@ static bool torture_rpc_spoolss_access_setup_common(struct
torture_context *tctx
CRED_SPECIFIED);
cli_credentials_set_username(test_credentials, t->user.username,
CRED_SPECIFIED);
cli_credentials_set_password(test_credentials, testuser_passwd,
CRED_SPECIFIED);
- test_sid = torture_join_user_sid(testuser);
+ test_sid = discard_const_p(struct dom_sid,
+ torture_join_user_sid(testuser));
if (t->user.num_builtin_memberships) {
struct dcerpc_pipe *samr_pipe =
torture_join_samr_pipe(testuser);
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index c369389..9ee68c6 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2422,55 +2422,64 @@ static bool test_HKLM_wellknown(struct torture_context
*tctx,
.values[1] = NULL,
.values[2] = NULL,
.num_values = 1,
- .existing_value = true
+ .existing_value = true,
+ .error_message = NULL
},{
.values[0] = VALUE_SYSTEM_ROOT,
.values[1] = NULL,
.values[2] = NULL,
.num_values = 1,
- .existing_value = true
+ .existing_value = true,
+ .error_message = NULL
},{
.values[0] = VALUE_CURRENT_VERSION,
.values[1] = VALUE_SYSTEM_ROOT,
.values[2] = NULL,
.num_values = 2,
- .existing_value = true
+ .existing_value = true,
+ .error_message = NULL
},{
.values[0] = VALUE_CURRENT_VERSION,
.values[1] = VALUE_SYSTEM_ROOT,
.values[2] = VALUE_CURRENT_VERSION,
.num_values = 3,
- .existing_value = true
+ .existing_value = true,
+ .error_message = NULL
},{
.values[0] = VALUE_CURRENT_VERSION,
.values[1] = NULL,
.values[2] = VALUE_SYSTEM_ROOT,
.num_values = 3,
- .existing_value = false
+ .existing_value = false,
+ .error_message = NULL
},{
.values[0] = VALUE_CURRENT_VERSION,
.values[1] = "",
.values[2] = VALUE_SYSTEM_ROOT,
.num_values = 3,
- .existing_value = false
+ .existing_value = false,
+ .error_message = NULL
},{
.values[0] = "IDoNotExist",
.values[1] = NULL,
.values[2] = NULL,
.num_values = 1,
- .existing_value = false
+ .existing_value = false,
+ .error_message = NULL
},{
.values[0] = "IDoNotExist",
.values[1] = VALUE_CURRENT_VERSION,
.values[2] = NULL,
.num_values = 2,
- .existing_value = false
+ .existing_value = false,
+ .error_message = NULL
},{
.values[0] = VALUE_CURRENT_VERSION,
.values[1] = "IDoNotExist",
.values[2] = NULL,
.num_values = 2,
- .existing_value = false
+ .existing_value = false,
+ .error_message = NULL
}
};
--
Samba Shared Repository
