diff options
| author | Jeremy Allison <jra@samba.org> | 2001-04-02 22:27:40 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-04-02 22:27:40 +0000 |
| commit | 9f793948bd34e79be1adecfe41c53cb7ec2636fa (patch) | |
| tree | 269683f47211e3d95a49d8a84776e7e38fc13a52 /source3/include | |
| parent | f439f72ceec665dbd1eae367eb5d7302d8a3338d (diff) | |
| download | samba-9f793948bd34e79be1adecfe41c53cb7ec2636fa.tar.gz samba-9f793948bd34e79be1adecfe41c53cb7ec2636fa.tar.bz2 samba-9f793948bd34e79be1adecfe41c53cb7ec2636fa.zip | |
include/ntdomain.h:
rpc_server/srv_lsa_hnd.c: Remove back pointer from policy handle list as the pipe
that opened the handle may have been closed. We were dereferencing
into something that had been closed.
rpc_parse/parse_spoolss.c: Sync up with Gerald's changes in 2.2.
lib/replace.c: Don't do proto on setlinebuf as it differs between systems.
Jeremy.
(This used to be commit 887ef3e12dc56b89b2284d42b16a81f03e15110b)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ntdomain.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 25 |
2 files changed, 18 insertions, 8 deletions
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h index f56b765d29..ecd261949c 100644 --- a/source3/include/ntdomain.h +++ b/source3/include/ntdomain.h @@ -143,7 +143,6 @@ typedef struct _input_data { struct policy { struct policy *next, *prev; - struct pipes_struct *p; POLICY_HND pol_hnd; diff --git a/source3/include/proto.h b/source3/include/proto.h index 7f1a03e586..1d75877547 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -198,7 +198,6 @@ void cmd_history(void); /*The following definitions come from lib/replace.c */ char *rep_inet_ntoa(struct in_addr ip); -void setlinebuf(FILE *stream); /*The following definitions come from lib/select.c */ @@ -3229,7 +3228,7 @@ BOOL make_spoolss_q_addprinterex( const char* user_name, uint32 level, PRINTER_INFO_CTR *ctr); -BOOL make_spool_printer_info_2( +BOOL make_spoolss_printer_info_2( SPOOL_PRINTER_INFO_LEVEL_2 **spool_info2, PRINTER_INFO_2 *info ); @@ -3321,8 +3320,20 @@ BOOL spoolss_io_q_enumprinters(char *desc, SPOOL_Q_ENUMPRINTERS *q_u, prs_struct BOOL 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); BOOL spoolss_io_q_getprinter(char *desc, SPOOL_Q_GETPRINTER *q_u, prs_struct *ps, int depth); -BOOL make_spoolss_q_getprinter(SPOOL_Q_GETPRINTER *q_u, const POLICY_HND *hnd, uint32 level, - NEW_BUFFER *buffer, uint32 offered); +BOOL make_spoolss_q_getprinter( + SPOOL_Q_GETPRINTER *q_u, + const POLICY_HND *hnd, + uint32 level, + NEW_BUFFER *buffer, + uint32 offered +); +BOOL make_spoolss_q_setprinter( + SPOOL_Q_SETPRINTER *q_u, + const POLICY_HND *hnd, + uint32 level, + PRINTER_INFO_CTR *info, + uint32 command +); BOOL spoolss_io_r_setprinter(char *desc, SPOOL_R_SETPRINTER *r_u, prs_struct *ps, int depth); BOOL spoolss_io_q_setprinter(char *desc, SPOOL_Q_SETPRINTER *q_u, prs_struct *ps, int depth); BOOL spoolss_io_r_fcpn(char *desc, SPOOL_R_FCPN *r_u, prs_struct *ps, int depth); @@ -3372,11 +3383,11 @@ BOOL make_spoolss_q_addprinterdriver( const char* srv_name, uint32 level, PRINTER_DRIVER_CTR *info); -BOOL make_spool_driver_info_3( - SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 *spool_drv_info, +BOOL make_spoolss_driver_info_3( + SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 **spool_drv_info, DRIVER_INFO_3 *info3 ); -BOOL make_spool_buffer5(BUFFER5 *buf5, uint32 len, uint16 *src); +BOOL make_spoolss_buffer5(BUFFER5 *buf5, uint32 len, uint16 *src); BOOL spoolss_io_q_addprinterdriver(char *desc, SPOOL_Q_ADDPRINTERDRIVER *q_u, prs_struct *ps, int depth); BOOL spoolss_io_r_addprinterdriver(char *desc, SPOOL_R_ADDPRINTERDRIVER *q_u, prs_struct *ps, int depth); BOOL uni_2_asc_printer_driver_3(SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 *uni, |