Merged revisions 114088 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r114088 | tilghman | 2008-04-11 18:21:54 -0500 (Fri, 11 Apr 2008) | 3 lines

Make the sample config match the contributed LDAP schema
(Closes issue #12421)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-04-11 23:23:10 +00:00
parent 8b58c0dd5a
commit 7ef743b835

View File

@@ -28,92 +28,92 @@
; additionalFilter - This specifies an additional set of criteria to be used ; additionalFilter - This specifies an additional set of criteria to be used
; when querying the LDAP server. ; when querying the LDAP server.
; ;
additionalFilter=(objectClass=PBXConfig) additionalFilter=(objectClass=AstConfig)
; ;
; Attributes mapping (asterisk variable name = ldap attribute name) ; Attributes mapping (asterisk variable name = ldap attribute name)
; When Asterisk requests the variable by the name of the value on the left, ; When Asterisk requests the variable by the name of the value on the left,
; this module will look up the attribute listed on the right. ; this module will look up the attribute listed on the right.
; ;
filename = PBXConfigFilename filename = AstConfigFilename
category = PBXConfigCategory category = AstConfigCategory
variable_name = PBXConfigVariableName variable_name = AstConfigVariableName
variable_value = PBXConfigVariableValue variable_value = AstConfigVariableValue
cat_metric = PBXConfigCategoryMetric cat_metric = AstConfigCategoryMetric
commented = PBXConfigCommented commented = AstConfigCommented
; ;
; Extensions Table ; Extensions Table
; ;
[extensions] [extensions]
context = PBXExtensionContext context = AstExtensionContext
exten = PBXExtensionExten exten = AstExtensionExten
priority = PBXExtensionPriority priority = AstExtensionPriority
app = PBXExtensionApplication app = AstExtensionApplication
appdata = PBXExtensionApplicationData appdata = AstExtensionApplicationData
additionalFilter=(objectClass=PBXExtension) additionalFilter=(objectClass=AstExtension)
; ;
; Sip Users Table ; Sip Users Table
; ;
[sip] [sip]
name = uid name = uid
amaflags = PBXAccountAMAFlags amaflags = AstAccountAMAFlags
callgroup = PBXAccountCallGroup callgroup = AstAccountCallGroup
callerid = PBXAccountCallerID callerid = AstAccountCallerID
canreinvite = PBXAccountCanReinvite canreinvite = AstAccountCanReinvite
context = PBXAccountContext context = AstAccountContext
dtmfmode = PBXAccountDTMFMode dtmfmode = AstAccountDTMFMode
fromuser = PBXAccountFromUser fromuser = AstAccountFromUser
fromdomain = PBXAccountFromDomain fromdomain = AstAccountFromDomain
fullcontact = PBXAccountFullContact fullcontact = AstAccountFullContact
fullcontact = gecos fullcontact = gecos
host = PBXAccountHost host = AstAccountHost
insecure = PBXAccountInsecure insecure = AstAccountInsecure
mailbox = PBXAccountMailbox mailbox = AstAccountMailbox
md5secret = realmedPassword md5secret = realmedPassword
nat = PBXAccountNAT nat = AstAccountNAT
deny = PBXAccountDeny deny = AstAccountDeny
permit = PBXAccountPermit permit = AstAccountPermit
pickupgroup = PBXAccountPickupGroup pickupgroup = AstAccountPickupGroup
port = PBXAccountPort port = AstAccountPort
qualify = PBXAccountQualify qualify = AstAccountQualify
restrictcid = PBXAccountRestrictCID restrictcid = AstAccountRestrictCID
rtptimeout = PBXAccountRTPTimeout rtptimeout = AstAccountRTPTimeout
rtpholdtimeout = PBXAccountRTPHoldTimeout rtpholdtimeout = AstAccountRTPHoldTimeout
type = PBXAccountType type = AstAccountType
disallow = PBXAccountDisallowedCodec disallow = AstAccountDisallowedCodec
allow = PBXAccountAllowedCodec allow = AstAccountAllowedCodec
MusicOnHold = PBXAccountMusicOnHold MusicOnHold = AstAccountMusicOnHold
regseconds = PBXAccountExpirationTimestamp regseconds = AstAccountExpirationTimestamp
regcontext = PBXAccountRegistrationContext regcontext = AstAccountRegistrationContext
regexten = PBXAccountRegistrationExten regexten = AstAccountRegistrationExten
CanCallForward = PBXAccountCanCallForward CanCallForward = AstAccountCanCallForward
additionalFilter=(objectClass=PBXAccountSIP) additionalFilter=(objectClass=AstAccountSIP)
; ;
; IAX Users Table ; IAX Users Table
; ;
[iax] [iax]
amaflags = PBXAccountAMAFlags amaflags = AstAccountAMAFlags
callerid = PBXAccountCallerID callerid = AstAccountCallerID
context = PBXAccountContext context = AstAccountContext
fullcontact = PBXAccountFullContact fullcontact = AstAccountFullContact
fullcontact = gecos fullcontact = gecos
host = PBXAccountHost host = AstAccountHost
mailbox = PBXAccountMailbox mailbox = AstAccountMailbox
md5secret = realmedPassword md5secret = realmedPassword
deny = PBXAccountDeny deny = AstAccountDeny
permit = PBXAccountPermit permit = AstAccountPermit
port = PBXAccountPort port = AstAccountPort
qualify = PBXAccountQualify qualify = AstAccountQualify
type = PBXAccountType type = AstAccountType
disallow = PBXAccountDisallowedCodec disallow = AstAccountDisallowedCodec
allow = PBXAccountAllowedCodec allow = AstAccountAllowedCodec
regseconds = PBXAccountExpirationTimestamp regseconds = AstAccountExpirationTimestamp
regcontext = PBXAccountRegistrationContext regcontext = AstAccountRegistrationContext
regexten = PBXAccountRegistrationExten regexten = AstAccountRegistrationExten
notransfer = PBXAccountNoTransfer notransfer = AstAccountNoTransfer
additionalFilter=(objectClass=PBXAccountIAX) additionalFilter=(objectClass=AstAccountIAX)
; ;
; A Test Family ; A Test Family
@@ -123,36 +123,36 @@ MyUSERID = uid
additionalFilter=(objectClass=*) additionalFilter=(objectClass=*)
[accounts] [accounts]
amaflags = PBXAccountAMAFlags amaflags = AstAccountAMAFlags
callgroup = PBXAccountCallGroup callgroup = AstAccountCallGroup
callerid = PBXAccountCallerID callerid = AstAccountCallerID
canreinvite = PBXAccountCanReinvite canreinvite = AstAccountCanReinvite
context = PBXAccountContext context = AstAccountContext
dtmfmode = PBXAccountDTMFMode dtmfmode = AstAccountDTMFMode
fromuser = PBXAccountFromUser fromuser = AstAccountFromUser
fromdomain = PBXAccountFromDomain fromdomain = AstAccountFromDomain
fullcontact = PBXAccountFullContact fullcontact = AstAccountFullContact
fullcontact = gecos fullcontact = gecos
host = PBXAccountHost host = AstAccountHost
insecure = PBXAccountInsecure insecure = AstAccountInsecure
mailbox = PBXAccountMailbox mailbox = AstAccountMailbox
md5secret = realmedPassword md5secret = realmedPassword
nat = PBXAccountNAT nat = AstAccountNAT
deny = PBXAccountDeny deny = AstAccountDeny
permit = PBXAccountPermit permit = AstAccountPermit
pickupgroup = PBXAccountPickupGroup pickupgroup = AstAccountPickupGroup
port = PBXAccountPort port = AstAccountPort
qualify = PBXAccountQualify qualify = AstAccountQualify
restrictcid = PBXAccountRestrictCID restrictcid = AstAccountRestrictCID
rtptimeout = PBXAccountRTPTimeout rtptimeout = AstAccountRTPTimeout
rtpholdtimeout = PBXAccountRTPHoldTimeout rtpholdtimeout = AstAccountRTPHoldTimeout
type = PBXAccountType type = AstAccountType
disallow = PBXAccountDisallowedCodec disallow = AstAccountDisallowedCodec
allow = PBXAccountAllowedCodec allow = AstAccountAllowedCodec
MusicOnHold = PBXAccountMusicOnHold MusicOnHold = AstAccountMusicOnHold
regseconds = PBXAccountExpirationTimestamp regseconds = AstAccountExpirationTimestamp
regcontext = PBXAccountRegistrationContext regcontext = AstAccountRegistrationContext
regexten = PBXAccountRegistrationExten regexten = AstAccountRegistrationExten
CanCallForward = PBXAccountCanCallForward CanCallForward = AstAccountCanCallForward
additionalFilter=(objectClass=PBXAccount) additionalFilter=(objectClass=AstAccount)