diff options
| author | Gerald Carter <jerry@samba.org> | 2001-03-19 18:14:09 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2001-03-19 18:14:09 +0000 |
| commit | 344fb49fbf4df55492bfa9cc1aee2d8210c32ca6 (patch) | |
| tree | bc1bd08c3f93aceb3cbd4d3b3b9d7ceba3f470a9 | |
| parent | 6e64ea14738909c8ba2cfbf5f06d73c03b9195ff (diff) | |
| download | samba-344fb49fbf4df55492bfa9cc1aee2d8210c32ca6.tar.gz samba-344fb49fbf4df55492bfa9cc1aee2d8210c32ca6.tar.bz2 samba-344fb49fbf4df55492bfa9cc1aee2d8210c32ca6.zip | |
reverted the rename of new_spoolss_io_r_enumprinterdrivers()
(This used to be commit fd6bfe03f4454272bdce59c78ae7148a72caaf18)
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/libsmb/cli_spoolss.c | 2 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 2 | ||||
| -rwxr-xr-x | source3/rpc_server/srv_spoolss.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 04480cd8a1..7e158c1e03 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -3303,7 +3303,7 @@ BOOL spoolss_io_r_schedulejob(char *desc, SPOOL_R_SCHEDULEJOB *r_u, prs_struct * BOOL spoolss_io_q_schedulejob(char *desc, SPOOL_Q_SCHEDULEJOB *q_u, prs_struct *ps, int depth); BOOL spoolss_io_r_setjob(char *desc, SPOOL_R_SETJOB *r_u, prs_struct *ps, int depth); BOOL spoolss_io_q_setjob(char *desc, SPOOL_Q_SETJOB *q_u, prs_struct *ps, int depth); -BOOL spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth); +BOOL new_spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth); BOOL make_spoolss_q_enumprinterdrivers(SPOOL_Q_ENUMPRINTERDRIVERS *q_u, const char *name, const char *environment, diff --git a/source3/libsmb/cli_spoolss.c b/source3/libsmb/cli_spoolss.c index 356ee8f03d..12abcc1a15 100644 --- a/source3/libsmb/cli_spoolss.c +++ b/source3/libsmb/cli_spoolss.c @@ -725,7 +725,7 @@ uint32 cli_spoolss_enumprinterdrivers ( } /* Unmarshall response */ - if (spoolss_io_r_enumprinterdrivers ("", &r, &rbuf, 0)) + if (new_spoolss_io_r_enumprinterdrivers ("", &r, &rbuf, 0)) { needed = r.needed; } diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index 24d0fa2538..d6987b46aa 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -3768,7 +3768,7 @@ BOOL spoolss_io_q_setjob(char *desc, SPOOL_Q_SETJOB *q_u, prs_struct *ps, int de Parse a SPOOL_R_ENUMPRINTERDRIVERS structure. ********************************************************************/ -BOOL spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth) +BOOL new_spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth) { prs_debug(ps, depth, desc, "spoolss_io_r_enumprinterdrivers"); depth++; diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c index 1932c6f927..e8f855f7f1 100755 --- a/source3/rpc_server/srv_spoolss.c +++ b/source3/rpc_server/srv_spoolss.c @@ -712,7 +712,7 @@ static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p) r_u.status = _spoolss_enumprinterdrivers(p, &q_u, &r_u); - if (!spoolss_io_r_enumprinterdrivers("",&r_u,rdata,0)) { + if (!new_spoolss_io_r_enumprinterdrivers("",&r_u,rdata,0)) { DEBUG(0,("spoolss_io_r_enumprinterdrivers: unable to marshall SPOOL_R_ENUMPRINTERDRIVERS.\n")); return False; } |