From 7ece10fa2346261c52f54f643fdc7fc77bf57a73 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 14 Apr 2008 15:39:30 +0000 Subject: Switch to SVG and Inkscape to generate pictures instead of Dia. This was discussed months ago and with Inkscape getting better and more clear in SVG processing it is now a preffered tool to create and process vector images. (This used to be commit 2575ceec2a817156832ce84e80a97923f10ecbe9) --- docs/Makefile | 26 +- docs/Makefile.settings.in | 1 + docs/README | 2 +- docs/Samba3-ByExample/images/AccountingNetwork.dia | Bin 2002 -> 0 bytes docs/Samba3-ByExample/images/AccountingNetwork.svg | 1588 ++++ docs/Samba3-ByExample/images/Charity-Network.dia | Bin 2588 -> 0 bytes docs/Samba3-ByExample/images/Charity-Network.svg | 1039 +++ .../images/UNIX-Samba-and-LDAP.dia | Bin 2395 -> 0 bytes .../images/UNIX-Samba-and-LDAP.svg | 312 + docs/Samba3-ByExample/images/acct2net.dia | Bin 2948 -> 0 bytes docs/Samba3-ByExample/images/acct2net.svg | 1901 ++++ .../images/ch7-dual-additive-LDAP-Ok.dia | Bin 1262 -> 0 bytes .../images/ch7-dual-additive-LDAP-Ok.svg | 143 + .../images/ch7-dual-additive-LDAP.dia | Bin 1375 -> 0 bytes .../images/ch7-dual-additive-LDAP.svg | 153 + docs/Samba3-ByExample/images/ch7-fail-overLDAP.dia | Bin 1130 -> 0 bytes docs/Samba3-ByExample/images/ch7-fail-overLDAP.svg | 120 + docs/Samba3-ByExample/images/ch7-singleLDAP.dia | Bin 948 -> 0 bytes docs/Samba3-ByExample/images/ch7-singleLDAP.svg | 73 + docs/Samba3-ByExample/images/ch8-migration.dia | Bin 1779 -> 0 bytes docs/Samba3-ByExample/images/ch8-migration.svg | 767 ++ docs/Samba3-ByExample/images/chap4-net.dia | Bin 3356 -> 0 bytes docs/Samba3-ByExample/images/chap4-net.svg | 2148 +++++ docs/Samba3-ByExample/images/chap5-net.dia | Bin 4528 -> 0 bytes docs/Samba3-ByExample/images/chap5-net.svg | 3668 ++++++++ docs/Samba3-ByExample/images/chap6-net.dia | Bin 4698 -> 0 bytes docs/Samba3-ByExample/images/chap6-net.svg | 3714 ++++++++ docs/Samba3-ByExample/images/chap7-idresol.dia | Bin 2757 -> 0 bytes docs/Samba3-ByExample/images/chap7-idresol.svg | 514 ++ docs/Samba3-ByExample/images/chap7-net-A.dia | Bin 9625 -> 0 bytes docs/Samba3-ByExample/images/chap7-net-A.svg | 9436 ++++++++++++++++++++ docs/Samba3-ByExample/images/chap7-net.dia | Bin 9256 -> 0 bytes docs/Samba3-ByExample/images/chap7-net.svg | 9010 +++++++++++++++++++ docs/Samba3-ByExample/images/chap7-net2-B.dia | Bin 9831 -> 0 bytes docs/Samba3-ByExample/images/chap7-net2-B.svg | 9085 +++++++++++++++++++ docs/Samba3-ByExample/images/chap7-net2.dia | Bin 9769 -> 0 bytes docs/Samba3-ByExample/images/chap7-net2.svg | 9075 +++++++++++++++++++ docs/Samba3-ByExample/images/chap9-ADSDC.dia | Bin 3024 -> 0 bytes docs/Samba3-ByExample/images/chap9-ADSDC.svg | 1321 +++ docs/Samba3-ByExample/images/chap9-SambaDC.dia | Bin 3403 -> 0 bytes docs/Samba3-ByExample/images/chap9-SambaDC.svg | 1443 +++ docs/Samba3-HOWTO/images/access1.dia | Bin 1583 -> 0 bytes docs/Samba3-HOWTO/images/access1.svg | 308 + docs/Samba3-HOWTO/images/browsing1.dia | Bin 2974 -> 0 bytes docs/Samba3-HOWTO/images/browsing1.svg | 2025 +++++ docs/Samba3-HOWTO/images/cups1.dia | Bin 1999 -> 0 bytes docs/Samba3-HOWTO/images/cups1.svg | 274 + docs/Samba3-HOWTO/images/cups2.dia | Bin 2175 -> 0 bytes docs/Samba3-HOWTO/images/cups2.svg | 320 + docs/Samba3-HOWTO/images/domain.dia | Bin 1586 -> 0 bytes docs/Samba3-HOWTO/images/domain.svg | 2288 +++++ docs/Samba3-HOWTO/images/idmap-gid2sid.dia | Bin 2253 -> 0 bytes docs/Samba3-HOWTO/images/idmap-gid2sid.svg | 277 + docs/Samba3-HOWTO/images/idmap-groups.dia | Bin 1234 -> 0 bytes docs/Samba3-HOWTO/images/idmap-groups.svg | 129 + docs/Samba3-HOWTO/images/idmap-sid2gid.dia | Bin 2276 -> 0 bytes docs/Samba3-HOWTO/images/idmap-sid2gid.svg | 277 + docs/Samba3-HOWTO/images/idmap-sid2uid.dia | Bin 2698 -> 0 bytes docs/Samba3-HOWTO/images/idmap-sid2uid.svg | 365 + docs/Samba3-HOWTO/images/idmap-store-gid2sid.dia | Bin 1432 -> 0 bytes docs/Samba3-HOWTO/images/idmap-store-gid2sid.svg | 122 + docs/Samba3-HOWTO/images/idmap-uid2sid.dia | Bin 2685 -> 0 bytes docs/Samba3-HOWTO/images/idmap-uid2sid.svg | 365 + docs/Samba3-HOWTO/images/idmap.dia | Bin 1172 -> 0 bytes docs/Samba3-HOWTO/images/idmap.svg | 119 + docs/Samba3-HOWTO/images/pdftoepsonusb.dia | Bin 1148 -> 0 bytes docs/Samba3-HOWTO/images/pdftoepsonusb.svg | 156 + docs/Samba3-HOWTO/images/pdftosocket.dia | Bin 893 -> 0 bytes docs/Samba3-HOWTO/images/pdftosocket.svg | 94 + docs/Samba3-HOWTO/images/trusts1.dia | Bin 1274 -> 0 bytes docs/Samba3-HOWTO/images/trusts1.svg | 792 ++ docs/configure.ac | 49 +- docs/db2latex-xslt-strict.diff | 98 - docs/structure.dia | Bin 2727 -> 0 bytes docs/structure.svg | 585 ++ 75 files changed, 64052 insertions(+), 130 deletions(-) delete mode 100644 docs/Samba3-ByExample/images/AccountingNetwork.dia create mode 100644 docs/Samba3-ByExample/images/AccountingNetwork.svg delete mode 100644 docs/Samba3-ByExample/images/Charity-Network.dia create mode 100644 docs/Samba3-ByExample/images/Charity-Network.svg delete mode 100644 docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.dia create mode 100644 docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.svg delete mode 100644 docs/Samba3-ByExample/images/acct2net.dia create mode 100644 docs/Samba3-ByExample/images/acct2net.svg delete mode 100644 docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.dia create mode 100644 docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.svg delete mode 100644 docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.dia create mode 100644 docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.svg delete mode 100644 docs/Samba3-ByExample/images/ch7-fail-overLDAP.dia create mode 100644 docs/Samba3-ByExample/images/ch7-fail-overLDAP.svg delete mode 100644 docs/Samba3-ByExample/images/ch7-singleLDAP.dia create mode 100644 docs/Samba3-ByExample/images/ch7-singleLDAP.svg delete mode 100644 docs/Samba3-ByExample/images/ch8-migration.dia create mode 100644 docs/Samba3-ByExample/images/ch8-migration.svg delete mode 100644 docs/Samba3-ByExample/images/chap4-net.dia create mode 100644 docs/Samba3-ByExample/images/chap4-net.svg delete mode 100644 docs/Samba3-ByExample/images/chap5-net.dia create mode 100644 docs/Samba3-ByExample/images/chap5-net.svg delete mode 100644 docs/Samba3-ByExample/images/chap6-net.dia create mode 100644 docs/Samba3-ByExample/images/chap6-net.svg delete mode 100644 docs/Samba3-ByExample/images/chap7-idresol.dia create mode 100644 docs/Samba3-ByExample/images/chap7-idresol.svg delete mode 100644 docs/Samba3-ByExample/images/chap7-net-A.dia create mode 100644 docs/Samba3-ByExample/images/chap7-net-A.svg delete mode 100644 docs/Samba3-ByExample/images/chap7-net.dia create mode 100644 docs/Samba3-ByExample/images/chap7-net.svg delete mode 100644 docs/Samba3-ByExample/images/chap7-net2-B.dia create mode 100644 docs/Samba3-ByExample/images/chap7-net2-B.svg delete mode 100644 docs/Samba3-ByExample/images/chap7-net2.dia create mode 100644 docs/Samba3-ByExample/images/chap7-net2.svg delete mode 100644 docs/Samba3-ByExample/images/chap9-ADSDC.dia create mode 100644 docs/Samba3-ByExample/images/chap9-ADSDC.svg delete mode 100644 docs/Samba3-ByExample/images/chap9-SambaDC.dia create mode 100644 docs/Samba3-ByExample/images/chap9-SambaDC.svg delete mode 100644 docs/Samba3-HOWTO/images/access1.dia create mode 100644 docs/Samba3-HOWTO/images/access1.svg delete mode 100644 docs/Samba3-HOWTO/images/browsing1.dia create mode 100644 docs/Samba3-HOWTO/images/browsing1.svg delete mode 100644 docs/Samba3-HOWTO/images/cups1.dia create mode 100644 docs/Samba3-HOWTO/images/cups1.svg delete mode 100644 docs/Samba3-HOWTO/images/cups2.dia create mode 100644 docs/Samba3-HOWTO/images/cups2.svg delete mode 100644 docs/Samba3-HOWTO/images/domain.dia create mode 100644 docs/Samba3-HOWTO/images/domain.svg delete mode 100644 docs/Samba3-HOWTO/images/idmap-gid2sid.dia create mode 100644 docs/Samba3-HOWTO/images/idmap-gid2sid.svg delete mode 100644 docs/Samba3-HOWTO/images/idmap-groups.dia create mode 100644 docs/Samba3-HOWTO/images/idmap-groups.svg delete mode 100644 docs/Samba3-HOWTO/images/idmap-sid2gid.dia create mode 100644 docs/Samba3-HOWTO/images/idmap-sid2gid.svg delete mode 100644 docs/Samba3-HOWTO/images/idmap-sid2uid.dia create mode 100644 docs/Samba3-HOWTO/images/idmap-sid2uid.svg delete mode 100644 docs/Samba3-HOWTO/images/idmap-store-gid2sid.dia create mode 100644 docs/Samba3-HOWTO/images/idmap-store-gid2sid.svg delete mode 100644 docs/Samba3-HOWTO/images/idmap-uid2sid.dia create mode 100644 docs/Samba3-HOWTO/images/idmap-uid2sid.svg delete mode 100644 docs/Samba3-HOWTO/images/idmap.dia create mode 100644 docs/Samba3-HOWTO/images/idmap.svg delete mode 100644 docs/Samba3-HOWTO/images/pdftoepsonusb.dia create mode 100644 docs/Samba3-HOWTO/images/pdftoepsonusb.svg delete mode 100644 docs/Samba3-HOWTO/images/pdftosocket.dia create mode 100644 docs/Samba3-HOWTO/images/pdftosocket.svg delete mode 100644 docs/Samba3-HOWTO/images/trusts1.dia create mode 100644 docs/Samba3-HOWTO/images/trusts1.svg delete mode 100644 docs/db2latex-xslt-strict.diff delete mode 100644 docs/structure.dia create mode 100644 docs/structure.svg diff --git a/docs/Makefile b/docs/Makefile index 56998ab866..1e4121053d 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -56,9 +56,9 @@ release: manpages3 htmlman3 html pdf clean: @echo "Cleaning up..." rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR) - rm -f $(patsubst %.dia,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \ - $(patsubst %.dia,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \ - $(patsubst %.dia,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) + rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \ + $(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \ + $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux rm -f *-images-html* rm -f *-images-latex-* latexfigures @@ -161,10 +161,10 @@ $(PDFDIR)/%.pdf: %.pdf --stringparam txtbasedir "$(TXTDIR)/$*/" \ --stringparam target "$*" \ -o $@ xslt/generate-dependencies.xsl $< - @echo "$*-images-latex-dia = \$$(wildcard \$$(addsuffix .dia, \$$($*-images-latex)))" >> $@ + @echo "$*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg, \$$($*-images-latex)))" >> $@ @echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@ - @echo "$*-images-latex-pdf: \$$(patsubst %.dia, %.pdf, \$$($*-images-latex-dia))" >> $@ - @echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.dia,%.png,\$$($*-images-latex-dia)), \$$(addsuffix .png, \$$($*-images-latex)))" >> $@ + @echo "$*-images-latex-pdf: \$$(patsubst %.svg, %.pdf, \$$($*-images-latex-svg))" >> $@ + @echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.svg,%.png,\$$($*-images-latex-svg)), \$$(addsuffix .png, \$$($*-images-latex)))" >> $@ @echo >> $@ @echo "\$$(HTMLDIR)/%: $*/%" >> $@ @@ -191,6 +191,9 @@ endif # Adobe PDF files %.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf + -$(PDFLATEX) $< + -$(PDFLATEX) $< + -$(PDFLATEX) $< -$(PDFLATEX) $< $(THUMBPDF) --quiet $*.pdf -$(PDFLATEX) $< @@ -203,11 +206,14 @@ $(DVIDIR)/%.dvi: %.dvi %.dvi: %.tex %.idx %-images-latex-eps -$(LATEX) $< -%.eps: %.dia - $(DIA) -t eps-builtin -e $@ $< +%.eps: %.svg + $(INKSCAPE) -z -f $< --export-eps=$@ + +%.png: %.svg + $(INKSCAPE) -z -f $< --export-png=$@ -%.png: %.dia - $(DIA) -e $@ $< +#%.pdf: %.svg +# $(INKSCAPE) -z -f $< --export-pdf=$@ %.pdf: %.eps $(EPSTOPDF) $< diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in index ce83a1a28f..fd7b4d70df 100644 --- a/docs/Makefile.settings.in +++ b/docs/Makefile.settings.in @@ -6,6 +6,7 @@ PNGTOPNM = @PNGTOPNM@ EPSTOPNM = @EPSTOPNM@ PNMTOPNG = @PNMTOPNG@ DIA = @DIA@ +INKSCAPE = @INKSCAPE@ PNMTOPS = @PNMTOPS@ HTML2TEXT = @HTML2TEXT@ DB2TEXI = @DB2TEXI@ diff --git a/docs/README b/docs/README index 589085b229..64095ebf39 100644 --- a/docs/README +++ b/docs/README @@ -57,7 +57,7 @@ To generate the docs, you need to have the following packages installed: * docbook-utils * xsltproc * pngtopnm and pnmtops (from the netpbm utilities) - * dia + * inkscape For generating PDF (thru LaTeX): * db2latex (from http://db2latex.sf.net/). Make sure to get CVS version diff --git a/docs/Samba3-ByExample/images/AccountingNetwork.dia b/docs/Samba3-ByExample/images/AccountingNetwork.dia deleted file mode 100644 index 3484dbad75..0000000000 Binary files a/docs/Samba3-ByExample/images/AccountingNetwork.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/AccountingNetwork.svg b/docs/Samba3-ByExample/images/AccountingNetwork.svg new file mode 100644 index 0000000000..7cf31f70fe --- /dev/null +++ b/docs/Samba3-ByExample/images/AccountingNetwork.svg @@ -0,0 +1,1588 @@ + + + + + Workgroup: BILLMORE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: 192.168.1.0/24 + .1 + .3 + .10 + .100+n + stable + (NT4) + cashpool + (Samba) + PCn + (n=1-9) + hplj + (HPLaserJet 4) + diff --git a/docs/Samba3-ByExample/images/Charity-Network.dia b/docs/Samba3-ByExample/images/Charity-Network.dia deleted file mode 100644 index ab9c7f5834..0000000000 Binary files a/docs/Samba3-ByExample/images/Charity-Network.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/Charity-Network.svg b/docs/Samba3-ByExample/images/Charity-Network.svg new file mode 100644 index 0000000000..12905c8018 --- /dev/null +++ b/docs/Samba3-ByExample/images/Charity-Network.svg @@ -0,0 +1,1039 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + desk1 + desk2 + desk3 + desk4 + desk5 + server + Workgroup: MIDEARTH + PRINTQ + hplj5 + .1 + .101 + .102 + .103 + .104 + .105 + .20 + .30 + Network: 192.168.1.0/24 + diff --git a/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.dia b/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.dia deleted file mode 100644 index dfd30fc022..0000000000 Binary files a/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.svg b/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.svg new file mode 100644 index 0000000000..ebd7412961 --- /dev/null +++ b/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.svg @@ -0,0 +1,312 @@ + + + + + + + + + + Posix + Samba + People + User + Accounts + uid/gids + Windows + Groups + Groups + People + Domain + Member + Machines + SIDs + + + + + NSS_LDAP + + + Winbind (NSS) + + + + + smbd + winbind + + + + + winbind + (IDMAP) + + + UNIX Interface + to LDAP + Samba Interface + to LDAP + LDAP Database + diff --git a/docs/Samba3-ByExample/images/acct2net.dia b/docs/Samba3-ByExample/images/acct2net.dia deleted file mode 100644 index ca1716254b..0000000000 Binary files a/docs/Samba3-ByExample/images/acct2net.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/acct2net.svg b/docs/Samba3-ByExample/images/acct2net.svg new file mode 100644 index 0000000000..13153b9a42 --- /dev/null +++ b/docs/Samba3-ByExample/images/acct2net.svg @@ -0,0 +1,1901 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .1 + IP via DHCP + hplj4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Domain: BILLMORE + 192.168.1.0/24 + 192.168.2.0/24 + .10 + .11 + .10 + .1 + IP via DHCP + hplj6 + qms + Server: + SLEETH + Accounting + Financial Services + 20 Users + 32 Users + diff --git a/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.dia b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.dia deleted file mode 100644 index e6464b9a13..0000000000 Binary files a/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.svg b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.svg new file mode 100644 index 0000000000..78b735c361 --- /dev/null +++ b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.svg @@ -0,0 +1,143 @@ + + + + + + + + + Samba + master + LDAP server + Directory A + + + + + slave + LDAP server + Directory B + + + + + + additive + diff --git a/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.dia b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.dia deleted file mode 100644 index 6e1e4979d6..0000000000 Binary files a/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.svg b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.svg new file mode 100644 index 0000000000..ad952c2901 --- /dev/null +++ b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.svg @@ -0,0 +1,153 @@ + + + + + + + + + Samba + master + LDAP server + + + + + slave + LDAP server + + + + + + additive + The LDAP backend consists of a + master and a slave for the same database. + This is a broken implementation + - accounts will be duplicated. + diff --git a/docs/Samba3-ByExample/images/ch7-fail-overLDAP.dia b/docs/Samba3-ByExample/images/ch7-fail-overLDAP.dia deleted file mode 100644 index f676e2adfe..0000000000 Binary files a/docs/Samba3-ByExample/images/ch7-fail-overLDAP.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/ch7-fail-overLDAP.svg b/docs/Samba3-ByExample/images/ch7-fail-overLDAP.svg new file mode 100644 index 0000000000..58af69ecab --- /dev/null +++ b/docs/Samba3-ByExample/images/ch7-fail-overLDAP.svg @@ -0,0 +1,120 @@ + + + + + + + + + Samba + master + LDAP server + + + + + + slave + LDAP server + + + + fail-over + diff --git a/docs/Samba3-ByExample/images/ch7-singleLDAP.dia b/docs/Samba3-ByExample/images/ch7-singleLDAP.dia deleted file mode 100644 index b03e7d354a..0000000000 Binary files a/docs/Samba3-ByExample/images/ch7-singleLDAP.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/ch7-singleLDAP.svg b/docs/Samba3-ByExample/images/ch7-singleLDAP.svg new file mode 100644 index 0000000000..7155fd1ffe --- /dev/null +++ b/docs/Samba3-ByExample/images/ch7-singleLDAP.svg @@ -0,0 +1,73 @@ + + + + + + + + + Samba + master + LDAP server + + + + diff --git a/docs/Samba3-ByExample/images/ch8-migration.dia b/docs/Samba3-ByExample/images/ch8-migration.dia deleted file mode 100644 index 04a513bcf0..0000000000 Binary files a/docs/Samba3-ByExample/images/ch8-migration.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/ch8-migration.svg b/docs/Samba3-ByExample/images/ch8-migration.svg new file mode 100644 index 0000000000..8656885b92 --- /dev/null +++ b/docs/Samba3-ByExample/images/ch8-migration.svg @@ -0,0 +1,767 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NT4 Registry + SAM + Samba SAM + (ldapsam or tdbsam) + NT4 + PDC + Samba + DC + net rpc vampire + Migration migrates: + User Accounts + Domain Groups + Machine Accounts + + + diff --git a/docs/Samba3-ByExample/images/chap4-net.dia b/docs/Samba3-ByExample/images/chap4-net.dia deleted file mode 100644 index e8c56643c7..0000000000 Binary files a/docs/Samba3-ByExample/images/chap4-net.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap4-net.svg b/docs/Samba3-ByExample/images/chap4-net.svg new file mode 100644 index 0000000000..88d16bd90d --- /dev/null +++ b/docs/Samba3-ByExample/images/chap4-net.svg @@ -0,0 +1,2148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Internet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + eth0 + eth2 + eth1 + hplj6a + hplj6f + qmsa + qmsf + Domain: PROMISES + Server: + DIAMOND + Network: + 192.168.1.0/24 + Network: + 192.168.2.0/24 + + + + + + + + + + + + + apps + data + 30 Users + 100 Users + Accounting + Financial Services + diff --git a/docs/Samba3-ByExample/images/chap5-net.dia b/docs/Samba3-ByExample/images/chap5-net.dia deleted file mode 100644 index f4f77ea064..0000000000 Binary files a/docs/Samba3-ByExample/images/chap5-net.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap5-net.svg b/docs/Samba3-ByExample/images/chap5-net.svg new file mode 100644 index 0000000000..77df4d1db3 --- /dev/null +++ b/docs/Samba3-ByExample/images/chap5-net.svg @@ -0,0 +1,3668 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Internet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + apps + data + firewall + router + Network: 172.16.0.0/22 + Domain: MEGANET + PDC Server: + MASSIVE + eth0 + eth1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + apps + router + Network: 172.16.8.0/22 + Member Server: + BLDG2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + apps + router + Network: 172.16.4.0/22 + Member Server: + BLDG1 + 50 Users + 150 Users + 300 Users + Accounting + Financial Services + Property Insurance Group + diff --git a/docs/Samba3-ByExample/images/chap6-net.dia b/docs/Samba3-ByExample/images/chap6-net.dia deleted file mode 100644 index aa079a4291..0000000000 Binary files a/docs/Samba3-ByExample/images/chap6-net.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap6-net.svg b/docs/Samba3-ByExample/images/chap6-net.svg new file mode 100644 index 0000000000..6cabfad842 --- /dev/null +++ b/docs/Samba3-ByExample/images/chap6-net.svg @@ -0,0 +1,3714 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Internet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + apps + apps + apps + data + firewall + router + router + router + Network: 172.16.0.0/22 + Network: 172.16.4.0/22 + Network: 172.16.8.0/24 + Domain: MEGANET2 + PDC Server: + MASSIVE-PDC + Server: + BLDG1-BDC + Server: + BLDG2-BDC + eth0 + eth1 + + + + + + + ldap + 50 Users + 150 Users + 300 Users + Accounting + Financial Services + Property Insurance Group + diff --git a/docs/Samba3-ByExample/images/chap7-idresol.dia b/docs/Samba3-ByExample/images/chap7-idresol.dia deleted file mode 100644 index 349d0588a6..0000000000 Binary files a/docs/Samba3-ByExample/images/chap7-idresol.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap7-idresol.svg b/docs/Samba3-ByExample/images/chap7-idresol.svg new file mode 100644 index 0000000000..560658f098 --- /dev/null +++ b/docs/Samba3-ByExample/images/chap7-idresol.svg @@ -0,0 +1,514 @@ + + + + + + + + + + + + + + + + + + + + + Windows + Client + smbd + winbindd + NSS + PAM + LDAP + W2Kx + ADS + NT4 + Domain + + + + + + + + + + + + + + + + + + + + + + + + Samba + PDC/BDC + + + + + + + + + + + + + + + /etc/passwd + /etc/group + + + NIS[+] + + + + + + + + + + + + + + + + diff --git a/docs/Samba3-ByExample/images/chap7-net-A.dia b/docs/Samba3-ByExample/images/chap7-net-A.dia deleted file mode 100644 index 5286014a83..0000000000 Binary files a/docs/Samba3-ByExample/images/chap7-net-A.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap7-net-A.svg b/docs/Samba3-ByExample/images/chap7-net-A.svg new file mode 100644 index 0000000000..8337e5c68b --- /dev/null +++ b/docs/Samba3-ByExample/images/chap7-net-A.svg @@ -0,0 +1,9436 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Domain: GLOBALNET + Server: + GNY-PDC + + = VPN + + Router + Router + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.12.0/22 + Server: + LON-BDC + Member Server: + LON-APPS + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.16.0/22 + Server: + LA-BDC + Member Server: + LA-APPS + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.20.0/22 + Server: + WADC-BDC + Member Server: + WADC-APPS + + + + + + + LDAP + Slave + + + Internet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.0.0/22 + Member Server: + GNY-APPS + + + + + + + LDAP + Master + + 1100 Users + 320 Users + 180 Users + 100 Users + New York - GNY + Los Angeles + London + Washington, DC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.4.0/22 + Server: + BLDG2-BDC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + Router + 50 Users + New York + Bldg2 + + + + + + + + + + + + + + + + + Network: + 172.16.8.0/22 + Server: + BLDG3-BDC + Member Server: + BLDG3-APPS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + 250 Users + New York + Bldg3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Server: + GNY-DBC + Here there is a single Windows Network| + Domain. There is an LDAP Master in GNY + with a Slave LDAP server in each remote + office. There is at least one Application + server in each office and at least one BDC + in every office. + There is 1 BDC per 50 users. + diff --git a/docs/Samba3-ByExample/images/chap7-net.dia b/docs/Samba3-ByExample/images/chap7-net.dia deleted file mode 100644 index a136874e74..0000000000 Binary files a/docs/Samba3-ByExample/images/chap7-net.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap7-net.svg b/docs/Samba3-ByExample/images/chap7-net.svg new file mode 100644 index 0000000000..a5ba690540 --- /dev/null +++ b/docs/Samba3-ByExample/images/chap7-net.svg @@ -0,0 +1,9010 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Domain: GLOBALNET + Server: + GWYN-PDC + + = VPN + + Router + Router + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.12.0/22 + Server: + DIVA-BDC + Member Server: + DIVA-APPS + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.16.0/22 + Server: + DIVB-BDC + Member Server: + DIVB-APPS + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.20.0/22 + Server: + DIVC-BDC + Member Server: + DIVC-APPS + + + + + + + LDAP + Slave + + + Internet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.0.0/22 + Member Server: + GWYN-APPS + + + + + + + LDAP + Master + + 1100 Users + 320 Users + 180 Users + 100 Users + New York - Bldg1 + Los Angeles + London + Washington, DC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.4.0/22 + Server: + BLDG2-BDC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + Router + 50 Users + New York + Bldg 2 + + + + + + + + + + + + + + + + + Network: + 172.16.8.0/22 + Server: + BLDG3-BDC + Member Server: + BLDG2-APPS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + 250 Users + New York + Bldg 3 + + + diff --git a/docs/Samba3-ByExample/images/chap7-net2-B.dia b/docs/Samba3-ByExample/images/chap7-net2-B.dia deleted file mode 100644 index 761e41e91a..0000000000 Binary files a/docs/Samba3-ByExample/images/chap7-net2-B.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap7-net2-B.svg b/docs/Samba3-ByExample/images/chap7-net2-B.svg new file mode 100644 index 0000000000..8158b3b9eb --- /dev/null +++ b/docs/Samba3-ByExample/images/chap7-net2-B.svg @@ -0,0 +1,9085 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Server: + GWYN-PDC + + = VPN + + Router + Router + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.12.0/22 + Server: + LON-BDC + Server: + LON-PDC + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.16.0/22 + Server: + LA-BDC + Server: + LA-PDC + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.20.0/22 + Server: + WADC-BDC + Server: + WADC-APPS + + + + + + + LDAP + Slave + + + Internet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.0.0/22 + Member Server: + GWYN-APPS + + + + + + + LDAP + Master + + 1100 Users + 320 Users + 180 Users + 100 Users + New York - GNY + Los Angeles + London + Washington, DC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.4.0/22 + Server: + BLDG2-BDC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + Router + 50 Users + New York + Bldg2 + + + + + + + + + + + + + + + + + Network: + 172.16.8.0/22 + Server: + BLDG3-BDC + Member Server: + BLDG2-APPS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + 250 Users + New York + Bldg3 + + + Domain: GLOBALNET + Domain: GLOBALNET + Domain: GLOBALNET + Domain: UKNET + Domain: WESTNET + Domain: GLOBALNET + Notes: + The decision was made to implement separate + domains for the West Coast and for UK + operations. Wide-area traffic will be reduced. + This design introduces the concept of deploying + interdomain trusts, thus permitting much needed + network integration and interoperabilty. + There is a single LDAP Master and at least one + Slave LDAP server in each remote office. + + diff --git a/docs/Samba3-ByExample/images/chap7-net2.dia b/docs/Samba3-ByExample/images/chap7-net2.dia deleted file mode 100644 index 653d2b2f69..0000000000 Binary files a/docs/Samba3-ByExample/images/chap7-net2.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap7-net2.svg b/docs/Samba3-ByExample/images/chap7-net2.svg new file mode 100644 index 0000000000..1466498d62 --- /dev/null +++ b/docs/Samba3-ByExample/images/chap7-net2.svg @@ -0,0 +1,9075 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Server: + GWYN-PDC + + = VPN + + Router + Router + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.12.0/22 + Server: + LON-BDC + Server: + LON-PDC + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.16.0/22 + Server: + LA-BDC + Server: + LA-PDC + + + + + + + LDAP + Slave + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.20.0/22 + Server: + WASH-BDC + Server: + WASH-APPS + + + + + + + LDAP + Slave + + + Internet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.0.0/22 + Member Server: + GWYN-APPS + + + + + + + LDAP + Master + + 1100 Users + 320 Users + 180 Users + 100 Users + New York - Bldg1 + Los Angeles + London + Washington, DC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network: + 172.16.4.0/22 + Server: + BLDG2-BDC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + Router + 50 Users + New York + Bldg 2 + + + + + + + + + + + + + + + + + Network: + 172.16.8.0/22 + Server: + BLDG3-BDC + Member Server: + BLDG2-APPS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Slave + 250 Users + New York + Bldg 3 + + + Domain: GLOBALNET + Domain: GLOBALNET + Domain: GLOBALNET + Domain: UKNET + Domain: WESTNET + Domain: GLOBALNET + Notes: + The decision was made to implement separate + domains for the West Coast and for UK + operations. Wide-area traffic will be reduced. + This design introduces the concept of deploying + interdomain trusts, thus permitting much needed + network integration and interoperabilty. + + diff --git a/docs/Samba3-ByExample/images/chap9-ADSDC.dia b/docs/Samba3-ByExample/images/chap9-ADSDC.dia deleted file mode 100644 index dd52341d54..0000000000 Binary files a/docs/Samba3-ByExample/images/chap9-ADSDC.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap9-ADSDC.svg b/docs/Samba3-ByExample/images/chap9-ADSDC.svg new file mode 100644 index 0000000000..a0610367c3 --- /dev/null +++ b/docs/Samba3-ByExample/images/chap9-ADSDC.svg @@ -0,0 +1,1321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ADS + Windows Server 2003 + ADS Server + Domain Controller + Samba Domain + Member Server + + Domain Services + Network Configuration + + + + + CIFS Server + Client Services + + + Winbind + + + + + smbd + nmbd + + + nss_ldap + + + + + + + + + + + + + + + + + UID/GID + Resolution + + + Active Directory + (Kerberos / LDAP) + Services For UNIX + + + + + + + + + + + Authentication + diff --git a/docs/Samba3-ByExample/images/chap9-SambaDC.dia b/docs/Samba3-ByExample/images/chap9-SambaDC.dia deleted file mode 100644 index 884a4d134a..0000000000 Binary files a/docs/Samba3-ByExample/images/chap9-SambaDC.dia and /dev/null differ diff --git a/docs/Samba3-ByExample/images/chap9-SambaDC.svg b/docs/Samba3-ByExample/images/chap9-SambaDC.svg new file mode 100644 index 0000000000..54d1763394 --- /dev/null +++ b/docs/Samba3-ByExample/images/chap9-SambaDC.svg @@ -0,0 +1,1443 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LDAP + Master + LDAP + Slave + + + Samba + PDC + Samba + BDC + Samba Domain + Member Server + + PDC/BDC Services + Network Configuration + + + Winbind + + + LDAP + + + + + smbd + nmbd + Client Services + + + Winbind + + + + + smbd + nmbd + + + nss_ldap + + + nss_ldap + + + + + + + + + + + + + + + + + + + + + + + UID/GID + Resolution + diff --git a/docs/Samba3-HOWTO/images/access1.dia b/docs/Samba3-HOWTO/images/access1.dia deleted file mode 100644 index 7fd2673800..0000000000 Binary files a/docs/Samba3-HOWTO/images/access1.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/access1.svg b/docs/Samba3-HOWTO/images/access1.svg new file mode 100644 index 0000000000..486686f780 --- /dev/null +++ b/docs/Samba3-HOWTO/images/access1.svg @@ -0,0 +1,308 @@ + + + + + + + type + + + users + + + group + + + others + + + d l + + + r w x + + + r w x + + + r w x + Can Execute, List files + Can Write, Create files + Can Read, Read files + Can Execute, List files + Can Write, Create files + Can Read, Read files + Can Execute, List files + Can Write, Create files + Can Read, Read files + Is a symbolic link + Is a directory + + + + + + + + + + + + + diff --git a/docs/Samba3-HOWTO/images/browsing1.dia b/docs/Samba3-HOWTO/images/browsing1.dia deleted file mode 100644 index 8235df45f6..0000000000 Binary files a/docs/Samba3-HOWTO/images/browsing1.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/browsing1.svg b/docs/Samba3-HOWTO/images/browsing1.svg new file mode 100644 index 0000000000..181ea21871 --- /dev/null +++ b/docs/Samba3-HOWTO/images/browsing1.svg @@ -0,0 +1,2025 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + N1_A + N1_B + N1_C (DMB) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + N1_D + N1_E + + + + + + + + + + + + + + + + + Router 1 + Subnet 1 + + + + + + + + + + + + + + + + + Router 2 + + + Subnet 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + N2_D + (WINS) + N2_C + + + + + + + + + + + + + + + + + + + + + + + N2_B + + + + + + + + + + + + + + + + + + + + + + + N2_A + + + Subnet 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + N3_D + N3_C + + + + + + + + + + + + + + + + + + + + + + + N3_B + + + + + + + + + + + + + + + + + + + + + + + N3_A + diff --git a/docs/Samba3-HOWTO/images/cups1.dia b/docs/Samba3-HOWTO/images/cups1.dia deleted file mode 100644 index e4cd3b1239..0000000000 Binary files a/docs/Samba3-HOWTO/images/cups1.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/cups1.svg b/docs/Samba3-HOWTO/images/cups1.svg new file mode 100644 index 0000000000..18b7e4f2a6 --- /dev/null +++ b/docs/Samba3-HOWTO/images/cups1.svg @@ -0,0 +1,274 @@ + + + + + CUPS in and of itself has this (general) filter chain (italic letters + are file-formats or MIME types, other are filters (this is + true for pre-1.1.15 of pre-4.3 versions of CUPS and ESP PrintPro): + something-fileformat + + + + application/postscript + + + + + + + somethingtops + pstops + + + + application/vnd.cups-postscript + pstoraster + application/vnd.cups-raster + rastertosomething + something-device-specific + backend + + + + + + + + + + + + + + + + + + e.g. Gimp-Print filters + may be plugged in here + (= "raster driver") + ESP PrintPro has some enhanced "rastertosomething" filters as compared to + CUPS, and also a somewhat improved "pstoraster" filter. + NOTE: Gimp-Print and some other 3rd-Party-Filters (like TurboPrint) to + CUPS and ESP PrintPro plug-in where rastertosomething is noted. + + + as shipped with CUPS, + independent from any + GhostScript installation on the + system + (= "postscript interpreter") + diff --git a/docs/Samba3-HOWTO/images/cups2.dia b/docs/Samba3-HOWTO/images/cups2.dia deleted file mode 100644 index 9dfb60f335..0000000000 Binary files a/docs/Samba3-HOWTO/images/cups2.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/cups2.svg b/docs/Samba3-HOWTO/images/cups2.svg new file mode 100644 index 0000000000..8cddd339c0 --- /dev/null +++ b/docs/Samba3-HOWTO/images/cups2.svg @@ -0,0 +1,320 @@ + + + + + something-fileformat + + + + somethingtops + application/postscript + + + + pstops + + + + + + + application/vnd.cups-postscript + + + + cupsomatic + + + (constructs complicated + Ghostscript commandline + to let the file be processed by a + "-sDEVICE-s.th." call...) + + + + pstoraster + (= "postscript interpreter") + + + + application/vnd.cups-raster + + + + rastertosomething + (= "raster driver") + + + + + + + something device specific + + + + backend + + + + + + Ghostscript at work.... + Note, that cupsomatic "kidnaps" the printfile after the + application/vnd.cups-postscript stage and deviates it gh + the CUPS-external, systemwide Ghostscript installation, bypassing the + "pstoraster" filter (therefore also bypassing the CUPS-raster-drivers + "rastertosomething", and hands the rasterized file directly to the CUPS + backend... + cupsomatic is not made by the CUPS developers. It is an independent + contribution to printing development, made by people from + Linuxprinting.org. (see also http://www.cups.org/cups-help.html) + diff --git a/docs/Samba3-HOWTO/images/domain.dia b/docs/Samba3-HOWTO/images/domain.dia deleted file mode 100644 index a994d423e2..0000000000 Binary files a/docs/Samba3-HOWTO/images/domain.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/domain.svg b/docs/Samba3-HOWTO/images/domain.svg new file mode 100644 index 0000000000..aca5d4be42 --- /dev/null +++ b/docs/Samba3-HOWTO/images/domain.svg @@ -0,0 +1,2288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Primary + Domain + Controller + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Backup Domain + Controller 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Backup Domain + Controller 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Workstation A + Workstation B + Workstation C + DOMAIN + diff --git a/docs/Samba3-HOWTO/images/idmap-gid2sid.dia b/docs/Samba3-HOWTO/images/idmap-gid2sid.dia deleted file mode 100644 index c478e8728c..0000000000 Binary files a/docs/Samba3-HOWTO/images/idmap-gid2sid.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/idmap-gid2sid.svg b/docs/Samba3-HOWTO/images/idmap-gid2sid.svg new file mode 100644 index 0000000000..61181b75c8 --- /dev/null +++ b/docs/Samba3-HOWTO/images/idmap-gid2sid.svg @@ -0,0 +1,277 @@ + + + + + + + GID + + + + + group + SID + + + Fail + + + + + Found? + Yes + + + No + + + + + Found? + Yes + + + No + + + + + Winbind + + + + + winbindd_idmap.tdb + ldapsam + + + + groupmap_idmap.tdb + + diff --git a/docs/Samba3-HOWTO/images/idmap-groups.dia b/docs/Samba3-HOWTO/images/idmap-groups.dia deleted file mode 100644 index 04da158c53..0000000000 Binary files a/docs/Samba3-HOWTO/images/idmap-groups.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/idmap-groups.svg b/docs/Samba3-HOWTO/images/idmap-groups.svg new file mode 100644 index 0000000000..58b1dc6be6 --- /dev/null +++ b/docs/Samba3-HOWTO/images/idmap-groups.svg @@ -0,0 +1,129 @@ + + + + + Grou + group + + + + + + + group_mapping tdb + contains samba groups + idmap gid + maps UNIX groups to + samba groups + UNIX groups + /etc/group or other + NSS backend + + + + + + + diff --git a/docs/Samba3-HOWTO/images/idmap-sid2gid.dia b/docs/Samba3-HOWTO/images/idmap-sid2gid.dia deleted file mode 100644 index 9a25b11df2..0000000000 Binary files a/docs/Samba3-HOWTO/images/idmap-sid2gid.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/idmap-sid2gid.svg b/docs/Samba3-HOWTO/images/idmap-sid2gid.svg new file mode 100644 index 0000000000..95944e9851 --- /dev/null +++ b/docs/Samba3-HOWTO/images/idmap-sid2gid.svg @@ -0,0 +1,277 @@ + + + + + + + GID + + + + + group + SID + + + Fail + + + + + Found? + Yes + + + No + + + + + Found? + Yes + + + No + + + + + Winbind + + + + + winbindd_idmap.tdb + ldapsam + + + + groupmap_idmap.tdb + + diff --git a/docs/Samba3-HOWTO/images/idmap-sid2uid.dia b/docs/Samba3-HOWTO/images/idmap-sid2uid.dia deleted file mode 100644 index f408fab0fe..0000000000 Binary files a/docs/Samba3-HOWTO/images/idmap-sid2uid.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/idmap-sid2uid.svg b/docs/Samba3-HOWTO/images/idmap-sid2uid.svg new file mode 100644 index 0000000000..84faf099f6 --- /dev/null +++ b/docs/Samba3-HOWTO/images/idmap-sid2uid.svg @@ -0,0 +1,365 @@ + + + + + + + + + SID + + + Our Domain? + + + Yes + + + No + + + + + UID + + + Found? + Yes + No + + + + + + + Fail + + + PassDB + + + + + guest + smbpasswd + tdbsam + ldapsam + ldapsam_compat + + + + + + + Winbind + + + winbindd_idmap.tdb + ldapsam + + + + + diff --git a/docs/Samba3-HOWTO/images/idmap-store-gid2sid.dia b/docs/Samba3-HOWTO/images/idmap-store-gid2sid.dia deleted file mode 100644 index 4958e805ab..0000000000 Binary files a/docs/Samba3-HOWTO/images/idmap-store-gid2sid.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/idmap-store-gid2sid.svg b/docs/Samba3-HOWTO/images/idmap-store-gid2sid.svg new file mode 100644 index 0000000000..bf15504974 --- /dev/null +++ b/docs/Samba3-HOWTO/images/idmap-store-gid2sid.svg @@ -0,0 +1,122 @@ + + + + + + + SID + + + GID + + + + + + + net groupmap + + + ldapsam + groupmap_idmap.tdb + + diff --git a/docs/Samba3-HOWTO/images/idmap-uid2sid.dia b/docs/Samba3-HOWTO/images/idmap-uid2sid.dia deleted file mode 100644 index 576f457d79..0000000000 Binary files a/docs/Samba3-HOWTO/images/idmap-uid2sid.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/idmap-uid2sid.svg b/docs/Samba3-HOWTO/images/idmap-uid2sid.svg new file mode 100644 index 0000000000..13aca9cf70 --- /dev/null +++ b/docs/Samba3-HOWTO/images/idmap-uid2sid.svg @@ -0,0 +1,365 @@ + + + + + + + + + + + UID + + + + + SID + + + Found? + Yes + No + + + + + + + Fail + + + PassDB + + + + + guest + smbpasswd + tdbsam + ldapsam + ldapsam_compat + + + + + + + + Winbind + + + + + winbindd_idmap.tdb + ldapsam + + + + Found? + Yes + No + + + diff --git a/docs/Samba3-HOWTO/images/idmap.dia b/docs/Samba3-HOWTO/images/idmap.dia deleted file mode 100644 index 555933978b..0000000000 Binary files a/docs/Samba3-HOWTO/images/idmap.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/idmap.svg b/docs/Samba3-HOWTO/images/idmap.svg new file mode 100644 index 0000000000..db2d883551 --- /dev/null +++ b/docs/Samba3-HOWTO/images/idmap.svg @@ -0,0 +1,119 @@ + + + + + + + + + passdb backend + contains samba users + idmap + maps unix to + samba users + + + + + + + + + Unix users + /etc/passwd + or other NSS backend + diff --git a/docs/Samba3-HOWTO/images/pdftoepsonusb.dia b/docs/Samba3-HOWTO/images/pdftoepsonusb.dia deleted file mode 100644 index 2f846ee8d4..0000000000 Binary files a/docs/Samba3-HOWTO/images/pdftoepsonusb.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/pdftoepsonusb.svg b/docs/Samba3-HOWTO/images/pdftoepsonusb.svg new file mode 100644 index 0000000000..d9434d7e26 --- /dev/null +++ b/docs/Samba3-HOWTO/images/pdftoepsonusb.svg @@ -0,0 +1,156 @@ + + + + + + + pdftops + + + pstops + + + pstoraster + + + + + + + + + rastertoepson + + + + + + usb + + + + diff --git a/docs/Samba3-HOWTO/images/pdftosocket.dia b/docs/Samba3-HOWTO/images/pdftosocket.dia deleted file mode 100644 index 53b6b7117c..0000000000 Binary files a/docs/Samba3-HOWTO/images/pdftosocket.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/pdftosocket.svg b/docs/Samba3-HOWTO/images/pdftosocket.svg new file mode 100644 index 0000000000..1c9732c3d2 --- /dev/null +++ b/docs/Samba3-HOWTO/images/pdftosocket.svg @@ -0,0 +1,94 @@ + + + + + + + pdftops + + + pstops + + + socket + + + + + + + diff --git a/docs/Samba3-HOWTO/images/trusts1.dia b/docs/Samba3-HOWTO/images/trusts1.dia deleted file mode 100644 index 95cbbaa42f..0000000000 Binary files a/docs/Samba3-HOWTO/images/trusts1.dia and /dev/null differ diff --git a/docs/Samba3-HOWTO/images/trusts1.svg b/docs/Samba3-HOWTO/images/trusts1.svg new file mode 100644 index 0000000000..9845d493cf --- /dev/null +++ b/docs/Samba3-HOWTO/images/trusts1.svg @@ -0,0 +1,792 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Domain A + Domain B + + + + Trusts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/configure.ac b/docs/configure.ac index 4440290d0c..97c2b2201f 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -16,30 +16,37 @@ AC_SUBST(SAMBASOURCEDIR) DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, LATEX) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PS) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PDF) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTML) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTMLHELP) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PEARSON) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PLUCKER) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, FOPDF) - +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, LATEX) +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PS) +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PDF) +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTML) +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTMLHELP) +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PEARSON) +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PLUCKER) +dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, FOPDF) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, LATEX) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PS) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PDF) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTML) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTMLHELP) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PEARSON) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PLUCKER) +DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, FOPDF) # Check dia version number -if test -n "$DIA"; then - [ DIA_VERSION=`$DIA -v | egrep -o '([0-9]+)\.([0-9]+)'`] - DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1` - DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2` +#if test -n "$DIA"; then +# [ DIA_VERSION=`$DIA -v | egrep -o '([0-9]+)\.([0-9]+)'`] +# DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1` +# DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2` - if test "$DIA_MAJ_VERSION" -le "0" - then - if test "$DIA_MIN_VERSION" -le "92" && test -z "$DISPLAY" - then - AC_MSG_ERROR([Dia below 0.93 requires an X environment. Set \$DISPLAY or install Dia 0.93 or higher]) - fi - fi -fi +# if test "$DIA_MAJ_VERSION" -le "0" +# then +# if test "$DIA_MIN_VERSION" -le "92" && test -z "$DISPLAY" +# then +# AC_MSG_ERROR([Dia below 0.93 requires an X environment. Set \$DISPLAY or install Dia 0.93 or higher]) +# fi +# fi +#fi DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX) DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF) diff --git a/docs/db2latex-xslt-strict.diff b/docs/db2latex-xslt-strict.diff deleted file mode 100644 index 093ebd9d3e..0000000000 --- a/docs/db2latex-xslt-strict.diff +++ /dev/null @@ -1,98 +0,0 @@ -This patch removes a duplicate template from db2latex that was being -included (violates strict XSLT, something newer versions of xsltproc don't like) - -Looks like upstream is inactive for over a year, so I'm putting this quick fix -here for now. - ---- db2latex-xsl-0.8pre1+20050310/xsl/common/common.xsl 2005-03-10 23:09:55.639189152 +0100 -+++ db2latex-xsl-0.8pre1+20050310/xsl/common/common.xsl 2005-03-10 23:10:50.762690340 +0100 -@@ -356,89 +356,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- question -- answer -- qandadiv -- qandaset -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - diff --git a/docs/structure.dia b/docs/structure.dia deleted file mode 100644 index 8b07c34088..0000000000 Binary files a/docs/structure.dia and /dev/null differ diff --git a/docs/structure.svg b/docs/structure.svg new file mode 100644 index 0000000000..82dfd4650d --- /dev/null +++ b/docs/structure.svg @@ -0,0 +1,585 @@ + + + + + + + Samba DocBook Source (XML) + + + expand-sambadoc.xsl + + + + + + DocBook Source (XML) + + + + + + + + + + xslt/man.xsl + + + + + + + + + + + db2latex (xslt/latex.xsl) + + + LaTeX Source + + + + + + + + + PDFLaTeX + + + PDF + + + + + + + + + xslt/fo.xsl + + + + + + FO Document + + + FOP + + + + + + + + + xslt/html.xsl + + + + + + + + + + + xslt/yodl.xsl + + + + + + YODL Document + + + + HTML Document + + Man pages(NROFF) + + + + + + -- cgit