[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  ae20737... s3-kerberos: do not include authdata headers before including krb5 headers.
       via  e512ccb... s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.
      from  663a1f5... s4:winbind - Fix it another time up

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


- Log -----------------------------------------------------------------
commit ae207370667a12db53362ee5dcdab8e6d4bb388f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 18:30:18 2009 +0100

    s3-kerberos: do not include authdata headers before including krb5 headers.
    
    Guenther

commit e512ccb5b677fa7f285829ec645fc067837c0e11
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 19:01:54 2009 +0100

    s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.
    
    Guenther

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

Summary of changes:
 source3/include/authdata.h          |    2 --
 source3/include/includes.h          |    1 -
 source3/libads/authdata.c           |    1 +
 source3/rpc_server/srv_spoolss_nt.c |   20 ++++++--------------
 4 files changed, 7 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/authdata.h b/source3/include/authdata.h
index 70f6d2d..e1a5155 100644
--- a/source3/include/authdata.h
+++ b/source3/include/authdata.h
@@ -21,8 +21,6 @@
 #ifndef _AUTHDATA_H
 #define _AUTHDATA_H
 
-#include "rpc_misc.h"
-
 #define PAC_TYPE_LOGON_INFO 1
 #define PAC_TYPE_SERVER_CHECKSUM 6
 #define PAC_TYPE_PRIVSVR_CHECKSUM 7
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 37cb611..cf09795 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -652,7 +652,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "passdb.h"
 #include "rpc_secdes.h"
 #include "../libgpo/gpo.h"
-#include "authdata.h"
 #include "msdfs.h"
 #include "rap.h"
 #include "../lib/crypto/md5.h"
diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index 35d5ef9..ed158ee 100644
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "smb_krb5.h"
+#include "authdata.h"
 
 #ifdef HAVE_KRB5
 
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index c704418..8d7973d 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -9125,10 +9125,6 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p,
 		goto done;
 	}
 
-	/* two byte termination (a multisz) */
-
-	*r->out.needed = 2;
-
 	array = talloc_zero_array(r->out.key_buffer, const char *, num_keys + 1);
 	if (!array) {
 		result = WERR_NOMEM;
@@ -9145,23 +9141,19 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p,
 			result = WERR_NOMEM;
 			goto done;
 		}
-
-		*r->out.needed += strlen_m_term(keynames[i]) * 2;
-	}
-
-	if (r->in.offered < *r->out.needed) {
-		result = WERR_MORE_DATA;
-		goto done;
 	}
 
-	result = WERR_OK;
-
 	if (!push_reg_multi_sz(p->mem_ctx, &blob, array)) {
 		result = WERR_NOMEM;
 		goto done;
 	}
 
-	if (r->in.offered >= blob.length) {
+	*r->out.needed = blob.length;
+
+	if (r->in.offered < *r->out.needed) {
+		result = WERR_MORE_DATA;
+	} else {
+		result = WERR_OK;
 		memcpy(r->out.key_buffer, blob.data, blob.length);
 	}
 


-- 
Samba Shared Repository