diff options
author | David O'Neill <dmo@samba.org> | 2001-01-17 18:47:46 +0000 |
---|---|---|
committer | David O'Neill <dmo@samba.org> | 2001-01-17 18:47:46 +0000 |
commit | 792ca5d98938c3c52ff4e598bcb55056565dc202 (patch) | |
tree | bb46ce6cad82833e1db7b15ebb9c1f91838405a4 /source3/printing/load.c | |
parent | 73ba07b3623022e1bde22721b67dba769cc7a1f2 (diff) | |
download | samba-792ca5d98938c3c52ff4e598bcb55056565dc202.tar.gz samba-792ca5d98938c3c52ff4e598bcb55056565dc202.tar.bz2 samba-792ca5d98938c3c52ff4e598bcb55056565dc202.zip |
Changes from APPLIANCE_HEAD:
source/rpc_server/srv_spoolss_nt.c
- Unrolled construct_notify_jobs_info() loop to only fetch
printer info_2 structure once rather than num_print_jobs times.
- convert command to unix codepage.
- remove lp_remove_service() call as it prevents lp_killservice()
from working.
- Modified some DEBUG and DEBUGADD statements.
source/param/loadparm.c
source/param/params.c
- change printer, preload, auto services to FLAG_DOS_STRING,
reverted earlier changes to szPrintername et al, add comments.
source/printing/load.c
- fix bug with lp_auto_services() and strtok()
source/printing/nt_printing.c
source/printing/printing.c
- remove redundant test that used SERVICE(snum)
source/printing/pcap.c
- add unix_to_dos() calls, add notes wrt FIXMEs for
xxx_printer_fn() functions.
source/web/swat.c
- added FIXME comment.
source/smbd/service.c
- added comment re: dos codepage
(This used to be commit 7b774b72c2857af9519012106714a9e2cb099da3)
Diffstat (limited to 'source3/printing/load.c')
-rw-r--r-- | source3/printing/load.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/printing/load.c b/source3/printing/load.c index fbf10d22b8..275ffa21ed 100644 --- a/source3/printing/load.c +++ b/source3/printing/load.c @@ -41,13 +41,16 @@ static void add_auto_printers(void) { char *p; int printers; - char *str = lp_auto_services(); + char *str = strdup(lp_auto_services()); if (!str) return; printers = lp_servicenumber(PRINTERS_NAME); - if (printers < 0) return; + if (printers < 0) { + free(str); + return; + } for (p=strtok(str,LIST_SEP);p;p=strtok(NULL,LIST_SEP)) { if (lp_servicenumber(p) >= 0) continue; @@ -56,6 +59,8 @@ static void add_auto_printers(void) lp_add_printer(p,printers); } } + + free(str); } /*************************************************************************** |