diff options
| author | Gerald Carter <jerry@samba.org> | 2004-09-01 21:03:29 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-09-01 21:03:29 +0000 |
| commit | 78ae4f9378cfc7e884a054088cbd088a2b18a6c8 (patch) | |
| tree | 2890a157de50551a67e2655620fc82440ed36e1e /examples/autofs | |
| parent | f6eda18efebe9fc559aeb63d06505b5505cd9b41 (diff) | |
| download | samba-78ae4f9378cfc7e884a054088cbd088a2b18a6c8.tar.gz samba-78ae4f9378cfc7e884a054088cbd088a2b18a6c8.tar.xz samba-78ae4f9378cfc7e884a054088cbd088a2b18a6c8.zip | |
r2176: syncing necessary changes for 3.0.7
svn merge -r 1942:1946 $SVNURL/branches/SAMBA_3_0
svn merge -r 1946:1948 $SVNURL/branches/SAMBA_3_0
svn merge -r 1948:1964 $SVNURL/branches/SAMBA_3_0
svn merge -r 1967:1968 $SVNURL/branches/SAMBA_3_0
svn merge -r 1980:2001 $SVNURL/branches/SAMBA_3_0
svn merge -r 2001:2006 $SVNURL/branches/SAMBA_3_0
svn merge -r 2006:2007 $SVNURL/branches/SAMBA_3_0
svn merge -r 2007:2009 $SVNURL/branches/SAMBA_3_0
svn merge -r 2009:2013 $SVNURL/branches/SAMBA_3_0
svn merge -r 2013:2014 $SVNURL/branches/SAMBA_3_0
svn merge -r 2014:2015 $SVNURL/branches/SAMBA_3_0
svn merge -r 2015:2016 $SVNURL/branches/SAMBA_3_0
svn merge -r 2016:2018 $SVNURL/branches/SAMBA_3_0
svn merge -r 2022:2023 $SVNURL/branches/SAMBA_3_0
svn merge -r 2026:2027 $SVNURL/branches/SAMBA_3_0
svn merge -r 2057:2068 $SVNURL/branches/SAMBA_3_0
svn merge -r 2068:2070 $SVNURL/branches/SAMBA_3_0
svn merge -r 2076:2077 $SVNURL/branches/SAMBA_3_0
svn merge -r 2080:2082 $SVNURL/branches/SAMBA_3_0
svn merge -r 2082:2083 $SVNURL/branches/SAMBA_3_0
svn merge -r 2083:2086 $SVNURL/branches/SAMBA_3_0
svn merge -r 2086:2090 $SVNURL/branches/SAMBA_3_0
svn merge -r 2090:2091 $SVNURL/branches/SAMBA_3_0
svn merge -r 2091:2093 $SVNURL/branches/SAMBA_3_0
svn merge -r 2093:2111 $SVNURL/branches/SAMBA_3_0
svn merge -r 2116:2131 $SVNURL/branches/SAMBA_3_0
svn merge -r 2131:2133 $SVNURL/branches/SAMBA_3_0
svn merge -r 2133:2135 $SVNURL/branches/SAMBA_3_0
svn merge -r 2150:2152 $SVNURL/branches/SAMBA_3_0
svn merge -r 2147:2150 $SVNURL/branches/SAMBA_3_0
svn merge -r 2155:2157 $SVNURL/branches/SAMBA_3_0
svn merge -r 2163:2175 $SVNURL/branches/SAMBA_3_0
Diffstat (limited to 'examples/autofs')
| -rw-r--r-- | examples/autofs/auto.smb (renamed from examples/autofs/auto.a) | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/examples/autofs/auto.a b/examples/autofs/auto.smb index 0fa8f4efc30..eb24cfaab4a 100644 --- a/examples/autofs/auto.a +++ b/examples/autofs/auto.smb @@ -1,13 +1,9 @@ -# automount points below /a +# automount points below /smb # This is an automounter map and it has the following format # key [ -mount-options-separated-by-comma ] location # Details may be found in the autofs(5) manpage -# nfs servers -valepp -fstype=nfs,rsize=8192,wsize=8192 valepp:/ -galaun -fstype=nfs,rsize=8192,wsize=8192 galaun:/ - # smb-servers supra_andreas -fstype=smb,username=andreas,password=foo ://supra/aheinrich supra_cspiel -fstype=smb,username=cspiel ://supra/cspiel |