Attachment #4338 for bug #20517

View | Details | Raw Unified | Return to bug 20517
Collapse All | Expand All




Type=str
Categories=service-adcon

[con.*/s4/mapping/user/ignorelist]
Description[de]=Definiert durch Komma separierte Benutzer, welche durch den Connector nicht synchronisert werden (Default ist root,pcpatch,ucs-s4sync)
Description[en]=Defines a comma separated list of users whom will be ignored by the connector (default is root,pcpatch,ucs-s4sync)
Type=str
Categories=service-adcon

[con.*/s4/mapping/group/ignorelist]
Description[de]=Definiert durch Komma separierte Gruppen, welche durch den Connector nicht synchronisert werden (Default ist Windows Hosts,Authenticated Users,World Authority,Everyone,Null Authority,Nobody)
Description[en]=Defines a comma separated list of groups whom will be ignored by the connector (default is Windows Hosts,Authenticated Users,World Authority,Everyone,Null Authority,Nobody)
Type=str
Categories=service-adcon

[con.*/s4/ldap/base]
Description[de]=Die LDAP-Basis-DN des Samba 4-Servers
Description[en]=The LDAP base DN of the Samba 4 server.

Lines 46-52 Link Here

(-)debian/univention-s4-connector.postinst (-1 / +3 lines)
46	connector/debug/level?2 \	46	connector/debug/level?2 \
47	connector/ad/mapping/group/language?de \	47	connector/ad/mapping/group/language?de \
48	connector/s4/mapping/syncmode?sync \	48	connector/s4/mapping/syncmode?sync \
49	connector/s4/mapping/sid?true	49	connector/s4/mapping/sid?true \
		50	connector/s4/mapping/user/ignorelist?"root,pcpatch,ucs-s4sync" \
		51	connector/s4/mapping/user/ignorelist?"Windows Hosts,Authenticated Users,World Authority,Everyone,Null Authority,Nobody"
50		52
51	if [ ! -d /var/lib/univention-connector/s4 ]; then	53	if [ ! -d /var/lib/univention-connector/s4 ]; then
52	mkdir -p /var/lib/univention-connector/s4	54	mkdir -p /var/lib/univention-connector/s4

Lines 86-93 Link Here

(-)conffiles/etc/univention/s4connector/s4/mapping.py (-2 / +13 lines)
86		86
87	con_search_filter='(&(objectClass=user)(!(objectClass=computer))(userAccountControl:1.2.840.113556.1.4.803:=512))',	87	con_search_filter='(&(objectClass=user)(!(objectClass=computer))(userAccountControl:1.2.840.113556.1.4.803:=512))',
88	match_filter='(&(\|(&(objectClass=posixAccount)(objectClass=krb5Principal))(objectClass=user))(!(objectClass=univentionHost)))',	88	match_filter='(&(\|(&(objectClass=posixAccount)(objectClass=krb5Principal))(objectClass=user))(!(objectClass=univentionHost)))',
89	ignore_filter='(\|(uid=root)(uid=pcpatch)(cn=pcpatch)(CN=pcpatch)(uid=ucs-s4sync)(CN=ucs-s4sync))',	89	@!@
90		90	ignore_filter = ''
		91	for user in configRegistry.get('connector/s4/mapping/user/ignorelist', 'root,pcpatch,ucs-s4sync').split(','):
		92	ignore_filter += '(uid=%s)(CN=%s)' % (user, user)
		93	if ignore_filter:
		94	print " ignore_filter='(\|%s)'," % ignore_filter
		95	@!@
91	ignore_subtree = global_ignore_subtree,	96	ignore_subtree = global_ignore_subtree,
92		97
93	con_create_objectclass=['top', 'user', 'person', 'organizationalPerson'],	98	con_create_objectclass=['top', 'user', 'person', 'organizationalPerson'],
Lines 261-266 Link Here
261	scope='sub',	266	scope='sub',
262		267
263	ignore_filter='(\|(sambaGroupType=5)(groupType=5)(cn=Windows Hosts)(cn=Authenticated Users)(cn=World Authority)(cn=Everyone)(cn=Null Authority)(cn=Nobody))',	268	ignore_filter='(\|(sambaGroupType=5)(groupType=5)(cn=Windows Hosts)(cn=Authenticated Users)(cn=World Authority)(cn=Everyone)(cn=Null Authority)(cn=Nobody))',
		269	@!@
		270	ignore_filter = ''
		271	for group in configRegistry.get('connector/s4/mapping/group/ignorelist', 'Windows Hosts,Authenticated Users,World Authority,Everyone,Null Authority,Nobody').split(','):
		272	ignore_filter += '(cn=%s)' % (group)
		273	print " ignore_filter='(\|(sambaGroupType=5)(groupType=5)%s)'," % ignore_filter
		274	@!@
264		275
265	ignore_subtree = global_ignore_subtree,	276	ignore_subtree = global_ignore_subtree,
266		277

Return to bug 20517

Lines 58-63 Link Here

(-)debian/univention-s4-connector.univention-config-registry-variables (+12 lines)
58	Type=str	58	Type=str
59	Categories=service-adcon	59	Categories=service-adcon
60		60
		61	[con.*/s4/mapping/user/ignorelist]
		62	Description[de]=Definiert durch Komma separierte Benutzer, welche durch den Connector nicht synchronisert werden (Default ist root,pcpatch,ucs-s4sync)
		63	Description[en]=Defines a comma separated list of users whom will be ignored by the connector (default is root,pcpatch,ucs-s4sync)
		64	Type=str
		65	Categories=service-adcon
		66
		67	[con.*/s4/mapping/group/ignorelist]
		68	Description[de]=Definiert durch Komma separierte Gruppen, welche durch den Connector nicht synchronisert werden (Default ist Windows Hosts,Authenticated Users,World Authority,Everyone,Null Authority,Nobody)
		69	Description[en]=Defines a comma separated list of groups whom will be ignored by the connector (default is Windows Hosts,Authenticated Users,World Authority,Everyone,Null Authority,Nobody)
		70	Type=str
		71	Categories=service-adcon
		72
61	[con.*/s4/ldap/base]	73	[con.*/s4/ldap/base]
62	Description[de]=Die LDAP-Basis-DN des Samba 4-Servers	74	Description[de]=Die LDAP-Basis-DN des Samba 4-Servers
63	Description[en]=The LDAP base DN of the Samba 4 server.	75	Description[en]=The LDAP base DN of the Samba 4 server.