diff --git a/docs/Makefile b/docs/Makefile index 65d05a203d0..b320920d5a2 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -38,7 +38,6 @@ help: @echo " htmlman3,htmlman4 - Build HTML version of manpages" @echo " undocumented - Output list of undocumented smb.conf options" @echo " samples - Extract examples" - @echo " files - Extract other files" $(DOCBOOKDIR)/Samba3-ByExample.xml: $(filter-out Samba3-ByExample/index.xml,$(wildcard Samba3-ByExample/*.xml)) $(DOCBOOKDIR)/Samba3-HOWTO.xml: $(filter-out Samba3-HOWTO/index.xml,$(wildcard Samba3-HOWTO/*.xml)) Samba3-HOWTO-attributions.xml @@ -278,10 +277,6 @@ undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl sc @$(PERL) scripts/find_missing_doc.pl $(SRCDIR) @$(PERL) scripts/find_missing_manpages.pl $(SRCDIR) -# Examples and the like -files: Samba3-HOWTO/index.xml xslt/extract-smbfiles.xsl - $(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null - samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl mkdir -p $(EXAMPLESDIR) $(XSLTPROC) --xinclude xslt/extract-examples.xsl $< > /dev/null 2> examples/README diff --git a/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml index f074d2c1401..973f390238e 100644 --- a/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml +++ b/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml @@ -352,8 +352,10 @@ drwsrwsrwx 2 maryo gnomes 48 2003-05-12 22:29 muchado08 An overview of the permissions field can be found in Overview of UNIX permissions field. - Overview of UNIX permissions field. - access1 +
+ Overview of UNIX permissions field. + access1 +
Any bit flag may be unset. An unset bit flag is the equivalent of cannot and is represented diff --git a/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml b/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml index 66b4c27406a..b07e13ab73b 100644 --- a/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml +++ b/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml @@ -244,7 +244,6 @@ The following listings are from the genlogon directory. genlogon.pl This is the genlogon.pl file: - #!/usr/bin/perl # @@ -319,7 +318,6 @@ This is the genlogon.pl file: # All done! Close the output file. close LOGON; - diff --git a/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml index aac9bc49995..cd96ba60abc 100644 --- a/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml +++ b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml @@ -639,10 +639,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - - Windows printing to a local printer. +
+ Windows printing to a local printer. 1small - +
@@ -735,10 +735,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - - Printing to a PostScript printer. +
+ Printing to a PostScript printer. 2small - +
@@ -770,9 +770,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - Ghostscript as a RIP for non-postscript printers. - 3small - +
+ Ghostscript as a RIP for non-postscript printers. + 3small +
@@ -1177,10 +1178,10 @@ print options already embedded into the file. - - Pre-filtering in CUPS to form PostScript. +
+ Pre-filtering in CUPS to form PostScript. 4small - +
@@ -1197,9 +1198,10 @@ stapling and punching it, and so on) into the PostScript file. - Adding device-specific print options. +
+ Adding device-specific print options. 5small - +
@@ -1238,10 +1240,10 @@ that are able to generate device-specific printer data. - - PostScript to intermediate raster format. +
+ PostScript to intermediate raster format. 6small - +
@@ -1258,10 +1260,10 @@ than one vendor financing the development of CUPS raster drivers). - - CUPS-raster production using Ghostscript. +
+ CUPS-raster production using Ghostscript. 7small - +
@@ -1295,10 +1297,10 @@ filtering on next picture. - - Image format to CUPS-raster format conversion. +
+ Image format to CUPS-raster format conversion. 8small - +
@@ -1321,10 +1323,10 @@ closely as possible with CUPS. - - Raster to printer-specific formats. +
+ Raster to printer-specific formats. 9small - +
@@ -1788,10 +1790,10 @@ advantages) than other methods. - - cupsomatic/foomatic Processing versus Native CUPS. +
+ cupsomatic/foomatic Processing versus Native CUPS. 10small - +
@@ -1880,10 +1882,10 @@ backend, which transfers the job to the printers. The resulting filter chain, therefore, is as drawn in PDF to socket chain. - - PDF to socket chain. +
+ PDF to socket chain. pdftosocket - +
@@ -1934,10 +1936,10 @@ which transfers the job to the printers. The resulting filter chain therefore is as drawn in this figure. - - PDF to USB chain. +
+ PDF to USB chain. pdftoepsonusb - +
@@ -2080,10 +2082,10 @@ clients. - - Print driver execution on the client. +
+ Print driver execution on the client. 11small - +
@@ -2107,10 +2109,10 @@ understand. - - Print driver execution on the server. +
+ Print driver execution on the server. 12small - +
@@ -2180,10 +2182,10 @@ simply use sysv). - - Printing via CUPS/Samba server. +
+ Printing via CUPS/Samba server. 13small - +
@@ -3107,9 +3109,9 @@ not intended to, and does not work with, raw queues! - - cupsaddsmb flowchart. - 14small +
+ cupsaddsmb flowchart. + 14small
 @@ -5131,15 +5133,15 @@ feature of CUPS and you do not necessarily need to have smbd running. The following diagrams reveal how CUPS handles print jobs. - - Filtering chain 1. +
+ Filtering chain 1. cups1 - +
- - Filtering chain with cupsomatic +
+ Filtering chain with cupsomatic cups2 - +
@@ -5482,10 +5484,10 @@ files from the Adobe Web site. A complete overview of the CUPS printing processes can be found in the next flowchart. - - CUPS printing overview. +
+ CUPS printing overview. a_small - +
diff --git a/docs/Samba3-HOWTO/TOSHARG-Compiling.xml b/docs/Samba3-HOWTO/TOSHARG-Compiling.xml index 4473e60fbfc..ac4c55ddb0d 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Compiling.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Compiling.xml @@ -495,14 +495,12 @@ netbios-ns dgram udp wait root /usr/local/samba/bin/nmbd nmbd like this one, perhaps calling it startsmb. - #!/bin/sh /usr/local/samba/bin/smbd -D /usr/local/samba/bin/winbindd /usr/local/samba/bin/nmbd -D - Make it executable with chmod +x startsmb diff --git a/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml index d693c7edf60..6a1318bb5ec 100644 --- a/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml +++ b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml @@ -122,7 +122,6 @@ a simple DHCP server that matches the DNS configuration. determines the location of all further configuration files used. The location and name of this file is specified in the start-up script that is part of the operating system. - # Quenya.Org configuration file @@ -197,13 +196,11 @@ zone "1.168.192.in-addr.arpa" { }; }; - The following files are all located in the directory /var/named. This is the /var/named/localhost.zone file: - $TTL 1W @ IN SOA @ root ( @@ -216,12 +213,10 @@ $TTL 1W IN NS @ IN A 127.0.0.1 - The /var/named/127.0.0.zone file: - $TTL 1W @ IN SOA localhost. root.localhost. ( @@ -234,12 +229,10 @@ $TTL 1W IN NS localhost. 1 IN PTR localhost. - The /var/named/quenya.org.host file: - $ORIGIN . $TTL 38400 ; 10 hours 40 minutes @@ -259,12 +252,10 @@ marvel A 192.168.1.2 mail CNAME marvel www CNAME marvel - The /var/named/192.168.1.0.rev file: - $ORIGIN . $TTL 38400 ; 10 hours 40 minutes @@ -280,7 +271,6 @@ $ORIGIN 1.168.192.in-addr.arpa. 1 PTR frodo.quenya.org. 2 PTR marvel.quenya.org. - @@ -302,7 +292,6 @@ $ORIGIN 1.168.192.in-addr.arpa. - ddns-updates on; ddns-domainname "quenya.org"; @@ -325,7 +314,6 @@ subnet 192.168.1.0 netmask 255.255.255.0 { allow unknown-clients; } - diff --git a/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml b/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml index 0c7689c32f2..0afacff24fe 100644 --- a/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml +++ b/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml @@ -781,7 +781,6 @@ When manually configuring krb5.conf, the minimal configurat - [libdefaults] default_realm = YOUR.KERBEROS.REALM @@ -793,7 +792,7 @@ When manually configuring krb5.conf, the minimal configurat [domain_realms] .kerberos.server = YOUR.KERBEROS.REALM - + When using Heimdal versions before 0.6 use the following configuration settings: diff --git a/docs/Samba3-HOWTO/TOSHARG-FastStart.xml b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml index 4469bc88ef8..5395f690706 100644 --- a/docs/Samba3-HOWTO/TOSHARG-FastStart.xml +++ b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml @@ -991,7 +991,6 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false Assign each of the UNIX groups to NT groups: (It may be useful to copy this text to a shell script called initGroups.sh.) - Shell script for initializing group mappings #!/bin/bash @@ -1007,7 +1006,6 @@ net groupmap add ntgroup="Designers" unixgroup=designers type=d net groupmap add ntgroup="Engineers" unixgroup=engineers type=d net groupmap add ntgroup="QA Team" unixgroup=qateam type=d - @@ -1067,7 +1065,7 @@ net groupmap add ntgroup="QA Team" unixgroup=qateam type=d Set up the LDAP server. This example is suitable for OpenLDAP 2.1.x. The /etc/openldap/slapd.conf file: /etc/openldap/slapd.conf -Example slapd.conf file +Example slapd.conf file # Note commented out lines have been removed include /etc/openldap/schema/core.schema @@ -1100,13 +1098,11 @@ index sambaPrimaryGroupSID eq index sambaDomainName eq index default sub - Create the following file samba-ldap-init.ldif: samba-ldap-init.ldif - # Organization for SambaXP Demo dn: dc=quenya,dc=org @@ -1137,7 +1133,6 @@ objectclass: simpleSecurityObject userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb # The password for above is 'mordonL8' - diff --git a/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml index 4a1664b1f64..b0e1a8cf48c 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml @@ -56,15 +56,15 @@ parameters in the &smb.conf; file. - - IDMAP: group SID to GID resolution. +
+ IDMAP: group SID to GID resolution. idmap-sid2gid - +
- - IDMAP: GID resolution to matching SID. +
+ IDMAP: GID resolution to matching SID. idmap-gid2sid - +
IDMAP @@ -75,10 +75,10 @@ used to establish UNIX group to NT SID mappings as shown in IDMAP: storing group mappings. - - IDMAP storing group mappings. +
+ IDMAP storing group mappings. idmap-store-gid2sid - +
groupadd diff --git a/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml b/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml index 18f0d284541..9a574c26390 100644 --- a/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml +++ b/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml @@ -171,10 +171,10 @@ Where a one-way trust has been established between two MS Windows NT4 domains (l DomA and DomB), the following facilities are created: - - Trusts overview. +
+ Trusts overview. trusts1 - +
diff --git a/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml b/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml index 4f65b8c0a7e..e6c68bb5fff 100644 --- a/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml +++ b/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml @@ -261,7 +261,6 @@ to function as a BDC, i.e., domain master = No. initGroups.sh Now assign each of the UNIX groups to NT groups: (It may be useful to copy this text to a script called initGroups.sh) - #!/bin/bash #### Keep this as a shell script for future re-use @@ -276,7 +275,6 @@ net groupmap add ntgroup="Designers" unixgroup=designers type=d rid=3200 net groupmap add ntgroup="Engineers" unixgroup=engineers type=d rid=3210 net groupmap add ntgroup="QA Team" unixgroup=qateam type=d rid=3220 - net groupmap list diff --git a/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml index 95929824298..dbbaac7b085 100644 --- a/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml +++ b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml @@ -1423,10 +1423,10 @@ Samba is capable of cross-subnet browsing when configured correctly. Consider a network set up as in Cross-Subnet Browsing Example. - - Cross-Subnet Browsing Example. +
+ Cross-Subnet Browsing Example. browsing1 - +
This consists of 3 subnets (1, 2, 3) connected by two routers diff --git a/docs/Samba3-HOWTO/TOSHARG-PAM.xml b/docs/Samba3-HOWTO/TOSHARG-PAM.xml index 4a09e808b40..82c006f2719 100644 --- a/docs/Samba3-HOWTO/TOSHARG-PAM.xml +++ b/docs/Samba3-HOWTO/TOSHARG-PAM.xml @@ -487,7 +487,6 @@ by commenting them out, except the calls to pam_pwdb.so. PAM: Original Login Config - #%PAM-1.0 # The PAM configuration file for the login service @@ -504,7 +503,7 @@ session required pam_pwdb.so # password required pam_cracklib.so retry=3 password required pam_pwdb.so shadow md5 - + @@ -553,7 +552,6 @@ source distribution. - #%PAM-1.0 # The PAM configuration file for the login service @@ -562,7 +560,7 @@ auth required pam_smbpass.so nodelay account required pam_smbpass.so nodelay session required pam_smbpass.so nodelay password required pam_smbpass.so nodelay - + The following is the PAM configuration file for a particular @@ -570,7 +568,6 @@ Linux system. The default condition uses pam_pwdb.so. - #%PAM-1.0 # The PAM configuration file for the samba service @@ -579,7 +576,7 @@ auth required pam_pwdb.so nullok nodelay shadow audit account required pam_pwdb.so audit nodelay session required pam_pwdb.so nodelay password required pam_pwdb.so shadow md5 - + In the following example, the decision has been made to use the @@ -589,7 +586,7 @@ thus allow the smbpasswd passwords to be changed using the passwd program: - + #%PAM-1.0 # The PAM configuration file for the samba service @@ -599,7 +596,7 @@ account required pam_pwdb.so audit nodelay session required pam_pwdb.so nodelay password required pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf - + PAM allows stacking of authentication mechanisms. It is also possible to pass information obtained within one PAM module through @@ -741,7 +738,6 @@ application (such as ssh). - #%PAM-1.0 # password-sync @@ -753,7 +749,7 @@ password requisite pam_cracklib.so retry=3 password requisite pam_unix.so shadow md5 use_authtok try_first_pass password required pam_smbpass.so nullok use_authtok try_first_pass session required pam_unix.so - + @@ -767,7 +763,7 @@ password migration takes place when users ftp in, login using their mail, and so on. - + #%PAM-1.0 # password-migration @@ -781,7 +777,7 @@ password requisite pam_cracklib.so retry=3 password requisite pam_unix.so shadow md5 use_authtok try_first_pass password optional pam_smbpass.so nullok use_authtok try_first_pass session required pam_unix.so - + @@ -793,7 +789,7 @@ A sample PAM configuration for a mature smbpasswd installat the SMB password does not exist or does not match the UNIX password. - + #%PAM-1.0 # password-mature @@ -805,7 +801,7 @@ password requisite pam_cracklib.so retry=3 password requisite pam_unix.so shadow md5 use_authtok try_first_pass password required pam_smbpass.so use_authtok use_first_pass session required pam_unix.so - + @@ -817,7 +813,7 @@ A sample PAM configuration that shows pam_smbpass used to a Kerberos realm. - + #%PAM-1.0 # kdc-pdc @@ -830,7 +826,7 @@ password requisite pam_cracklib.so retry=3 password optional pam_smbpass.so nullok use_authtok try_first_pass password required pam_krb5.so use_authtok try_first_pass session required pam_krb5.so - + @@ -855,7 +851,6 @@ the Samba mailing list. - auth required /lib/security/pam_securetty.so auth sufficient /lib/security/pam_winbind.so @@ -865,7 +860,7 @@ auth required /lib/security/pam_nologin.so account required /lib/security/pam_stack.so service=system-auth account required /lib/security/pam_winbind.so password required /lib/security/pam_stack.so service=system-auth - + diff --git a/docs/Samba3-HOWTO/TOSHARG-PDC.xml b/docs/Samba3-HOWTO/TOSHARG-PDC.xml index ee9d5155c08..595deaa0ca6 100644 --- a/docs/Samba3-HOWTO/TOSHARG-PDC.xml +++ b/docs/Samba3-HOWTO/TOSHARG-PDC.xml @@ -33,10 +33,10 @@ network environment. Workstations A, B and C are representative of many physical network clients. - - An Example Domain. +
+ An Example Domain. domain - +
diff --git a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml index 2ee109db010..45077188e8d 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml @@ -229,10 +229,10 @@ Samba-3 introduces a number of new password backend capabilities. - - IDMAP: Resolution of SIDs to UIDs. +
+ IDMAP: Resolution of SIDs to UIDs. idmap-sid2uid - +
SID @@ -241,10 +241,10 @@ Samba-3 introduces a number of new password backend capabilities. resolution of UIDs to SIDs diagrams. - - IDMAP: Resolution of UIDs to SIDs. +
+ IDMAP: Resolution of UIDs to SIDs. idmap-uid2sid - +
Important Notes About Security @@ -1028,7 +1028,6 @@ index default sub - # Organization for Samba Base dn: dc=quenya,dc=org @@ -1086,7 +1085,6 @@ objectclass: organizationalRole objectclass: simpleSecurityObject userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz - @@ -1412,7 +1410,6 @@ access to attrs=SambaLMPassword,SambaNTPassword - dn: uid=guest2, ou=People,dc=quenya,dc=org sambaLMPassword: 878D8014606CDA29677A44EFA1353FC7 @@ -1429,7 +1426,6 @@ access to attrs=SambaLMPassword,SambaNTPassword sambaSID: S-1-5-21-2447931902-1787058256-3961074038-5006 sambaPwdCanChange: 0 - @@ -1438,7 +1434,6 @@ access to attrs=SambaLMPassword,SambaNTPassword - dn: uid=gcarter, ou=People,dc=quenya,dc=org sambaLogonTime: 0 @@ -1463,7 +1458,6 @@ access to attrs=SambaLMPassword,SambaNTPassword sambaPwdMustChange: 2147483647 sambaNTPassword: 878D8014606CDA29677A44EFA1353FC7 - diff --git a/docs/Samba3-HOWTO/TOSHARG-Problems.xml b/docs/Samba3-HOWTO/TOSHARG-Problems.xml index 1aa065d1c8f..71d4422e711 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Problems.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Problems.xml @@ -89,7 +89,7 @@ SMB support is quite good. For details on the use of ethereal, read the well-written Ethereal User Guide. -Starting a capture.ethereal1 +
Starting a capture.ethereal1
Listen for data on ports 137, 138, 139, and 445. For example, use the filter port 137, port 138, port 139, or port @@ -98,7 +98,7 @@ the filter port 137, port 138, port 139, or port A console version of ethereal is available as well and is called tethereal. -Main ethereal data window.ethereal2 +
Main ethereal data window.ethereal2
 diff --git a/docs/Samba3-HOWTO/TOSHARG-SWAT.xml b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml index 349312d61a5..1995778d335 100644 --- a/docs/Samba3-HOWTO/TOSHARG-SWAT.xml +++ b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml @@ -251,7 +251,6 @@ A control file for the newer style xinetd could be: - # default: off # description: SWAT is the Samba Web Admin Tool. Use swat \ @@ -269,7 +268,6 @@ service swat disable = no } - In the above, the default setting for disable is yes. This means that SWAT is disabled. To enable use of SWAT, set this parameter to no as shown. diff --git a/docs/Samba3-HOWTO/TOSHARG-Winbind.xml b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml index eabdcf9a722..6cec77528da 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Winbind.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml @@ -94,10 +94,10 @@ - - Winbind Idmap +
+ Winbind Idmap idmap_winbind_no_loop - +
@@ -895,7 +895,6 @@ usually only starts smbd and nmbd but should now start winbindd, too. If you hav - ## ## samba.server @@ -943,7 +942,7 @@ usually only starts smbd and nmbd but should now start winbindd, too. If you hav echo "Usage: /etc/init.d/samba.server { start | stop }" ;; esac - + Again, if you would like to run Samba in dual daemon mode, replace: @@ -1057,7 +1056,7 @@ samba file. My /etc/pam.d/ftp file was changed to look like this: - + auth required /lib/security/pam_listfile.so item=user sense=deny \ file=/etc/ftpusers onerr=succeed auth sufficient /lib/security/pam_winbind.so @@ -1066,14 +1065,14 @@ auth required /lib/security/pam_shells.so account sufficient /lib/security/pam_winbind.so account required /lib/security/pam_stack.so service=system-auth session required /lib/security/pam_stack.so service=system-auth - + The /etc/pam.d/login file can be changed nearly the same way. It now looks like this: - + auth required /lib/security/pam_securetty.so auth sufficient /lib/security/pam_winbind.so auth sufficient /lib/security/pam_unix.so use_first_pass @@ -1084,7 +1083,7 @@ account required /lib/security/pam_stack.so service=system-auth password required /lib/security/pam_stack.so service=system-auth session required /lib/security/pam_stack.so service=system-auth session optional /lib/security/pam_console.so - + In this case, I added the auth sufficient /lib/security/pam_winbind.so diff --git a/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml index be080638f6b..2d8b78536e7 100644 --- a/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml +++ b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml @@ -92,7 +92,7 @@ that are in common use today. These are: On some installations the interface will be called Local Area Connection and on others it will be called Network Bridge. On our system it is called Network Bridge. Right click on Network Bridge -> Properties. See . - Network Bridge Configuration.WXPP002 +
Network Bridge Configuration.WXPP002
 @@ -105,10 +105,10 @@ that are in common use today. These are: The default setting is DHCP enabled operation. (i.e., Obtain an IP address automatically). See . - - Internet Protocol (TCP/IP) Properties. +
+ Internet Protocol (TCP/IP) Properties. WXPP003 - +
@@ -128,7 +128,7 @@ that are in common use today. These are: The technical name for the additional addresses is IP Aliases, and additionally this panel permits the setting of more default gateways (routers). In most cases where DHCP is used, it will not be necessary to create additional settings. See to see the appearance of this panel. - Advanced Network SettingsWXPP005 +
Advanced Network SettingsWXPP005
 @@ -139,7 +139,7 @@ that are in common use today. These are: Click the DNS tab to add DNS server settings. The example system uses manually configured DNS settings. When finished making changes, click the OK to commit the settings. See . - DNS Configuration.WXPP014 +
DNS Configuration.WXPP014
 @@ -147,7 +147,7 @@ that are in common use today. These are: This step demonstrates an example system that uses manually configured WINS settings. When finished making, changes click the OK to commit the settings. See . - WINS ConfigurationWXPP009 +
WINS ConfigurationWXPP009
 @@ -177,7 +177,7 @@ that are in common use today. These are: Right click on Local Area Connection, now click the Properties. See . - Local Area Connection Properties.w2kp001 +
Local Area Connection Properties.w2kp001
 @@ -188,7 +188,7 @@ that are in common use today. These are: The default setting is DHCP enabled operation. (i.e., Obtain an IP address automatically). See . - Internet Protocol (TCP/IP) Properties.w2kp002 +
Internet Protocol (TCP/IP) Properties.w2kp002
 @@ -206,7 +206,7 @@ that are in common use today. These are: Click the Advanced button to proceed with TCP/IP configuration. Refer to . - Advanced Network Settings.w2kp003 +
Advanced Network Settings.w2kp003
 @@ -217,7 +217,7 @@ that are in common use today. These are: Click the DNS tab to add DNS server settings. The example system uses manually configured DNS settings. When finished making changes, click on OK to commit the settings. See . - DNS Configuration.w2kp004 +
DNS Configuration.w2kp004
 @@ -225,7 +225,7 @@ that are in common use today. These are: This step demonstrates an example system that uses manually configured WINS settings. When finished making changes, click on OK to commit the settings. See . - WINS Configuration.w2kp005 +
WINS Configuration.w2kp005
 @@ -256,7 +256,7 @@ that are in common use today. These are: In the box labeled The following network components are installed:, click on Internet Protocol TCP/IP, now click on the Properties button. See . - The Windows Me Network Configuration Panel.WME001 +
The Windows Me Network Configuration Panel.WME001
 @@ -265,7 +265,7 @@ that are in common use today. These are: for Microsoft Windows client support see, . The default setting on Microsoft Windows Me workstations is for DHCP enabled operation, i.e., Obtain IP address automatically is enabled. See . - IP Address.WME002 +
IP Address.WME002
 @@ -288,14 +288,14 @@ that are in common use today. These are: The following example uses manually configured WINS settings. See . When finished making changes, click on OK to commit the settings. - DNS Configuration.WME005 +
DNS Configuration.WME005
 This is an example of a system that uses manually configured WINS settings. One situation where this might apply is on a network that has a single DHCP server that provides settings for multiple Windows workgroups or domains. See . - WINS Configuration.WME003 +
WINS Configuration.WME003
 @@ -326,7 +326,7 @@ that are in common use today. These are: The opening panel is the same one that can be reached by clicking System on the Control Panel. See . - The General Panel.wxpp001 +
The General Panel.wxpp001
 @@ -339,13 +339,13 @@ that are in common use today. These are: Clicking the Network ID button will launch the configuration wizard. Do not use this with Samba-3. If you wish to change the computer name, join or leave the domain, click the Change button. See . - The Computer Name Panel.wxpp004 +
The Computer Name Panel.wxpp004
 Click on Change. This panel shows that our example machine (TEMPTATION) is in a workgroup called WORKGROUP. We will join the domain called MIDEARTH. See . - The Computer Name Changes Panel.wxpp006 +
The Computer Name Changes Panel.wxpp006
 @@ -354,7 +354,7 @@ that are in common use today. These are: This panel shows that our example machine (TEMPTATION) is set to join the domain called MIDEARTH. See . - The Computer Name Changes Panel &smbmdash; Domain MIDEARTH.wxpp007 +
The Computer Name Changes Panel &smbmdash; Domain MIDEARTH.wxpp007
 @@ -364,7 +364,7 @@ that are in common use today. These are: Enter the name root and the root password from your Samba-3 server. See . - Computer Name Changes &smbmdash; User name and Password Panel.wxpp008 +
Computer Name Changes &smbmdash; User name and Password Panel.wxpp008
 @@ -400,7 +400,7 @@ that are in common use today. These are: The Network Configuration Panel allows all common network settings to be changed. See . - The Network Panel.WME009 +
The Network Panel.WME009
 @@ -412,7 +412,7 @@ that are in common use today. These are: The Client for Microsoft Networks Properties panel is the correct location to configure network logon settings. See . - Client for Microsoft Networks Properties Panel.WME010 +
Client for Microsoft Networks Properties Panel.WME010
 @@ -423,14 +423,14 @@ that are in common use today. These are: Click on the Identification button. This is the location at which the workgroup (domain) name and the machine name (computer name) need to be set. See . - Identification Panel.WME013 +
Identification Panel.WME013
 Now click the Access Control button. If you want to be able to assign share access permissions using domain user and group accounts, it is necessary to enable User-level access control as shown in this panel. See . - Identification Panel.WME014 +
Identification Panel.WME014
 diff --git a/docs/Samba3-HOWTO/manpages.xml b/docs/Samba3-HOWTO/manpages.xml index 69801c44ec7..12e9827c89b 100644 --- a/docs/Samba3-HOWTO/manpages.xml +++ b/docs/Samba3-HOWTO/manpages.xml @@ -27,5 +27,3 @@ - - diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 87806a2aa2d..5ded8c703b1 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -4,7 +4,6 @@ Published under the GNU GPL (C) Jelmer Vernooij 2002-2004 - (C) Alexander Bokovoy 2002-2004 --> - - - + + + + latex + + + images/ + + + + + - - - - - - - - - - - - - - - - imagedescription of image with id is empty. - - + + 50 + + + + 1 + - - - latex - - - images/ - - - - - + + html + + + images/.png + + + + + - - - - - - 50 - - - - 1 - + + 100 + + + + 1 - - html - - - images/.png - - - - - + + + + + images/.png + + + + + - - - - - - 100 - - - - 1 - + + 50 + + + + 1 - - - - images/.png - - - - - - - - - - - - 50 - - - - 1 - - - - diff --git a/docs/xslt/extract-smbfiles.xsl b/docs/xslt/extract-smbfiles.xsl deleted file mode 100644 index 997320de4af..00000000000 --- a/docs/xslt/extract-smbfiles.xsl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - output/examples/ - - - Writing - - - - - - - - - - diff --git a/docs/xslt/sambadoc2pearson.xsl b/docs/xslt/sambadoc2pearson.xsl index 23bc30985c4..5028d050642 100644 --- a/docs/xslt/sambadoc2pearson.xsl +++ b/docs/xslt/sambadoc2pearson.xsl @@ -13,10 +13,6 @@ - - - -