[PC-BSD Commits] r19416 - pcbsd/current/src-sh/pc-adctl/scripts

svn at pcbsd.org svn at pcbsd.org
Wed Sep 19 18:02:35 PDT 2012


Author: johnh
Date: 2012-09-20 01:02:35 +0000 (Thu, 20 Sep 2012)
New Revision: 19416

Modified:
   pcbsd/current/src-sh/pc-adctl/scripts/pc-pam
Log:
Remove configure check since we already test if adding duplicate entries.



Modified: pcbsd/current/src-sh/pc-adctl/scripts/pc-pam
===================================================================
--- pcbsd/current/src-sh/pc-adctl/scripts/pc-pam	2012-09-20 00:55:25 UTC (rev 19415)
+++ pcbsd/current/src-sh/pc-adctl/scripts/pc-pam	2012-09-20 01:02:35 UTC (rev 19416)
@@ -373,12 +373,6 @@
 
 	if checkyesno activedirectory_enable 2>/dev/null
 	then
-		AD_init
-		if AD_configured
-		then
-			return 0
-		fi
-
 		auth="+auth:sufficient:${pam_winbind}:silent:try_first_pass:krb5_auth:krb5_ccache_type=FILE"
 		account="+account:sufficient:${pam_winbind}:krb5_auth:krb5_ccache_type=FILE"
 		session="+session:required:${pam_mkhomedir}"
@@ -389,12 +383,6 @@
 
 	elif checkyesno ldapclient_enable 2>/dev/null
 	then
-		ldap_init
-		if ldap_configured
-		then
-			return 0
-		fi
-
 		auth="+auth:sufficient:${pam_ldap}:silent:no_warn:try_first_pass"
 		account="+account:sufficient:${pam_ldap}:ignore_authinfo_unavail"
 		session="+session:required:${pam_mkhomedir}"
@@ -417,8 +405,6 @@
 
 	if checkyesno activedirectory_enable 2>/dev/null
 	then
-		AD_init
-
 		auth="-auth:sufficient:${pam_winbind}"
 		account="-account:sufficient:${pam_winbind}"
 		session="-session:required:${pam_mkhomedir}"



More information about the Commits mailing list