svn commit: samba r2487 - in trunk/examples: . LDAP

[jerry at samba.org]

Author: jerry
Date: 2004-09-22 03:02:55 +0000 (Wed, 22 Sep 2004)
New Revision: 2487

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/examples&rev=2487&nolog=1

Log:
working on syncing up trunk with 3.0
Removed:
   trunk/examples/appliance/
   trunk/examples/simple/
   trunk/examples/smbconf_edit/
   trunk/examples/thoralf/
Modified:
   trunk/examples/LDAP/samba.schema.at.IBM-DS
   trunk/examples/LDAP/samba.schema.oc.IBM-DS
   trunk/examples/smb.conf.default


Changeset:
Modified: trunk/examples/LDAP/samba.schema.at.IBM-DS
===================================================================
--- trunk/examples/LDAP/samba.schema.at.IBM-DS	2004-09-22 02:39:38 UTC (rev 2486)
+++ trunk/examples/LDAP/samba.schema.at.IBM-DS	2004-09-22 03:02:55 UTC (rev 2487)
@@ -44,16 +44,4 @@
 
 attributetypes=( 1.3.6.1.4.1.7165.2.1.40 NAME 'sambaAlgorithmicRidBase' DESC 'Base at which the samba RID generation algorithm should operate' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetypes=( 1.3.6.1.4.1.7165.2.1.41 NAME 'sambaShareName' DESC 'Share Name' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetypes=( 1.3.6.1.4.1.7165.2.1.42 NAME 'sambaOptionName'	DESC 'Option Name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
-
-attributetypes=( 1.3.6.1.4.1.7165.2.1.43 NAME 'sambaBoolOption' DESC 'A boolean option' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
-
-attributetypes=( 1.3.6.1.4.1.7165.2.1.44 NAME 'sambaIntegerOption' DESC 'An integer option' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-attributetypes=( 1.3.6.1.4.1.7165.2.1.45 NAME 'sambaStringOption' DESC 'A string option' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetypes=( 1.3.6.1.4.1.7165.2.1.46 NAME 'sambaStringListOption' DESC 'A string list option' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
 attributetypes=( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC '' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )

Modified: trunk/examples/LDAP/samba.schema.oc.IBM-DS
===================================================================
--- trunk/examples/LDAP/samba.schema.oc.IBM-DS	2004-09-22 02:39:38 UTC (rev 2486)
+++ trunk/examples/LDAP/samba.schema.oc.IBM-DS	2004-09-22 03:02:55 UTC (rev 2487)
@@ -12,8 +12,4 @@
 
 objectclasses=( 1.3.6.1.4.1.7165.1.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL DESC 'Structural Class for a SID' MUST ( sambaSID ) )
 
-objectclasses=( 1.3.6.1.4.1.7165.1.2.2.10 NAME 'sambaConfig' SUP top AUXILIARY DESC 'Samba Configuration Section' MAY ( description ) )
 
-objectclasses=( 1.3.6.1.4.1.7165.1.2.2.11 NAME 'sambaShare' SUP top STRUCTURAL DESC 'Samba Share Section' MUST ( sambaShareName ) MAY ( description ) )
-
-objectclasses=( 1.3.6.1.4.1.7165.1.2.2.12 NAME 'sambaConfigOption' SUP top STRUCTURAL DESC 'Samba Configuration Option' MUST ( sambaOptionName ) MAY ( sambaBoolOption $ sambaIntegerOption $ sambaStringOption $ sambaStringListoption $ description ) )

Modified: trunk/examples/smb.conf.default
===================================================================
--- trunk/examples/smb.conf.default	2004-09-22 02:39:38 UTC (rev 2486)
+++ trunk/examples/smb.conf.default	2004-09-22 03:02:55 UTC (rev 2487)
@@ -4,8 +4,13 @@
 # many!) most of which are not shown in this example
 #
 # For a step to step guide on installing, configuring and using samba, 
-# read the Samba HOWTO Collection.
+# read the Samba-HOWTO-Collection. This may be obtained from:
+#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
 #
+# Many working examples of smb.conf files can be found in the 
+# Samba-Guide which is generated daily and can be downloaded from: 
+#  http://www.samba.org/samba/docs/Samba-Guide.pdf
+#
 # Any line which starts with a ; (semi-colon) or a # (hash) 
 # is a comment and is ignored. In this example we will use a #
 # for commentry and a ; for parts of the config file that you
@@ -17,7 +22,7 @@
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
    workgroup = MYGROUP
 
 # server string is the equivalent of the NT Description field
@@ -25,7 +30,7 @@
 
 # Security mode. Defines in which mode Samba will operate. Possible 
 # values are share, user, server, domain and ads. Most people will want 
-# user level security. See the HOWTO Collection for details.
+# user level security. See the Samba-HOWTO-Collection for details.
    security = user
 
 # This option is important for security. It allows you to restrict