dbp/mds
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app-admin/mmc-agent: Remove diff from patch

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@882 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-03-16 14:50:46 +00:00
parent 076ba005c6
commit 333bc089ef
3 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app-admin/mmc-agent/files/mmc-agent-2.3.1-kerberos-1.patch
View File

@@ -240,50 +240,6 @@ diff -Naur mmc-agent-2.3.1.orig/mmc/plugins/kerberos/__init__.py mmc-agent-2.3.1
+ return True
+
+
diff -Naur mmc-agent-2.3.1.orig/plugins_base.diff mmc-agent-2.3.1/plugins_base.diff
--- mmc-agent-2.3.1.orig/plugins_base.diff 1970-01-01 00:00:00.000000000 +0000
+++ mmc-agent-2.3.1/plugins_base.diff 2008-05-17 13:04:04.000000000 +0000
@@ -0,0 +1,40 @@
+--- mds-orig/mmc-agent/mmc/plugins/base/__init__.py 2007-11-21 10:57:03.000000000 +0100
++++ kerberos_plugin/trunk/mmc-agent/mmc/plugins/base/__init__.py 2007-11-21 11:34:36.000000000 +0100
+@@ -1207,6 +1207,10 @@
+ attrs = []
+ attrib = self.l.search_s(dn, ldap.SCOPE_BASE)
+ c, attrs = attrib[0]
++ # kerberos -> remove binary key from attrs
++ try: attrs.pop('krb5Key')
++ except: pass
++ #
+ newattrs = copy.deepcopy(attrs)
+ return newattrs
+
+@@ -1227,6 +1231,10 @@
+ attrib = self.l.search_s(cn, ldap.SCOPE_BASE)
+
+ c,attrs=attrib[0]
++ # kerberos -> remove binary key from attrs
++ try: attrs.pop('krb5Key')
++ except: pass
++ #
+
+ newattrs = copy.deepcopy(attrs)
+
+@@ -1380,8 +1388,13 @@
+ @rtype: list
+ """
+ if not base: base = self.baseUsersDN
+- if (pattern==''): searchFilter = "uid=*"
+- else: searchFilter = pattern
++ # kerberos -> search only PosixAccount
++ if (pattern==''): searchFilter = "(&(objectClass=posixAccount)(uid=*))"
++ elif pattern[0] == '(':
++ searchFilter = "(&(objectClass=posixAccount)%s)" % (pattern)
++ else:
++ searchFilter = "(&(objectClass=posixAccount)(%s))" % (pattern)
++ #
+ monoattrs = ["uid", "sn", "givenName", "mail"]
+ result_set = self.search(searchFilter, base, monoattrs + ["telephoneNumber", "loginShell", "objectClass"], ldap.SCOPE_ONELEVEL)
+
diff -Naur mmc-agent-2.3.1.orig/setup.py mmc-agent-2.3.1/setup.py
--- mmc-agent-2.3.1.orig/setup.py 2007-09-10 08:20:59.000000000 +0000
+++ mmc-agent-2.3.1/setup.py 2008-06-14 09:24:15.000000000 +0000