[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  fed6ac0... s4:ntvfs/posix/pvfs_streams - Fix "discard const" warning
       via  1a855eb... s4:ntvfs/posix/pvfs_resolve - Fix "discard const" warning
      from  cdb68bd... s3: Fix crash in winbindd;(bug#6879).

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fed6ac05d00ab9bc2d7f55fe377cd1fde829cf7f
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Fri Nov 20 12:00:28 2009 +0100

    s4:ntvfs/posix/pvfs_streams - Fix "discard const" warning
    
    I removed one "const" in front of a string declaration to achieve this.
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>

commit 1a855eb741c356262382f04357abdabe0bd2ad1b
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Fri Nov 20 11:56:16 2009 +0100

    s4:ntvfs/posix/pvfs_resolve - Fix "discard const" warning
    
    I removed two "const"s in front of string declarations to achieve this.
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source4/ntvfs/posix/pvfs_resolve.c |    6 +++---
 source4/ntvfs/posix/vfs_posix.h    |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c
index c01799e..8f46264 100644
--- a/source4/ntvfs/posix/pvfs_resolve.c
+++ b/source4/ntvfs/posix/pvfs_resolve.c
@@ -696,7 +696,7 @@ NTSTATUS pvfs_resolve_name_handle(struct pvfs_state *pvfs,
 
 	if (h->have_opendb_entry) {
 		struct odb_lock *lck;
-		const char *name = NULL;
+		char *name = NULL;
 
 		lck = odb_lock(h, h->pvfs->odb_context, &h->odb_locking_key);
 		if (lck == NULL) {
@@ -707,7 +707,7 @@ NTSTATUS pvfs_resolve_name_handle(struct pvfs_state *pvfs,
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
 
-		status = odb_get_path(lck, &name);
+		status = odb_get_path(lck, (const char **) &name);
 		if (NT_STATUS_IS_OK(status)) {
 			/*
 			 * This relies an the fact that
@@ -719,7 +719,7 @@ NTSTATUS pvfs_resolve_name_handle(struct pvfs_state *pvfs,
 			if (strcmp(h->name->full_name, name) != 0) {
 				const char *orig_dir;
 				const char *new_file;
-				const char *new_orig;
+				char *new_orig;
 				char *delim;
 
 				delim = strrchr(name, '/');
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index b032ab3..7341d0d 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -124,9 +124,9 @@ struct pvfs_dos_fileinfo {
   a filename passed by the client to any function
 */
 struct pvfs_filename {
-	const char *original_name;
+	char *original_name;
 	char *full_name;
-	const char *stream_name; /* does not include :$DATA suffix */
+	char *stream_name; /* does not include :$DATA suffix */
 	uint32_t stream_id;      /* this uses a hash, so is probabilistic */
 	bool has_wildcard;
 	bool exists;          /* true if the base filename exists */


-- 
Samba Shared Repository