diff options
| author | Michael Adam <obnox@samba.org> | 2014-02-02 14:48:41 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-03 13:27:15 +1300 |
| commit | 4286e147a62af784f4661cdd9d668e4d86cba4f2 (patch) | |
| tree | f332233b28f3021ff2396104a8d8dd147d2f609a /source3/smbd | |
| parent | 0cdb0f899809b624b5b5b234acdf974ac14a8d13 (diff) | |
| download | samba-4286e147a62af784f4661cdd9d668e4d86cba4f2.tar.gz samba-4286e147a62af784f4661cdd9d668e4d86cba4f2.tar.xz samba-4286e147a62af784f4661cdd9d668e4d86cba4f2.zip | |
loadparm: rename lp[cfg]_print_ok to lp[cfg]_printable 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>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/lanman.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server_reload.c | 2 | ||||
| -rw-r--r-- | source3/smbd/service.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index d0cf6ad378..9ff250f5c0 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -1945,7 +1945,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel, SCVAL(p,13,0); type = STYPE_DISKTREE; - if (lp_print_ok(snum)) { + if (lp_printable(snum)) { type = STYPE_PRINTQ; } if (strequal("IPC",lp_fstype(talloc_tos(),snum))) { diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index 1d6f9c2911..795f9f0495 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -33,7 +33,7 @@ static bool snum_is_shared_printer(int snum) { - return (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum)); + return (lp_browseable(snum) && lp_snum_ok(snum) && lp_printable(snum)); } /** diff --git a/source3/smbd/service.c b/source3/smbd/service.c index dad24ec581..8af85afec7 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -254,7 +254,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address } if (dev[0] == '?' || !dev[0]) { - if (lp_print_ok(snum)) { + if (lp_printable(snum)) { fstrcpy(dev,"LPT1:"); } else if (strequal(lp_fstype(talloc_tos(), snum), "IPC")) { fstrcpy(dev, "IPC"); @@ -268,7 +268,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address return NT_STATUS_INVALID_PARAMETER; } - if (lp_print_ok(snum)) { + if (lp_printable(snum)) { if (!strequal(dev, "LPT1:")) { return NT_STATUS_BAD_DEVICE_TYPE; } @@ -281,7 +281,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address } /* Behave as a printer if we are supposed to */ - if (lp_print_ok(snum) && (strcmp(dev, "A:") == 0)) { + if (lp_printable(snum) && (strcmp(dev, "A:") == 0)) { fstrcpy(dev, "LPT1:"); } |