An smbtorture manpage is now provided

diff --git a/debian/patches/series b/debian/patches/series
index 5e154f4ec4e8fb56b393e3f3289e87e8057fc785..f6f26187debca2918301a57e662252d53c565657 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,5 @@ pam-examples.patch
 README_nosmbldap-tools.patch
 smbclient-pager.patch
 smbtar-bashism.patch
-smbtorture-manpage.patch
 usershare.patch
 VERSION.patch

diff --git a/debian/patches/smbtorture-manpage.patch b/debian/patches/smbtorture-manpage.patch
deleted file mode 100644 (file)
index 59930b5..0000000
--- a/debian/patches/smbtorture-manpage.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: Provide a manpage for smbtorture
-Author: Christian Perrier <bubulle@debian.org>
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=8930
-Forwarded: yes
-Bug-Debian: http://bugs.debian.org/528735
-
-Index: samba/docs/manpages/smbtorture.1
-===================================================================
---- /dev/null
-+++ samba/docs/manpages/smbtorture.1
-@@ -0,0 +1,83 @@
-+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-+.TH smbtorture "1" "May 2012" "samba test suite" "User Commands"
-+.SH NAME
-+smbtorture \- samba test suite.
-+.SH SYNOPSIS
-+.B smbtorture
-+\fI//server/share <options> TEST1 TEST2 \fR...
-+.SH DESCRIPTION
-+smbtorture is the original samba3 test suite. It is nowadays recommended to use samba4 torture.
-+.HP
-+\fB\-d\fR debuglevel
-+.HP
-+\fB\-U\fR user%pass
-+.TP
-+\fB\-k\fR
-+use kerberos
-+.HP
-+\fB\-N\fR numprocs
-+.HP
-+\fB\-n\fR my_netbios_name
-+.HP
-+\fB\-W\fR workgroup
-+.HP
-+\fB\-o\fR num_operations
-+.HP
-+\fB\-O\fR socket_options
-+.HP
-+\fB\-m\fR maximum protocol
-+.HP
-+\fB\-L\fR use oplocks
-+.TP
-+\fB\-c\fR CLIENT.TXT
-+specify client load file for NBENCH
-+.HP
-+\fB\-A\fR showall
-+.HP
-+\fB\-p\fR port
-+.HP
-+\fB\-s\fR seed
-+.TP
-+\fB\-b\fR unclist_filename
-+specify multiple shares for multiple connections
-+.PP
-+tests are: FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7 LOCK8 LOCK9 UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE RANDOMIPC NEGNOWAIT NBENCH NBENCH2 OPLOCK1 OPLOCK2 OPLOCK3 OPLOCK4 DIR DIR1 DIR\-CREATETIME DENY1 DENY2 TCON TCONDEV RW1 RW2 RW3 RW\-SIGNING OPEN POSIX POSIX\-APPEND ASYNC\-ECHO UID\-REGRESSION\-TEST SHORTNAME\-TEST ADDRCHANGE OPENATTR XCOPY RENAME DELETE DELETE\-LN PROPERTIES MANGLE MANGLE1 W2K TRANS2SCAN NTTRANSSCAN UTABLE CASETABLE ERRMAPEXTRACT PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS EATEST SESSSETUP_BENCH CHAIN1 CHAIN2 WINDOWS\-WRITE CLI_ECHO GETADDRINFO TLDAP STREAMERROR NOTIFY\-BENCH BAD\-NBT\-SESSION SMB\-ANY\-CONNECT LOCAL\-SUBSTITUTE LOCAL\-GENCACHE LOCAL\-TALLOC\-DICT LOCAL\-BASE64 LOCAL\-RBTREE LOCAL\-MEMCACHE LOCAL\-STREAM\-NAME LOCAL\-WBCLIENT LOCAL\-string_to_sid LOCAL\-binary_to_sid LOCAL\-DBTRANS LOCAL\-TEVENT\-SELECT
-+default test is ALL
-+.PP
-+Usage: smbtorture //server/share <options> TEST1 TEST2 ...
-+.HP
-+\fB\-d\fR debuglevel
-+.HP
-+\fB\-U\fR user%pass
-+.TP
-+\fB\-k\fR
-+use kerberos
-+.HP
-+\fB\-N\fR numprocs
-+.HP
-+\fB\-n\fR my_netbios_name
-+.HP
-+\fB\-W\fR workgroup
-+.HP
-+\fB\-o\fR num_operations
-+.HP
-+\fB\-O\fR socket_options
-+.HP
-+\fB\-m\fR maximum protocol
-+.HP
-+\fB\-L\fR use oplocks
-+.TP
-+\fB\-c\fR CLIENT.TXT
-+specify client load file for NBENCH
-+.HP
-+\fB\-A\fR showall
-+.HP
-+\fB\-p\fR port
-+.HP
-+\fB\-s\fR seed
-+.TP
-+\fB\-b\fR unclist_filename
-+specify multiple shares for multiple connections
-+.PP
-+tests are: FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7 LOCK8 LOCK9 UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE RANDOMIPC NEGNOWAIT NBENCH NBENCH2 OPLOCK1 OPLOCK2 OPLOCK3 OPLOCK4 DIR DIR1 DIR\-CREATETIME DENY1 DENY2 TCON TCONDEV RW1 RW2 RW3 RW\-SIGNING OPEN POSIX POSIX\-APPEND ASYNC\-ECHO UID\-REGRESSION\-TEST SHORTNAME\-TEST ADDRCHANGE OPENATTR XCOPY RENAME DELETE DELETE\-LN PROPERTIES MANGLE MANGLE1 W2K TRANS2SCAN NTTRANSSCAN UTABLE CASETABLE ERRMAPEXTRACT PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS EATEST SESSSETUP_BENCH CHAIN1 CHAIN2 WINDOWS\-WRITE CLI_ECHO GETADDRINFO TLDAP STREAMERROR NOTIFY\-BENCH BAD\-NBT\-SESSION SMB\-ANY\-CONNECT LOCAL\-SUBSTITUTE LOCAL\-GENCACHE LOCAL\-TALLOC\-DICT LOCAL\-BASE64 LOCAL\-RBTREE LOCAL\-MEMCACHE LOCAL\-STREAM\-NAME LOCAL\-WBCLIENT LOCAL\-string_to_sid LOCAL\-binary_to_sid LOCAL\-DBTRANS LOCAL\-TEVENT\-SELECT
-+default test is ALL