users: Drop ldap_dn attribute

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index e50aa4f462cf92f98e15445625cf0580cbb0d590..0993f0dc2299deaee29d9fc396537f08ca4b875b 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -56,7 +56,7 @@ class Users(base.Object):
 
                return res.count
 
-       def create(self, name, realname=None, ldap_dn=None):
+       def create(self, name, realname=None):
                # XXX check if username has the correct name
 
                # Check if name is already taken
@@ -65,8 +65,8 @@ class Users(base.Object):
                        raise ValueError("Username %s already taken" % name)
 
                # Create new user
-               user = self._get_user("INSERT INTO users(name, realname, ldap_dn) \
-                       VALUES(%s, %s, %s) RETURNING *", name, realname, ldap_dn)
+               user = self._get_user("INSERT INTO users(name, realname) \
+                       VALUES(%s, %s) RETURNING *", name, realname)
 
                # Create row in permissions table.
                self.db.execute("INSERT INTO users_permissions(user_id) VALUES(%s)", user.id)
@@ -83,7 +83,7 @@ class Users(base.Object):
                assert dn
 
                # Create regular user
-               user = self.create(name, realname=attr["cn"][0], ldap_dn=dn)
+               user = self.create(name, realname=attr["cn"][0])
                user.activate()
 
                # Add all email addresses and activate them
@@ -199,10 +199,6 @@ class User(base.DataObject):
        def name(self):
                return self.data.name
 
-       @property
-       def ldap_dn(self):
-               return self.data.ldap_dn
-
        @property
        def firstname(self):
                # Try to split the string into first and last name.

diff --git a/src/database.sql b/src/database.sql
index 4508698430e881745fbd26aaad3c847786094a6c..73478cbf1fc2c875766dce82f6417dce37e16abb 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -1347,7 +1347,6 @@ CREATE TABLE public.users (
     activated boolean DEFAULT false NOT NULL,
     deleted boolean DEFAULT false NOT NULL,
     registered_at timestamp without time zone DEFAULT now() NOT NULL,
-    ldap_dn text,
     admin boolean DEFAULT false NOT NULL,
     quota bigint
 );