loadparm: rename lp[cfg]_pathname to lp[cfg]_path for consistency with docs

Signed-off-by: Michael Adam <obnox@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

3 files changed, 10 insertions, 10 deletions

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 73c4cf76ee1..9b0fcdccfc8 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -89,7 +89,7 @@ static bool print_driver_directories_init(void)
 		return true;
 	}
 
-	driver_path = lp_pathname(mem_ctx, service);
+	driver_path = lp_path(mem_ctx, service);
 	if (driver_path == NULL) {
 		talloc_free(mem_ctx);
 		return false;
@@ -682,7 +682,7 @@ static uint32 get_correct_cversion(struct auth_session_info *session_info,
 					   server_messaging_context(),
 					   &conn,
 					   printdollar_snum,
-					   lp_pathname(talloc_tos(), printdollar_snum),
+					   lp_path(talloc_tos(), printdollar_snum),
 					   session_info, &oldcwd);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("get_correct_cversion: create_conn_struct "
@@ -1069,7 +1069,7 @@ WERROR move_driver_to_download_area(struct auth_session_info *session_info,
 					   server_messaging_context(),
 					   &conn,
 					   printdollar_snum,
-					   lp_pathname(talloc_tos(), printdollar_snum),
+					   lp_path(talloc_tos(), printdollar_snum),
 					   session_info, &oldcwd);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("move_driver_to_download_area: create_conn_struct "
@@ -1604,7 +1604,7 @@ bool delete_driver_files(const struct auth_session_info *session_info,
 					   server_messaging_context(),
 					   &conn,
 					   printdollar_snum,
-					   lp_pathname(talloc_tos(), printdollar_snum),
+					   lp_path(talloc_tos(), printdollar_snum),
 					   session_info, &oldcwd);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("delete_driver_files: create_conn_struct "
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)) {
diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index 0507e834466..26d8a006460 100644
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -121,8 +121,8 @@ NTSTATUS print_spool_open(files_struct *fsp,
 	 */
 
 	pf->filename = talloc_asprintf(pf, "%s/%sXXXXXX",
-					lp_pathname(talloc_tos(),
-						    SNUM(fsp->conn)),
+					lp_path(talloc_tos(),
+						SNUM(fsp->conn)),
 					PRINT_SPOOL_PREFIX);
 	if (!pf->filename) {
 		status = NT_STATUS_NO_MEMORY;