From b4d152448767b3de950085d73388df4fce2d44dd Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 5 Aug 2000 16:14:52 +0000 Subject: make proto talloc.h from HEAD --- source/include/proto.h | 1 + source/include/rpc_parse_proto.h | 13 ++++++++++++- source/include/talloc.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/source/include/proto.h b/source/include/proto.h index aa5a6dcee13..e6f68e6a8bd 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -791,6 +791,7 @@ UNISTR2 *unistr2_new(const char *init); UNISTR2 *unistr2_assign(UNISTR2 *str, const uint16 *src, size_t len); UNISTR2 *unistr2_assign_ascii(UNISTR2 *str, const char *buf, int len); UNISTR2 *unistr2_assign_ascii_str(UNISTR2 *str, const char *buf); +void init_unistr2_from_unistr(UNISTR2 *to, const UNISTR *from); UNISTR2 *unistr2_grow(UNISTR2 *str, size_t new_size); BOOL unistr2upper(UNISTR2 *str, const UNISTR2 *from); BOOL copy_unistr2(UNISTR2 *str, const UNISTR2 *from); diff --git a/source/include/rpc_parse_proto.h b/source/include/rpc_parse_proto.h index 9e323305a58..01682717ad0 100644 --- a/source/include/rpc_parse_proto.h +++ b/source/include/rpc_parse_proto.h @@ -850,6 +850,11 @@ BOOL make_spoolss_q_open_printer_ex(SPOOL_Q_OPEN_PRINTER_EX *q_u, uint32 access_required, const fstring clientname, const fstring user_name); +BOOL make_spoolss_q_addprinterex(SPOOL_Q_ADDPRINTEREX *q_u, const char *srv_name, + const char* clientname, const char* user_name, + uint32 level, PRINTER_INFO_2 *info); +BOOL make_spool_printer_info_2(SPOOL_PRINTER_INFO_LEVEL_2 **spool_info2, + PRINTER_INFO_2 *info); BOOL spoolss_io_q_open_printer_ex(char *desc, SPOOL_Q_OPEN_PRINTER_EX *q_u, prs_struct *ps, int depth); void free_spoolss_q_open_printer_ex(SPOOL_Q_OPEN_PRINTER_EX *q_u); BOOL spoolss_io_r_open_printer_ex(char *desc, SPOOL_R_OPEN_PRINTER_EX *r_u, prs_struct *ps, int depth); @@ -882,6 +887,8 @@ BOOL new_smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *i BOOL new_smb_io_printer_info_1(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_1 *info, int depth); BOOL new_smb_io_printer_info_2(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2 *info, int depth); BOOL new_smb_io_printer_info_3(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_3 *info, int depth); +BOOL new_smb_io_port_info_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth); +BOOL new_smb_io_port_info_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth); BOOL new_smb_io_printer_driver_info_1(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_1 *info, int depth) ; BOOL new_smb_io_printer_driver_info_2(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_2 *info, int depth) ; BOOL new_smb_io_printer_driver_info_3(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_3 *info, int depth); @@ -926,6 +933,9 @@ BOOL spoolss_io_r_getprinterdriver2(char *desc, SPOOL_R_GETPRINTERDRIVER2 *r_u, BOOL make_spoolss_q_enumprinters(SPOOL_Q_ENUMPRINTERS *q_u, uint32 flags, fstring servername, uint32 level, NEW_BUFFER *buffer, uint32 offered); +BOOL make_spoolss_q_enumports(SPOOL_Q_ENUMPORTS *q_u, + fstring servername, uint32 level, + NEW_BUFFER *buffer, uint32 offered); BOOL spoolss_io_q_enumprinters(char *desc, SPOOL_Q_ENUMPRINTERS *q_u, prs_struct *ps, int depth); BOOL new_spoolss_io_r_enumprinters(char *desc, SPOOL_R_ENUMPRINTERS *r_u, prs_struct *ps, int depth); BOOL spoolss_io_r_getprinter(char *desc, SPOOL_R_GETPRINTER *r_u, prs_struct *ps, int depth); @@ -967,7 +977,8 @@ BOOL spool_io_printer_info_level_3(char *desc, SPOOL_PRINTER_INFO_LEVEL_3 *il, p BOOL spool_io_printer_info_level_2(char *desc, SPOOL_PRINTER_INFO_LEVEL_2 *il, prs_struct *ps, int depth); BOOL spool_io_printer_info_level(char *desc, SPOOL_PRINTER_INFO_LEVEL *il, prs_struct *ps, int depth); BOOL spoolss_io_q_addprinterex(char *desc, SPOOL_Q_ADDPRINTEREX *q_u, prs_struct *ps, int depth); -BOOL spoolss_io_r_addprinterex(char *desc, SPOOL_R_ADDPRINTEREX *r_u, prs_struct *ps, int depth); +BOOL spoolss_io_r_addprinterex(char *desc, SPOOL_R_ADDPRINTEREX *r_u, + prs_struct *ps, int depth); BOOL spool_io_printer_driver_info_level_3(char *desc, SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 **q_u, prs_struct *ps, int depth); void free_spool_printer_driver_info_level_3(SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 **q_u); diff --git a/source/include/talloc.h b/source/include/talloc.h index df68166a5e1..a0dc3d9795e 100644 --- a/source/include/talloc.h +++ b/source/include/talloc.h @@ -1,3 +1,5 @@ +#ifndef _TALLOC_H_ +#define _TALLOC_H_ /* Unix SMB/Netbios implementation. Version 3.0 @@ -30,3 +32,4 @@ typedef struct { struct talloc_chunk *list; } TALLOC_CTX; +#endif -- cgit