tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 22:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused ldap attributes

Browse Source 
refs #4941
This commit is contained in:
Marius Hein 2013-10-22 14:51:24 +02:00
parent 439168ecfb
commit 1fc66eef84
3 changed files with 3 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/authentication.ini.in
View File

@ -21,11 +21,11 @@
@use_ldap_auth@bind_dn = "@ldap_binddn@"
@use_ldap_auth@bind_pw = "@ldap_bindpass@"
; Attributes for ldap user lookup
; Object class of the user
@use_ldap_auth@user_class = "@ldap_user_objectclass@"
@use_ldap_auth@user_name_attribute = "@ldap_attribute_username@"
@use_ldap_auth@user_password_attribute = "@ldap_attribute_password@"
; Attribute name for username
@use_ldap_auth@user_name_attribute = "@ldap_attribute_username@"
@use_internal_auth@[internal_authentication]
@use_internal_auth@backend = db

48
configure vendored
View File

@ -603,9 +603,6 @@ ido_port
ido_host
ido_db_type
icinga_backend
ldap_attribute_groupname
ldap_group_objectclass
ldap_attribute_password
ldap_attribute_username
ldap_attribute_basedn
ldap_user_objectclass
@ -699,9 +696,6 @@ with_ldap_bindpass
with_ldap_rootdn
with_ldap_user_objectclass
with_ldap_attribute_username
with_ldap_attribute_password
with_ldap_group_objectclass
with_ldap_attribute_groupname
with_icinga_backend
with_ido_db_type
with_ido_host
@ -1379,15 +1373,6 @@ Optional Packages:
--with-ldap-attribute-username=LDAP_ATTRIBUTE
user attribute to use for the username (default:
uid)
--with-ldap-attribute-password=LDAP_ATTRIBUTE
user attribute to use for the password (default:
password)
--with-ldap-group-objectclass=LDAP_ATTRIBUTE
ldap object type to use for group authentication
(default: inetOrgPerson)
--with-ldap-attribute-groupname=LDAP_OBJECT_CLASS
user object type to use for the authentication
(default: inetOrgPerson)
--with-icinga-backend=(ido, statusdat, livestatus)
backend to use for rb (default: statusdat)
--with-ido-db-type=(mysql, pgsql)
@ -2517,36 +2502,6 @@ else
fi
# Check whether --with-ldap_attribute_password was given.
if test "${with_ldap_attribute_password+set}" = set; then :
withval=$with_ldap_attribute_password; ldap_attribute_password=$withval
else
ldap_attribute_password="password"
fi
# Check whether --with-ldap_group_objectclass was given.
if test "${with_ldap_group_objectclass+set}" = set; then :
withval=$with_ldap_group_objectclass; ldap_group_objectclass=$withval
else
ldap_group_objectclass="group"
fi
# Check whether --with-ldap_attribute_groupname was given.
if test "${with_ldap_attribute_groupname+set}" = set; then :
withval=$with_ldap_attribute_groupname; ldap_attribute_groupname=$withval
else
ldap_attribute_groupname="guid"
fi
#
# Icinga backend selection
#
@ -2939,9 +2894,6 @@ fi
# backend setup

21
configure.ac
View File

@ -192,24 +192,6 @@ AC_ARG_WITH([ldap_attribute_username],
ldap_attribute_username="uid"
)
AC_ARG_WITH([ldap_attribute_password],
AS_HELP_STRING([--with-ldap-attribute-password=LDAP_ATTRIBUTE], [user attribute to use for the password (default: password)]),
ldap_attribute_password=$withval,
ldap_attribute_password="password"
)
AC_ARG_WITH([ldap_group_objectclass],
AS_HELP_STRING([--with-ldap-group-objectclass=LDAP_ATTRIBUTE], [ldap object type to use for group authentication (default: inetOrgPerson)]),
ldap_group_objectclass=$withval,
ldap_group_objectclass="group"
)
AC_ARG_WITH([ldap_attribute_groupname],
AS_HELP_STRING([--with-ldap-attribute-groupname=LDAP_OBJECT_CLASS], [user object type to use for the authentication (default: inetOrgPerson)]),
ldap_attribute_groupname=$withval,
ldap_attribute_groupname="guid"
)
#
# Icinga backend selection
#
@ -410,9 +392,6 @@ AC_SUBST(ldap_bindpass)
AC_SUBST(ldap_user_objectclass)
AC_SUBST(ldap_attribute_basedn)
AC_SUBST(ldap_attribute_username)
AC_SUBST(ldap_attribute_password)
AC_SUBST(ldap_group_objectclass)
AC_SUBST(ldap_attribute_groupname)
# backend setup
AC_SUBST(icinga_backend)