[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1173-g14be3fd

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  14be3fd3daee943d0aaad1029ab629e5d379708b (commit)
      from  39bfcc5d50892ad0c387f0ca3932e961e77fdc39 (commit)

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


- Log -----------------------------------------------------------------
commit 14be3fd3daee943d0aaad1029ab629e5d379708b
Author: Günther Deschner <g...@samba.org>
Date:   Tue Jun 30 13:12:01 2009 +0200

    s3-spoolss: Bug #6512. Fix support for enumerating user forms.
    
    Found while testing Xerox WorkCentre 133 PCL driver, now also tested with
    torture test.
    
    Guenther
    (cherry picked from commit b85b93dcff89e18bd15d4cef8b8c2dc61bc42cbe)

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

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c 
b/source3/rpc_server/srv_spoolss_nt.c
index 5c56acf..79f0f14 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7024,7 +7024,7 @@ static WERROR spoolss_enumforms_level1(TALLOC_CTX 
*mem_ctx,
 
        /* construct the list of form structures */
        for (i=0; i<num_builtin_forms; i++) {
-               DEBUGADD(6,("Filling form number [%d]\n",i));
+               DEBUGADD(6,("Filling builtin form number [%d]\n",i));
                result = fill_form_info_1(info, &info[i].info1,
                                          &builtin_forms[i]);
                if (!W_ERROR_IS_OK(result)) {
@@ -7032,10 +7032,10 @@ static WERROR spoolss_enumforms_level1(TALLOC_CTX 
*mem_ctx,
                }
        }
 
-       for (; i<num_user_forms; i++) {
-               DEBUGADD(6,("Filling form number [%d]\n",i));
-               result = fill_form_info_1(info, &info[i].info1,
-                                         &user_forms[i-num_builtin_forms]);
+       for (i=0; i<num_user_forms; i++) {
+               DEBUGADD(6,("Filling user form number [%d]\n",i));
+               result = fill_form_info_1(info, 
&info[i+num_builtin_forms].info1,
+                                         &user_forms[i]);
                if (!W_ERROR_IS_OK(result)) {
                        goto out;
                }


-- 
Samba Shared Repository