diff options
| author | Gerald Carter <jerry@samba.org> | 2001-08-10 04:27:26 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2001-08-10 04:27:26 +0000 |
| commit | de5f42c9d9172592779fa2504d44544e3b6b1c0d (patch) | |
| tree | ff2bdb78aa923d47e8c939e022395273be744519 | |
| parent | fc0fe941d8c2bd012076803452b3b4f21e019ecc (diff) | |
| download | samba-de5f42c9d9172592779fa2504d44544e3b6b1c0d.tar.gz samba-de5f42c9d9172592779fa2504d44544e3b6b1c0d.tar.bz2 samba-de5f42c9d9172592779fa2504d44544e3b6b1c0d.zip | |
merge from 2.2
(This used to be commit 6ab0e949d18b97ea7177175a4e6abb5ba076db98)
| -rw-r--r-- | source3/param/loadparm.c | 8 | ||||
| -rw-r--r-- | source3/smbd/lanman.c | 2 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f3e3dcc31c..c110139e21 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -178,7 +178,7 @@ typedef struct int maxdisksize; int lpqcachetime; int iMaxSmbdProcesses; - BOOL bLanmanPrinting; + BOOL bDisableSpoolss; int iTotalPrintJobs; int syslog; int os_level; @@ -823,7 +823,7 @@ static struct parm_struct parm_table[] = { {"postscript", P_BOOL, P_LOCAL, &sDefault.bPostscript, NULL, NULL, FLAG_PRINT}, {"printing", P_ENUM, P_LOCAL, &sDefault.iPrinting, NULL, enum_printing, FLAG_PRINT | FLAG_GLOBAL}, {"print command", P_STRING, P_LOCAL, &sDefault.szPrintcommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL}, - {"lanman printing only", P_BOOL, P_GLOBAL, &Globals.bLanmanPrinting, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL}, + {"disable spoolss", P_BOOL, P_GLOBAL, &Globals.bDisableSpoolss, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL}, {"lpq command", P_STRING, P_LOCAL, &sDefault.szLpqcommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL}, {"lprm command", P_STRING, P_LOCAL, &sDefault.szLprmcommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL}, {"lppause command", P_STRING, P_LOCAL, &sDefault.szLppausecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL}, @@ -1215,7 +1215,7 @@ static void init_globals(void) Globals.max_xmit = 65535; Globals.max_mux = 50; /* This is *needed* for profile support. */ Globals.lpqcachetime = 10; - Globals.bLanmanPrinting = False; + Globals.bDisableSpoolss = False; Globals.iMaxSmbdProcesses = 0;/* no limit specified */ Globals.iTotalPrintJobs = 0; /* no limit specified */ Globals.pwordlevel = 0; @@ -1573,7 +1573,7 @@ FN_GLOBAL_INTEGER(lp_security, &Globals.security) FN_GLOBAL_INTEGER(lp_maxdisksize, &Globals.maxdisksize) FN_GLOBAL_INTEGER(lp_lpqcachetime, &Globals.lpqcachetime) FN_GLOBAL_INTEGER(lp_max_smbd_processes, &Globals.iMaxSmbdProcesses) -FN_GLOBAL_INTEGER(lp_lanman_printing_only, &Globals.bLanmanPrinting) +FN_GLOBAL_INTEGER(lp_disable_spoolss, &Globals.bDisableSpoolss) FN_GLOBAL_INTEGER(lp_totalprintjobs, &Globals.iTotalPrintJobs) FN_GLOBAL_INTEGER(lp_syslog, &Globals.syslog) static FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as) diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index c84812cb83..fe3516ee9d 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -933,7 +933,7 @@ static BOOL api_DosPrintQGetInfo(connection_struct *conn, * in order to support lanman style printing with Win NT/2k * clients --jerry */ - if (!mdrcnt && lp_lanman_printing_only()) + if (!mdrcnt && lp_disable_spoolss()) desc.errcode = ERRbuftoosmall; *rdata_len = desc.usedlen; diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index d342e44ca4..f0195fc0dd 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -474,7 +474,7 @@ static int nt_open_pipe(char *fname, connection_struct *conn, /* See if it is one we want to handle. */ - if (lp_lanman_printing_only() && strequal(fname, "\\spoolss")) + if (lp_disable_spoolss() && strequal(fname, "\\spoolss")) return(ERROR(ERRSRV,ERRaccess)); for( i = 0; known_nt_pipes[i]; i++ ) |