[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0rc2-87-gd601f8a
Karolin Seeger
kseeger at samba.org
Thu Jun 26 14:07:24 GMT 2008
The branch, v3-2-stable has been updated
via d601f8a55a69221e3e7f8ada70c1fe8d03a84818 (commit)
via 780eeb509a2fe8276d305fed941c42891fbdf899 (commit)
from 5f67f6636b885d247b2a6ae029e1ff715268bfe5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit d601f8a55a69221e3e7f8ada70c1fe8d03a84818
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Jun 26 15:46:26 2008 +0200
WHATSNEW: Update changes since 3.2.0rc2.
Karolin
(cherry picked from commit 956e1f754580d7194e1716a90725f1e02c8001f7)
commit 780eeb509a2fe8276d305fed941c42891fbdf899
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 26 15:32:27 2008 +0200
Fix a segfault in rpcclient adddriver
(cherry picked from commit d4b5a9d67389578f531527b339f6feead62f082d)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 1 +
source/rpcclient/cmd_spoolss.c | 25 +++++++++++++------------
2 files changed, 14 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c498f88..413e68b 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -236,6 +236,7 @@ o Volker Lendecke <vl at samba.org>
* Fix the build on FreeBSD 4.6.2 and Darwin.
* Fix a double-closedir() in form_junctions().
* Fix a crash in _dfs_Enum.
+ * Fix a segfault in rpcclient adddriver.
o Günther Deschner <gd at samba.org>
diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c
index 7530ab1..47409af 100644
--- a/source/rpcclient/cmd_spoolss.c
+++ b/source/rpcclient/cmd_spoolss.c
@@ -1219,13 +1219,13 @@ void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch)
Needed to handle the empty parameter string denoted by "NULL"
*************************************************************************/
-static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest)
+static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest,
+ char **saveptr)
{
char *ptr;
- char *saveptr;
/* get the next token */
- ptr = strtok_r(str, delim, &saveptr);
+ ptr = strtok_r(str, delim, saveptr);
/* a string of 'NULL' is used to represent an empty
parameter because two consecutive delimiters
@@ -1255,17 +1255,18 @@ static bool init_drv_info_3_members ( TALLOC_CTX *mem_ctx, DRIVER_INFO_3 *info,
char *saveptr = NULL;
/* fill in the UNISTR fields */
- str = get_driver_3_param (args, ":", &info->name);
- str = get_driver_3_param (NULL, ":", &info->driverpath);
- str = get_driver_3_param (NULL, ":", &info->datafile);
- str = get_driver_3_param (NULL, ":", &info->configfile);
- str = get_driver_3_param (NULL, ":", &info->helpfile);
- str = get_driver_3_param (NULL, ":", &info->monitorname);
- str = get_driver_3_param (NULL, ":", &info->defaultdatatype);
+ str = get_driver_3_param (args, ":", &info->name, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->driverpath, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->datafile, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->configfile, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->helpfile, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->monitorname, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->defaultdatatype, &saveptr);
/* <Comma Separated List of Dependent Files> */
- str2 = get_driver_3_param (NULL, ":", NULL); /* save the beginning of the string */
- str = str2;
+ /* save the beginning of the string */
+ str2 = get_driver_3_param (NULL, ":", NULL, &saveptr);
+ str = str2;
/* begin to strip out each filename */
str = strtok_r(str, ",", &saveptr);
--
Samba Shared Repository
More information about the samba-cvs
mailing list