Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 0 insertions, 63 deletions

diff --git a/src/lib/Bcfg2/Server/Hostbase/backends.py b/src/lib/Bcfg2/Server/Hostbase/backends.py
deleted file mode 100644
index cfa9e1e16..000000000
--- a/src/lib/Bcfg2/Server/Hostbase/backends.py
+++ /dev/null
@@ -1,63 +0,0 @@
-from django.contrib.auth.models import User
-#from ldapauth import *
-from nisauth import *
-
-## class LDAPBackend(object):
-
-##     def authenticate(self,username=None,password=None):
-##         try:
-
-##             l = ldapauth(username,password)
-##             temp_pass = User.objects.make_random_password(100)
-##             ldap_user = dict(username=l.sAMAccountName,
-##                              )
-##             user_session_obj = dict(
-##                 email=l.email,
-##                 first_name=l.name_f,
-##                 last_name=l.name_l,
-##                 uid=l.badge_no
-##                 )
-##             #fixme: need to add this user session obj to session
-##             user,created = User.objects.get_or_create(username=username)
-##             return user
-
-##         except LDAPAUTHError,e:
-##             return None
-
-##     def get_user(self,user_id):
-##         try:
-##             return User.objects.get(pk=user_id)
-##         except User.DoesNotExist, e:
-##             return None
-
-
-class NISBackend(object):
-
-    def authenticate(self, username=None, password=None):
-        try:
-            n = nisauth(username, password)
-            temp_pass = User.objects.make_random_password(100)
-            nis_user = dict(username=username,
-                            )
-
-            user_session_obj = dict(
-                email = username + "@mcs.anl.gov",
-                first_name = None,
-                last_name = None,
-                uid = n.uid
-                )
-            user, created = User.objects.get_or_create(username=username)
-
-            return user
-
-        except NISAUTHError:
-            e = sys.exc_info()[1]
-            return None
-
-
-    def get_user(self, user_id):
-        try:
-            return User.objects.get(pk=user_id)
-        except User.DoesNotExist:
-            e = sys.exc_info()[1]
-            return None