From d85bab275aa3794cefd838bbf1516ea63ed668fc Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 2 Feb 2014 14:04:46 +0100 Subject: loadparm: rename lp[cfg]_pathname to lp[cfg]_path for consistency with docs Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett Reviewed-by: Garming Sam --- source3/printing/printing.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/printing/printing.c') diff --git a/source3/printing/printing.c b/source3/printing/printing.c index ea93f74b190..2f23607980a 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -2656,7 +2656,7 @@ static WERROR print_job_checks(const struct auth_session_info *server_info, /* see if we have sufficient disk space */ if (lp_minprintspace(snum)) { minspace = lp_minprintspace(snum); - ret = sys_fsusage(lp_pathname(talloc_tos(), snum), &dspace, &dsize); + ret = sys_fsusage(lp_path(talloc_tos(), snum), &dspace, &dsize); if (ret == 0 && dspace < 2*minspace) { DEBUG(3, ("print_job_checks: " "disk space check failed.\n")); @@ -2702,7 +2702,7 @@ static WERROR print_job_spool_file(int snum, uint32_t jobid, * Verify that the file name is ok, within path, and it is * already already there */ if (output_file) { - path = lp_pathname(talloc_tos(), snum); + path = lp_path(talloc_tos(), snum); len = strlen(path); if (strncmp(output_file, path, len) == 0 && (output_file[len - 1] == '/' || output_file[len] == '/')) { @@ -2731,7 +2731,7 @@ static WERROR print_job_spool_file(int snum, uint32_t jobid, } slprintf(pjob->filename, sizeof(pjob->filename)-1, - "%s/%sXXXXXX", lp_pathname(talloc_tos(), snum), + "%s/%sXXXXXX", lp_path(talloc_tos(), snum), PRINT_SPOOL_PREFIX); mask = umask(S_IRWXO | S_IRWXG); pjob->fd = mkstemp(pjob->filename); @@ -2778,7 +2778,7 @@ WERROR print_job_start(const struct auth_session_info *server_info, return WERR_INTERNAL_DB_CORRUPTION; } - path = lp_pathname(talloc_tos(), snum); + path = lp_path(talloc_tos(), snum); werr = print_job_checks(server_info, msg_ctx, snum, &njobs); if (!W_ERROR_IS_OK(werr)) { -- cgit v1.2.1