diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
| commit | 27b7e51a3cc619f879655a3230611457ac43b9e7 (patch) | |
| tree | 7aeb0ed6623ea91092320f13bb12eb167c446809 /source3/printing | |
| parent | d645041d6345ff2802dd2f06ebed1d8f456fee23 (diff) | |
| download | samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.gz samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.bz2 samba-27b7e51a3cc619f879655a3230611457ac43b9e7.zip | |
Merge from HEAD:
- fstring/pstring mixups
- the detection code that found them (disabled)
- a bit of whitespace
- a static
Andrew Bartlett
(This used to be commit 9b70fa868e7d9481f584c83fc4046174e1dedfd9)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 2 | ||||
| -rw-r--r-- | source3/printing/printing.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index f04992ac82..72e3d38bb3 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1585,7 +1585,7 @@ static uint32 add_a_printer_driver_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver) int len, buflen; fstring architecture; pstring directory; - pstring temp_name; + fstring temp_name; pstring key; char *buf; int i, ret; diff --git a/source3/printing/printing.c b/source3/printing/printing.c index a770e7a09a..5f2594f07a 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1934,7 +1934,7 @@ int print_queue_status(int snum, *queue = NULL; printername = lp_const_servicename(snum); pdb = get_print_db_byname(printername); - + if (!pdb) return 0; |