summaryrefslogtreecommitdiff
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-04-02 01:01:24 +0000
committerJeremy Allison <jra@samba.org>1998-04-02 01:01:24 +0000
commit612cbb6a6039c2cafb3de5e644f23a2a26d6c645 (patch)
tree8170678ed3ed75b7411cfd8d7387940783069ffc /source3/param/loadparm.c
parentd99d6f0d2e956037f5a60250b044ccdde9d6a330 (diff)
downloadsamba-612cbb6a6039c2cafb3de5e644f23a2a26d6c645.tar.gz
samba-612cbb6a6039c2cafb3de5e644f23a2a26d6c645.tar.bz2
samba-612cbb6a6039c2cafb3de5e644f23a2a26d6c645.zip
Patch from Chris Maltby <chris@softway.com.au>. His comments follow:
+ improvement to smbtar to allow exclusion/inclusion of system and hidden files, and to generate a listing of what has been archived in a format useful for automated backup systems. + add the "Softq" spooling system to samba's printing capabilities. + I have "fixed" the intrusion of US style dates into samba reporting as well. The format yyyy/mm/dd is not only uunambiguous, but also has the benefit of making lexicographic sorts work correctly. Jeremy. (This used to be commit f9dacd1d8b89fccad859c0c6bc7a492823eb4b06)
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 70f06065a3..2527692bc5 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -407,7 +407,8 @@ static struct enum_list enum_security[] = {{SEC_SHARE, "SHARE"}, {SEC_USER, "US
static struct enum_list enum_printing[] = {{PRINT_SYSV, "sysv"}, {PRINT_AIX, "aix"},
{PRINT_HPUX, "hpux"}, {PRINT_BSD, "bsd"},
{PRINT_QNX, "qnx"}, {PRINT_PLP, "plp"},
- {PRINT_LPRNG, "lprng"}, {-1, NULL}};
+ {PRINT_LPRNG, "lprng"}, {PRINT_SOFTQ, "softq"},
+ {-1, NULL}};
static struct enum_list enum_announce_as[] = {{ANNOUNCE_AS_NT, "NT"}, {ANNOUNCE_AS_WIN95, "win95"},
{ANNOUNCE_AS_WFW, "WfW"}, {-1, NULL}};
@@ -821,6 +822,13 @@ static void init_locals(void)
string_initial(&sDefault.szPrintcommand,"lp -r -P%p %s");
break;
+ case PRINT_SOFTQ:
+ string_initial(&sDefault.szLpqcommand,"qstat -l -d%p");
+ string_initial(&sDefault.szLprmcommand,"qstat -s -j%j -c");
+ string_initial(&sDefault.szPrintcommand,"lp -d%p -s %s; rm %s");
+ string_initial(&sDefault.szLppausecommand,"qstat -s -j%j -h");
+ string_initial(&sDefault.szLpresumecommand,"qstat -s -j%j -r");
+ break;
}
}