Merge branch 'master' of ssh://git.samba.org/data/git/samba

1 files changed, 0 insertions, 696 deletions

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 577ba73a42..435bb1bd80 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -71,387 +71,6 @@ bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime)
 }
 
 /*******************************************************************
-reads or writes an NOTIFY OPTION TYPE structure.
-********************************************************************/  
-
-/* NOTIFY_OPTION_TYPE and NOTIFY_OPTION_TYPE_DATA are really one
-   structure.  The _TYPE structure is really the deferred referrants (i.e
-   the notify fields array) of the _TYPE structure. -tpot */
-
-static bool smb_io_notify_option_type(const char *desc, SPOOL_NOTIFY_OPTION_TYPE *type, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "smb_io_notify_option_type");
-	depth++;
- 
-	if (!prs_align(ps))
-		return False;
-
-	if(!prs_uint16("type", ps, depth, &type->type))
-		return False;
-	if(!prs_uint16("reserved0", ps, depth, &type->reserved0))
-		return False;
-	if(!prs_uint32("reserved1", ps, depth, &type->reserved1))
-		return False;
-	if(!prs_uint32("reserved2", ps, depth, &type->reserved2))
-		return False;
-	if(!prs_uint32("count", ps, depth, &type->count))
-		return False;
-	if(!prs_uint32("fields_ptr", ps, depth, &type->fields_ptr))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY OPTION TYPE DATA.
-********************************************************************/  
-
-static bool smb_io_notify_option_type_data(const char *desc, SPOOL_NOTIFY_OPTION_TYPE *type, prs_struct *ps, int depth)
-{
-	int i;
-
-	prs_debug(ps, depth, desc, "smb_io_notify_option_type_data");
-	depth++;
- 
- 	/* if there are no fields just return */
-	if (type->fields_ptr==0)
-		return True;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("count2", ps, depth, &type->count2))
-		return False;
-	
-	if (type->count2 != type->count)
-		DEBUG(4,("What a mess, count was %x now is %x !\n", type->count, type->count2));
-
-	if (type->count2 > MAX_NOTIFY_TYPE_FOR_NOW) {
-		return False;
-	}
-
-	/* parse the option type data */
-	for(i=0;i<type->count2;i++)
-		if(!prs_uint16("fields",ps,depth,&type->fields[i]))
-			return False;
-	return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY OPTION structure.
-********************************************************************/  
-
-static bool smb_io_notify_option_type_ctr(const char *desc, SPOOL_NOTIFY_OPTION_TYPE_CTR *ctr , prs_struct *ps, int depth)
-{		
-	int i;
-	
-	prs_debug(ps, depth, desc, "smb_io_notify_option_type_ctr");
-	depth++;
- 
-	if(!prs_uint32("count", ps, depth, &ctr->count))
-		return False;
-
-	/* reading */
-	if (UNMARSHALLING(ps) && ctr->count)
-		if((ctr->type=PRS_ALLOC_MEM(ps,SPOOL_NOTIFY_OPTION_TYPE,ctr->count)) == NULL)
-			return False;
-		
-	/* the option type struct */
-	for(i=0;i<ctr->count;i++)
-		if(!smb_io_notify_option_type("", &ctr->type[i] , ps, depth))
-			return False;
-
-	/* the type associated with the option type struct */
-	for(i=0;i<ctr->count;i++)
-		if(!smb_io_notify_option_type_data("", &ctr->type[i] , ps, depth))
-			return False;
-	
-	return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY OPTION structure.
-********************************************************************/  
-
-static bool smb_io_notify_option(const char *desc, SPOOL_NOTIFY_OPTION *option, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "smb_io_notify_option");
-	depth++;
- 	
-	if(!prs_uint32("version", ps, depth, &option->version))
-		return False;
-	if(!prs_uint32("flags", ps, depth, &option->flags))
-		return False;
-	if(!prs_uint32("count", ps, depth, &option->count))
-		return False;
-	if(!prs_uint32("option_type_ptr", ps, depth, &option->option_type_ptr))
-		return False;
-	
-	/* marshalling or unmarshalling, that would work */	
-	if (option->option_type_ptr!=0) {
-		if(!smb_io_notify_option_type_ctr("", &option->ctr ,ps, depth))
-			return False;
-	}
-	else {
-		option->ctr.type=NULL;
-		option->ctr.count=0;
-	}
-	
-	return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY INFO DATA structure.
-********************************************************************/  
-
-static bool smb_io_notify_info_data(const char *desc,SPOOL_NOTIFY_INFO_DATA *data, prs_struct *ps, int depth)
-{
-	uint32 useless_ptr=0x0FF0ADDE;
-
-	prs_debug(ps, depth, desc, "smb_io_notify_info_data");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-	if(!prs_uint16("type",           ps, depth, &data->type))
-		return False;
-	if(!prs_uint16("field",          ps, depth, &data->field))
-		return False;
-
-	if(!prs_uint32("how many words", ps, depth, &data->size))
-		return False;
-	if(!prs_uint32("id",             ps, depth, &data->id))
-		return False;
-	if(!prs_uint32("how many words", ps, depth, &data->size))
-		return False;
-
-	switch (data->enc_type) {
-
-		/* One and two value data has two uint32 values */
-
-	case NOTIFY_ONE_VALUE:
-	case NOTIFY_TWO_VALUE:
-
-		if(!prs_uint32("value[0]", ps, depth, &data->notify_data.value[0]))
-			return False;
-		if(!prs_uint32("value[1]", ps, depth, &data->notify_data.value[1]))
-			return False;
-		break;
-
-		/* Pointers and strings have a string length and a
-		   pointer.  For a string the length is expressed as
-		   the number of uint16 characters plus a trailing
-		   \0\0. */
-
-	case NOTIFY_POINTER:
-
-		if(!prs_uint32("string length", ps, depth, &data->notify_data.data.length ))
-			return False;
-		if(!prs_uint32("pointer", ps, depth, &useless_ptr))
-			return False;
-
-		break;
-
-	case NOTIFY_STRING:
-
-		if(!prs_uint32("string length", ps, depth, &data->notify_data.data.length))
-			return False;
-
-		if(!prs_uint32("pointer", ps, depth, &useless_ptr))
-			return False;
-
-		break;
-
-	case NOTIFY_SECDESC:
-		if( !prs_uint32( "sd size", ps, depth, &data->notify_data.sd.size ) )
-			return False;
-		if( !prs_uint32( "pointer", ps, depth, &useless_ptr ) )
-			return False;
-		
-		break;
-
-	default:
-		DEBUG(3, ("invalid enc_type %d for smb_io_notify_info_data\n",
-			  data->enc_type));
-		break;
-	}
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY INFO DATA structure.
-********************************************************************/  
-
-bool smb_io_notify_info_data_strings(const char *desc,SPOOL_NOTIFY_INFO_DATA *data,
-                                     prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "smb_io_notify_info_data_strings");
-	depth++;
-	
-	if(!prs_align(ps))
-		return False;
-
-	switch(data->enc_type) {
-
-		/* No data for values */
-
-	case NOTIFY_ONE_VALUE:
-	case NOTIFY_TWO_VALUE:
-
-		break;
-
-		/* Strings start with a length in uint16s */
-
-	case NOTIFY_STRING:
-
-		if (MARSHALLING(ps))
-			data->notify_data.data.length /= 2;
-
-		if(!prs_uint32("string length", ps, depth, &data->notify_data.data.length))
-			return False;
-
-		if (UNMARSHALLING(ps) && data->notify_data.data.length) {
-			data->notify_data.data.string = PRS_ALLOC_MEM(ps, uint16,
-								data->notify_data.data.length);
-
-			if (!data->notify_data.data.string) 
-				return False;
-		}
-
-		if (!prs_uint16uni(True, "string", ps, depth, data->notify_data.data.string,
-				   data->notify_data.data.length))
-			return False;
-
-		if (MARSHALLING(ps))
-			data->notify_data.data.length *= 2;
-
-		break;
-
-	case NOTIFY_POINTER:
-
-		if (UNMARSHALLING(ps) && data->notify_data.data.length) {
-			data->notify_data.data.string = PRS_ALLOC_MEM(ps, uint16,
-								data->notify_data.data.length);
-
-			if (!data->notify_data.data.string) 
-				return False;
-		}
-
-		if(!prs_uint8s(True,"buffer",ps,depth,(uint8*)data->notify_data.data.string,data->notify_data.data.length))
-			return False;
-
-		break;
-
-	case NOTIFY_SECDESC:	
-		if( !prs_uint32("secdesc size ", ps, depth, &data->notify_data.sd.size ) )
-			return False;
-		if ( !sec_io_desc( "sec_desc", &data->notify_data.sd.desc, ps, depth ) )
-			return False;
-		break;
-
-	default:
-		DEBUG(3, ("invalid enc_type %d for smb_io_notify_info_data_strings\n",
-			  data->enc_type));
-		break;
-	}
-
-#if 0
-	if (isvalue==False) {
-
-		/* length of string in unicode include \0 */
-		x=data->notify_data.data.length+1;
-
-		if (data->field != 16)
-		if(!prs_uint32("string length", ps, depth, &x ))
-			return False;
-
-		if (MARSHALLING(ps)) {
-			/* These are already in little endian format. Don't byte swap. */
-			if (x == 1) {
-
-				/* No memory allocated for this string
-				   therefore following the data.string
-				   pointer is a bad idea.  Use a pointer to
-				   the uint32 length union member to
-				   provide a source for a unicode NULL */
-
-				if(!prs_uint8s(True,"string",ps,depth, (uint8 *)&data->notify_data.data.length,x*2)) 
-					return False;
-			} else {
-
-				if (data->field == 16)
-					x /= 2;
-
-				if(!prs_uint16uni(True,"string",ps,depth,data->notify_data.data.string,x))
-					return False;
-			}
-		} else {
-
-			/* Tallocate memory for string */
-
-			if (x) {
-				data->notify_data.data.string = PRS_ALLOC_MEM(ps, uint16, x * 2);
-				if (!data->notify_data.data.string) 
-					return False;
-			} else {
-				data->notify_data.data.string = NULL;
-			}
-
-			if(!prs_uint16uni(True,"string",ps,depth,data->notify_data.data.string,x))
-				return False;
-		}
-	}
-
-#endif
-
-#if 0	/* JERRY */
-	/* Win2k does not seem to put this parse align here */
-	if(!prs_align(ps))
-		return False;
-#endif
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY INFO structure.
-********************************************************************/  
-
-static bool smb_io_notify_info(const char *desc, SPOOL_NOTIFY_INFO *info, prs_struct *ps, int depth)
-{
-	int i;
-
-	prs_debug(ps, depth, desc, "smb_io_notify_info");
-	depth++;
- 
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("count", ps, depth, &info->count))
-		return False;
-	if(!prs_uint32("version", ps, depth, &info->version))
-		return False;
-	if(!prs_uint32("flags", ps, depth, &info->flags))
-		return False;
-	if(!prs_uint32("count", ps, depth, &info->count))
-		return False;
-
-	for (i=0;i<info->count;i++) {
-		if(!smb_io_notify_info_data(desc, &info->data[i], ps, depth))
-			return False;
-	}
-
-	/* now do the strings at the end of the stream */	
-	for (i=0;i<info->count;i++) {
-		if(!smb_io_notify_info_data_strings(desc, &info->data[i], ps, depth))
-			return False;
-	}
-
-	return True;
-}
-
-/*******************************************************************
 ********************************************************************/  
 
 bool spool_io_user_level_1( const char *desc, prs_struct *ps, int depth, SPOOL_USER_1 *q_u )
@@ -1014,130 +633,6 @@ bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u,
 }
 
 /*******************************************************************
- * read a structure.
- * called from spoolss_q_rffpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_q_rffpcnex(const char *desc, SPOOL_Q_RFFPCNEX *q_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_q_rffpcnex");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
-		return False;
-	if(!prs_uint32("flags", ps, depth, &q_u->flags))
-		return False;
-	if(!prs_uint32("options", ps, depth, &q_u->options))
-		return False;
-	if(!prs_uint32("localmachine_ptr", ps, depth, &q_u->localmachine_ptr))
-		return False;
-	if(!smb_io_unistr2("localmachine", &q_u->localmachine, q_u->localmachine_ptr, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-		
-	if(!prs_uint32("printerlocal", ps, depth, &q_u->printerlocal))
-		return False;
-
-	if(!prs_uint32("option_ptr", ps, depth, &q_u->option_ptr))
-		return False;
-	
-	if (q_u->option_ptr!=0) {
-	
-		if (UNMARSHALLING(ps))
-			if((q_u->option=PRS_ALLOC_MEM(ps,SPOOL_NOTIFY_OPTION,1)) == NULL)
-				return False;
-	
-		if(!smb_io_notify_option("notify option", q_u->option, ps, depth))
-			return False;
-	}
-	
-	return True;
-}
-
-/*******************************************************************
- * write a structure.
- * called from spoolss_r_rffpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_r_rffpcnex(const char *desc, SPOOL_R_RFFPCNEX *r_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_r_rffpcnex");
-	depth++;
-
-	if(!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- * read a structure.
- * called from spoolss_q_rfnpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_q_rfnpcnex(const char *desc, SPOOL_Q_RFNPCNEX *q_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_q_rfnpcnex");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
-		return False;
-
-	if(!prs_uint32("change", ps, depth, &q_u->change))
-		return False;
-	
-	if(!prs_uint32("option_ptr", ps, depth, &q_u->option_ptr))
-		return False;
-	
-	if (q_u->option_ptr!=0) {
-	
-		if (UNMARSHALLING(ps))
-			if((q_u->option=PRS_ALLOC_MEM(ps,SPOOL_NOTIFY_OPTION,1)) == NULL)
-				return False;
-	
-		if(!smb_io_notify_option("notify option", q_u->option, ps, depth))
-			return False;
-	}
-
-	return True;
-}
-
-/*******************************************************************
- * write a structure.
- * called from spoolss_r_rfnpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_r_rfnpcnex(const char *desc, SPOOL_R_RFNPCNEX *r_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_r_rfnpcnex");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-		
-	if (!prs_uint32("info_ptr", ps, depth, &r_u->info_ptr))
-		return False;
-
-	if(!smb_io_notify_info("notify info", &r_u->info ,ps,depth))
-		return False;
-	
-	if(!prs_align(ps))
-		return False;
-	if(!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
  * return the length of a uint16 (obvious, but the code is clean)
  ********************************************************************/
 
@@ -4619,170 +4114,6 @@ void free_job_info_2(JOB_INFO_2 *job)
         free_devmode(job->devmode);
 }
 
-#if 0	/* JERRY - not currently used but could be :-) */
-
-/*******************************************************************
- Deep copy a SPOOL_NOTIFY_INFO_DATA structure
- ******************************************************************/
-static bool copy_spool_notify_info_data(SPOOL_NOTIFY_INFO_DATA *dst, 
-				SPOOL_NOTIFY_INFO_DATA *src, int n)
-{
-	int i;
-
-	memcpy(dst, src, sizeof(SPOOL_NOTIFY_INFO_DATA)*n);
-	
-	for (i=0; i<n; i++) {
-		int len;
-		uint16 *s = NULL;
-		
-		if (src->size != POINTER) 
-			continue;
-		len = src->notify_data.data.length;
-		s = SMB_MALLOC_ARRAY(uint16, len);
-		if (s == NULL) {
-			DEBUG(0,("copy_spool_notify_info_data: malloc() failed!\n"));
-			return False;
-		}
-		
-		memcpy(s, src->notify_data.data.string, len*2);
-		dst->notify_data.data.string = s;
-	}
-	
-	return True;
-}
-
-/*******************************************************************
- Deep copy a SPOOL_NOTIFY_INFO structure
- ******************************************************************/
-static bool copy_spool_notify_info(SPOOL_NOTIFY_INFO *dst, SPOOL_NOTIFY_INFO *src)
-{
-	if (!dst) {
-		DEBUG(0,("copy_spool_notify_info: NULL destination pointer!\n"));
-		return False;
-	}
-		
-	dst->version = src->version;
-	dst->flags   = src->flags;
-	dst->count   = src->count;
-	
-	if (dst->count) 
-	{
-		dst->data = SMB_MALLOC_ARRAY(SPOOL_NOTIFY_INFO_DATA, dst->count);
-		
-		DEBUG(10,("copy_spool_notify_info: allocating space for [%d] PRINTER_NOTIFY_INFO_DATA entries\n",
-			dst->count));
-
-		if (dst->data == NULL) {
-			DEBUG(0,("copy_spool_notify_info: malloc() failed for [%d] entries!\n", 
-				dst->count));
-			return False;
-		}
-		
-		return (copy_spool_notify_info_data(dst->data, src->data, src->count));
-	}
-	
-	return True;
-}
-#endif	/* JERRY */
-
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-
-bool make_spoolss_q_reply_rrpcn(SPOOL_Q_REPLY_RRPCN *q_u, POLICY_HND *hnd,
-			        uint32 change_low, uint32 change_high,
-				SPOOL_NOTIFY_INFO *info)
-{      
-	if (q_u == NULL)
-		return False;
-
-	memcpy(&q_u->handle, hnd, sizeof(q_u->handle));
-
-	q_u->change_low=change_low;
-	q_u->change_high=change_high;
-
-	q_u->unknown0=0x0;
-	q_u->unknown1=0x0;
-
-	q_u->info_ptr=0x0FF0ADDE;
-
-	q_u->info.version=2;
-	
-	if (info->count) {
-		DEBUG(10,("make_spoolss_q_reply_rrpcn: [%d] PRINTER_NOTIFY_INFO_DATA\n",
-			info->count));
-		q_u->info.version = info->version;
-		q_u->info.flags   = info->flags;
-		q_u->info.count   = info->count;
-		/* pointer field - be careful! */
-		q_u->info.data    = info->data;
-	}
-	else  {
-	q_u->info.flags=PRINTER_NOTIFY_INFO_DISCARDED;
-	q_u->info.count=0;
-	}
-
-	return True;
-}
-
-/*******************************************************************
- Parse a SPOOL_Q_REPLY_RRPCN structure.
-********************************************************************/  
-
-bool spoolss_io_q_reply_rrpcn(const char *desc, SPOOL_Q_REPLY_RRPCN *q_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_q_reply_rrpcn");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
-		return False;
-
-	if (!prs_uint32("change_low", ps, depth, &q_u->change_low))
-		return False;
-
-	if (!prs_uint32("change_high", ps, depth, &q_u->change_high))
-		return False;
-
-	if (!prs_uint32("unknown0", ps, depth, &q_u->unknown0))
-		return False;
-
-	if (!prs_uint32("unknown1", ps, depth, &q_u->unknown1))
-		return False;
-
-	if (!prs_uint32("info_ptr", ps, depth, &q_u->info_ptr))
-		return False;
-
-	if(q_u->info_ptr!=0)
-		if(!smb_io_notify_info(desc, &q_u->info, ps, depth))
-			return False;
-		
-	return True;
-}
-
-/*******************************************************************
- Parse a SPOOL_R_REPLY_RRPCN structure.
-********************************************************************/  
-
-bool spoolss_io_r_reply_rrpcn(const char *desc, SPOOL_R_REPLY_RRPCN *r_u, prs_struct *ps, int depth)
-{		
-	prs_debug(ps, depth, desc, "spoolss_io_r_reply_rrpcn");
-	depth++;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("unknown0", ps, depth, &r_u->unknown0))
-		return False;
-
-	if (!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;		
-}
-
 /*******************************************************************
  * read a structure.
  ********************************************************************/  
@@ -5071,30 +4402,3 @@ bool make_spoolss_q_getjob(SPOOL_Q_GETJOB *q_u, POLICY_HND *handle,
 
 	return True;
 }
-
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-
-bool make_spoolss_q_rffpcnex(SPOOL_Q_RFFPCNEX *q_u, POLICY_HND *handle,
-			     uint32 flags, uint32 options, const char *localmachine,
-			     uint32 printerlocal, SPOOL_NOTIFY_OPTION *option)
-{
-        memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
-
-	q_u->flags = flags;
-	q_u->options = options;
-
-	q_u->localmachine_ptr = 1;
-
-	init_unistr2(&q_u->localmachine, localmachine, UNI_STR_TERMINATE);
-
-	q_u->printerlocal = printerlocal;
-
-	if (option)
-		q_u->option_ptr = 1;
-
-	q_u->option = option;
-
-	return True;
-}