[SCM] Samba Shared Repository - branch master updated
simo
idra at samba.org
Tue Sep 28 17:32:58 MDT 2010
On Wed, 2010-09-29 at 01:23 +0200, Günther Deschner wrote:
> The branch, master has been updated
> via ec33a87 s3-printing: skip metadata entry when traversing printerlist.
> from fcee50b pidl: add support for pointers in typedefs
>
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
>
>
> - Log -----------------------------------------------------------------
> commit ec33a87d5855348e6de4c1f0f02d3bd5a0638985
> Author: Günther Deschner <gd at samba.org>
> Date: Wed Sep 29 01:18:07 2010 +0200
>
> s3-printing: skip metadata entry when traversing printerlist.
>
> We were creating a new printer (with a very broken name) out of the
> lasttimestamp entry all the time.
>
> Simo, please check.
>
> Guenther
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> source3/printing/printer_list.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
>
> Changeset truncated at 500 lines:
>
> diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
> index 667ff70..8e9e06a 100644
> --- a/source3/printing/printer_list.c
> +++ b/source3/printing/printer_list.c
> @@ -380,6 +380,11 @@ static int printer_list_exec_fn(struct db_record *rec, void *private_data)
> char *comment;
> int ret;
>
> + /* always skip PL_TIMESTAMP_KEY key */
> + if (strequal((const char *)rec->key.dptr, PL_TIMESTAMP_KEY)) {
> + return 0;
> + }
> +
> ret = tdb_unpack(rec->value.dptr, rec->value.dsize,
> PL_DATA_FORMAT, &time_h, &time_l, &name, &comment);
> if (ret == -1) {
>
>
Obviously correct, sorry for introducing this bug :/
Simo.
--
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Principal Software Engineer at Red Hat, Inc. <simo at redhat.com>
More information about the samba-technical
mailing list