From 1fc66eef8441ba7bb0e369700af696e588d5883e Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Tue, 22 Oct 2013 14:51:24 +0200
Subject: [PATCH] Removed unused ldap attributes

refs #4941
---
 config/authentication.ini.in |  6 ++---
 configure                    | 48 ------------------------------------
 configure.ac                 | 21 ----------------
 3 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/config/authentication.ini.in b/config/authentication.ini.in
index e65561981..80bfc1aeb 100755
--- a/config/authentication.ini.in
+++ b/config/authentication.ini.in
@@ -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
diff --git a/configure b/configure
index da53bc61e..5f4497146 100755
--- a/configure
+++ b/configure
@@ -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
 
 
diff --git a/configure.ac b/configure.ac
index 89249bc8f..00936eda2 100755
--- a/configure.ac
+++ b/configure.ac
@@ -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)