merge from 2.2

(This used to be commit 6ab0e949d18b97ea7177175a4e6abb5ba076db98)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f3e3dcc31cc5757a2be8213b3ffde39fda8de1e2..c110139e2115f6c16ca4e1d33a1216de08b6f418 100644 (file)
--- 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 c84812cb83402efb5a243c0b7355298ea2255607..fe3516ee9d69b14b9035b625d0bf7406d7bfcdd2 100644 (file)
--- 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 d342e44ca41e3fb816ee971c8aff9bc5dadd8227..f0195fc0ddb7a2ed8e32676ffdb2393333894cf0 100644 (file)
--- 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++ )