[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc1-30-g73ae1aa

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  73ae1aa1c6c460451855e30114b1a331529a042d (commit)
       via  1e04dd755a0564e0179546567453880966a46cd7 (commit)
       via  13dee8d300f14880fdab3bb559e50919b69f6251 (commit)
      from  0b26d4e68f4212cf93250eb03bbc7e4834e74bc4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 73ae1aa1c6c460451855e30114b1a331529a042d
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jun 3 16:25:17 2008 +0200

    WHATSNEW: Update changes since 3.2.0rc1.
    
    Karolin
    (cherry picked from commit 1f7296350212a65500885c7d21cb586026713f61)

commit 1e04dd755a0564e0179546567453880966a46cd7
Author: Andreas Schneider <anschneider at suse.de>
Date:   Tue Jun 3 15:26:42 2008 +0200

    Fix empty input fields in SWAT; [#5515].
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit e1579c90fb27c07f95889dd8778daeef53e2ac16)
    (cherry picked from commit f29f96fe76a139291cbc6e2dee1bca160ea3460a)

commit 13dee8d300f14880fdab3bb559e50919b69f6251
Author: Andreas Schneider <anschneider at suse.de>
Date:   Tue Jun 3 15:05:50 2008 +0200

    Fix saving of the config file in SWAT; [#5516].
    
    The strlen of the source string passed to convert_string_allocate was too
    short :)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit ac3597ef8b7781499ab55f1039670ec82202e32c)
    (cherry picked from commit cd7e6b0a0de376c94f9c97247db65a959031a21a)

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

Summary of changes:
 WHATSNEW.txt      |    5 +++++
 source/web/cgi.c  |    4 ++--
 source/web/swat.c |    8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 31e644b..1db5358 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -233,6 +233,11 @@ o   Marc VanHeyningen <marc.vanheyningen at isilon.com>
     * Fix memory leak.
 
 
+o   Andreas Schneider <anschneider at suse.de>
+    * BUG 5515: Fix empty input fields in SWAT.
+    * BUG 5516: Fix saving of the config file in SWAT.
+
+
 o   Bo Yang <boyang at novell.com>
     * Fix winbindd trusted domain child not keeping primary domain
       online status up to date.
diff --git a/source/web/cgi.c b/source/web/cgi.c
index 28f64f8..070e80c 100644
--- a/source/web/cgi.c
+++ b/source/web/cgi.c
@@ -206,14 +206,14 @@ void cgi_load_variables(void)
 		size_t dest_len;
 
 		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
-			       variables[i].name, -1,
+			       variables[i].name, strlen(variables[i].name),
 			       &dest, &dest_len, True);
 		SAFE_FREE(variables[i].name);
 		variables[i].name = SMB_STRDUP(dest ? dest : "");
 
 		dest = NULL;
 		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
-			       variables[i].value, -1,
+			       variables[i].value, strlen(variables[i].value),
 			       &dest, &dest_len, True);
 		SAFE_FREE(variables[i].value);
 		variables[i].value = SMB_STRDUP(dest ? dest : "");
diff --git a/source/web/swat.c b/source/web/swat.c
index 6d8f4ca..6c6d78e 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -86,13 +86,14 @@ static const char *fix_quotes(TALLOC_CTX *ctx, const char *str)
 
 	/* Count the number of quotes. */
 	newstring_len = 1;
-	while (*str) {
-		if ( *str == '\"') {
+	p = (char *) str;
+	while (*p) {
+		if ( *p == '\"') {
 			newstring_len += quote_len;
 		} else {
 			newstring_len++;
 		}
-		++str;
+		++p;
 	}
 	newstring = TALLOC_ARRAY(ctx, char, newstring_len);
 	if (!newstring) {
@@ -105,7 +106,6 @@ static const char *fix_quotes(TALLOC_CTX *ctx, const char *str)
 		} else {
 			*p++ = *str;
 		}
-		++str;
 	}
 	*p = '\0';
 	return newstring;


-- 
Samba Shared Repository