reverted the rename of new_spoolss_io_r_enumprinterdrivers()

(This used to be commit fd6bfe03f4454272bdce59c78ae7148a72caaf18)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 04480cd8a163396597fd008c5b353d63c40c9693..7e158c1e03eebb68fa67992f29f06aa5cc71d1f1 100644 (file)
--- 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 356ee8f03d7d20bf8a43a933471edf214cb23d86..12abcc1a15db63a46b787f34b3931a3d35a5f485 100644 (file)
--- 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 24d0fa25383ec840d72dbce22f824d3fbbfd63fd..d6987b46aa0e97b6f60673ff411a91a929ce1a58 100644 (file)
--- 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 1932c6f927ce608abee8d66ac494e6014dddaacd..e8f855f7f1abf032bf4b3bbeb54d9aaaab3670d0 100755 (executable)
--- 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;
        }