svn commit: samba r23465 - in branches: SAMBA_3_0/source/registry SAMBA_3_0_26/source/registry

[obnox at samba.org]

Author: obnox
Date: 2007-06-13 11:04:31 +0000 (Wed, 13 Jun 2007)
New Revision: 23465

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23465

Log:
There was this diff between reg_printing in 3_0 and 3_0_26:
before writing to secdesc_buf->sd,
3_0 checked secdesc_buf->sd while 3_0_26 checked secdesc_buf->sd_size.

This patch makes both revisions check _both_ befor writing.

Jerry / Jeremy : please check if this is correct!

Michael


Modified:
   branches/SAMBA_3_0/source/registry/reg_printing.c
   branches/SAMBA_3_0_26/source/registry/reg_printing.c


Changeset:
Modified: branches/SAMBA_3_0/source/registry/reg_printing.c
===================================================================
--- branches/SAMBA_3_0/source/registry/reg_printing.c	2007-06-13 10:47:06 UTC (rev 23464)
+++ branches/SAMBA_3_0/source/registry/reg_printing.c	2007-06-13 11:04:31 UTC (rev 23465)
@@ -449,7 +449,10 @@
 		
 	/* stream the printer security descriptor */
 	
-	if ( info2->secdesc_buf && info2->secdesc_buf->sd )  {
+	if ( info2->secdesc_buf &&
+	     info2->secdesc_buf->sd &&
+	     info2->secdesc_buf->sd_size )  
+	{
 		if ( sec_io_desc("sec_desc", &info2->secdesc_buf->sd, &prs, 0 ) ) {
 			offset = prs_offset( &prs );
 			regval_ctr_addvalue( values, "Security", REG_BINARY, prs_data_p(&prs), offset );

Modified: branches/SAMBA_3_0_26/source/registry/reg_printing.c
===================================================================
--- branches/SAMBA_3_0_26/source/registry/reg_printing.c	2007-06-13 10:47:06 UTC (rev 23464)
+++ branches/SAMBA_3_0_26/source/registry/reg_printing.c	2007-06-13 11:04:31 UTC (rev 23465)
@@ -449,7 +449,10 @@
 		
 	/* stream the printer security descriptor */
 	
-	if ( info2->secdesc_buf && info2->secdesc_buf->sd_size )  {
+	if ( info2->secdesc_buf &&
+	     info2->secdesc_buf->sd &&
+	     info2->secdesc_buf->sd_size )  
+	{
 		if ( sec_io_desc("sec_desc", &info2->secdesc_buf->sd, &prs, 0 ) ) {
 			offset = prs_offset( &prs );
 			regval_ctr_addvalue( values, "Security", REG_BINARY, prs_data_p(&prs), offset );