View | Details | Raw Unified | Return to bug 39309 | Differences between
and this patch

Collapse All | Expand All

(-)a/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py (-17 / +10 lines)
 Lines 121-147   if ignore_filter: Link Here 
121 
							ldap_attribute='uid',
 121 
							ldap_attribute='uid',
122 
							con_attribute='sAMAccountName',
 122 
							con_attribute='sAMAccountName',
123 
							required=1,
 123 
							required=1,
124 
							compare_function=univention.s4connector.compare_lowercase,
124 
							single_value=True,
 125 
							single_value=True,
125 
						),
 126 
						),
126 
					'givenName' : univention.s4connector.attribute (
 127 
					'givenName' : univention.s4connector.attribute (
127 
							ucs_attribute='firstname',
 128 
							ucs_attribute='firstname',
128 
							ldap_attribute='givenName',
 129 
							ldap_attribute='givenName',
129 
							con_attribute='givenName',
 130 
							con_attribute='givenName',
130 
							compare_function=univention.s4connector.compare_normal,
131 
							single_value=True,
 131 
							single_value=True,
132 
						),
 132 
						),
133 
					'displayName': univention.s4connector.attribute (
 133 
					'displayName': univention.s4connector.attribute (
134 
							ucs_attribute='displayName',
 134 
							ucs_attribute='displayName',
135 
							ldap_attribute='displayName',
 135 
							ldap_attribute='displayName',
136 
							con_attribute='displayName',
 136 
							con_attribute='displayName',
137 
							compare_function=univention.s4connector.compare_normal,
138 
							single_value=True,
 137 
							single_value=True,
139 
						),
 138 
						),
140 
					'sn': univention.s4connector.attribute (
 139 
					'sn': univention.s4connector.attribute (
141 
							ucs_attribute='lastname',
 140 
							ucs_attribute='lastname',
142 
							ldap_attribute='sn',
 141 
							ldap_attribute='sn',
143 
							con_attribute='sn',
 142 
							con_attribute='sn',
144 
							compare_function=univention.s4connector.compare_normal,
145 
							single_value=True,
 143 
							single_value=True,
146 
						),
 144 
						),
147 
					@!@
 145 
					@!@
 Lines 197-210   if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi Link Here 
197 
							ucs_attribute='organisation',
 195 
							ucs_attribute='organisation',
198 
							ldap_attribute='o',
 196 
							ldap_attribute='o',
199 
							con_attribute='company',
 197 
							con_attribute='company',
200 
							compare_function=univention.s4connector.compare_normal,
201 
							single_value=True,
 198 
							single_value=True,
202 
						),
 199 
						),
203 
					'description': univention.s4connector.attribute (
 200 
					'description': univention.s4connector.attribute (
204 
							ucs_attribute='description',
 201 
							ucs_attribute='description',
205 
							ldap_attribute='description',
 202 
							ldap_attribute='description',
206 
							con_attribute='description',
 203 
							con_attribute='description',
207 
							compare_function=univention.s4connector.compare_normal,
208 
							single_value=True,
 204 
							single_value=True,
209 
						),
 205 
						),
210 
					'mailPrimaryAddress': univention.s4connector.attribute (
 206 
					'mailPrimaryAddress': univention.s4connector.attribute (
 Lines 218-231   if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi Link Here 
218 
							ucs_attribute='street',
 214 
							ucs_attribute='street',
219 
							ldap_attribute='street',
 215 
							ldap_attribute='street',
220 
							con_attribute='streetAddress',
 216 
							con_attribute='streetAddress',
221 
							compare_function=univention.s4connector.compare_normal,
222 
							single_value=True,
 217 
							single_value=True,
223 
						),
 218 
						),
224 
					'city': univention.s4connector.attribute (
 219 
					'city': univention.s4connector.attribute (
225 
							ucs_attribute='city',
 220 
							ucs_attribute='city',
226 
							ldap_attribute='l',
 221 
							ldap_attribute='l',
227 
							con_attribute='l',
 222 
							con_attribute='l',
228 
							compare_function=univention.s4connector.compare_normal,
229 
							single_value=True,
 223 
							single_value=True,
230 
						),
 224 
						),
231 
					'postcode': univention.s4connector.attribute (
 225 
					'postcode': univention.s4connector.attribute (
 Lines 360-372   if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi Link Here 
360 
							ldap_attribute='cn',
 354 
							ldap_attribute='cn',
361 
							con_attribute='sAMAccountName',
 355 
							con_attribute='sAMAccountName',
362 
							required=1,
 356 
							required=1,
357 
							compare_function=univention.s4connector.compare_lowercase,
363 
							single_value=True,
 358 
							single_value=True,
364 
						),
 359 
						),
365 
					'description': univention.s4connector.attribute (
 360 
					'description': univention.s4connector.attribute (
366 
							ucs_attribute='description',
 361 
							ucs_attribute='description',
367 
							ldap_attribute='description',
 362 
							ldap_attribute='description',
368 
							con_attribute='description',
 363 
							con_attribute='description',
369 
							compare_function=univention.s4connector.compare_normal,
370 
							single_value=True,
 364 
							single_value=True,
371 
						),
 365 
						),
372 
@!@
 366 
@!@
 Lines 472-489   if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi Link Here 
472 
							ldap_attribute='cn',
 466 
							ldap_attribute='cn',
473 
							con_attribute='cn',
 467 
							con_attribute='cn',
474 
							required=1,
 468 
							required=1,
469 
							compare_function=univention.s4connector.compare_lowercase,
475 
							single_value=True,
 470 
							single_value=True,
476 
						),
 471 
						),
477 
					'samAccountName': univention.s4connector.attribute (
 472 
					'samAccountName': univention.s4connector.attribute (
478 
							ldap_attribute='uid',
 473 
							ldap_attribute='uid',
479 
							con_attribute='sAMAccountName',
 474 
							con_attribute='sAMAccountName',
475 
							compare_function=univention.s4connector.compare_lowercase,
480 
							single_value=True,
 476 
							single_value=True,
481 
						),
 477 
						),
482 
					'description': univention.s4connector.attribute (
 478 
					'description': univention.s4connector.attribute (
483 
							ucs_attribute='description',
 479 
							ucs_attribute='description',
484 
							ldap_attribute='description',
 480 
							ldap_attribute='description',
485 
							con_attribute='description',
 481 
							con_attribute='description',
486 
							compare_function=univention.s4connector.compare_normal,
487 
							single_value=True,
 482 
							single_value=True,
488 
						),
 483 
						),
489 
					'operatingSystem': univention.s4connector.attribute (
 484 
					'operatingSystem': univention.s4connector.attribute (
 Lines 566-583   if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi Link Here 
566 
							ldap_attribute='cn',
 561 
							ldap_attribute='cn',
567 
							con_attribute='cn',
 562 
							con_attribute='cn',
568 
							required=1,
 563 
							required=1,
564 
							compare_function=univention.s4connector.compare_lowercase,
569 
							single_value=True,
 565 
							single_value=True,
570 
						),
 566 
						),
571 
					'samAccountName': univention.s4connector.attribute (
 567 
					'samAccountName': univention.s4connector.attribute (
572 
							ldap_attribute='uid',
 568 
							ldap_attribute='uid',
573 
							con_attribute='sAMAccountName',
 569 
							con_attribute='sAMAccountName',
570 
							compare_function=univention.s4connector.compare_lowercase,
574 
							single_value=True,
 571 
							single_value=True,
575 
						),
 572 
						),
576 
					'description': univention.s4connector.attribute (
 573 
					'description': univention.s4connector.attribute (
577 
							ucs_attribute='description',
 574 
							ucs_attribute='description',
578 
							ldap_attribute='description',
 575 
							ldap_attribute='description',
579 
							con_attribute='description',
 576 
							con_attribute='description',
580 
							compare_function=univention.s4connector.compare_normal,
581 
							single_value=True,
 577 
							single_value=True,
582 
						),
 578 
						),
583 
					'operatingSystem': univention.s4connector.attribute (
 579 
					'operatingSystem': univention.s4connector.attribute (
 Lines 678-690   if configRegistry.is_true('connector/s4/mapping/gpo', True): Link Here 
678 
							ldap_attribute='cn',
 674 
							ldap_attribute='cn',
679 
							con_attribute='cn',
 675 
							con_attribute='cn',
680 
							required=1,
 676 
							required=1,
677 
							compare_function=univention.s4connector.compare_lowercase,
681 
							single_value=True,
 678 
							single_value=True,
682 
						),
 679 
						),
683 
					'description': univention.s4connector.attribute (
 680 
					'description': univention.s4connector.attribute (
684 
							ucs_attribute='description',
 681 
							ucs_attribute='description',
685 
							ldap_attribute='description',
 682 
							ldap_attribute='description',
686 
							con_attribute='description',
 683 
							con_attribute='description',
687 
							compare_function=univention.s4connector.compare_normal,
688 
							single_value=True,
 684 
							single_value=True,
689 
						),
 685 
						),
690 
					'displayName': univention.s4connector.attribute (
 686 
					'displayName': univention.s4connector.attribute (
 Lines 809-822   if configRegistry.is_true('connector/s4/mapping/wmifilter', False): Link Here 
809 
							ucs_attribute='description',
 805 
							ucs_attribute='description',
810 
							ldap_attribute='description',
 806 
							ldap_attribute='description',
811 
							con_attribute='description',
 807 
							con_attribute='description',
812 
							compare_function=univention.s4connector.compare_normal,
813 
							single_value=True,
 808 
							single_value=True,
814 
						),
 809 
						),
815 
					'displayName': univention.s4connector.attribute (
 810 
					'displayName': univention.s4connector.attribute (
816 
							ucs_attribute='displayName',
 811 
							ucs_attribute='displayName',
817 
							ldap_attribute='displayName',
 812 
							ldap_attribute='displayName',
818 
							con_attribute='displayName',
 813 
							con_attribute='displayName',
819 
							compare_function=univention.s4connector.compare_normal,
820 
							single_value=True,
 814 
							single_value=True,
821 
						),
 815 
						),
822 
					'author': univention.s4connector.attribute (
 816 
					'author': univention.s4connector.attribute (
 Lines 921-940   if configRegistry.is_true('connector/s4/mapping/msprintconnectionpolicy', False) Link Here 
921 
							ldap_attribute='cn',
 915 
							ldap_attribute='cn',
922 
							con_attribute='cn',
 916 
							con_attribute='cn',
923 
							required=1,
 917 
							required=1,
918 
							compare_function=univention.s4connector.compare_lowercase,
924 
							single_value=True,
 919 
							single_value=True,
925 
						),
 920 
						),
926 
					'description': univention.s4connector.attribute (
 921 
					'description': univention.s4connector.attribute (
927 
							ucs_attribute='description',
 922 
							ucs_attribute='description',
928 
							ldap_attribute='description',
 923 
							ldap_attribute='description',
929 
							con_attribute='description',
 924 
							con_attribute='description',
930 
							compare_function=univention.s4connector.compare_normal,
931 
							single_value=True,
 925 
							single_value=True,
932 
						),
 926 
						),
933 
					'displayName': univention.s4connector.attribute (
 927 
					'displayName': univention.s4connector.attribute (
934 
							ucs_attribute='displayName',
 928 
							ucs_attribute='displayName',
935 
							ldap_attribute='displayName',
 929 
							ldap_attribute='displayName',
936 
							con_attribute='displayName',
 930 
							con_attribute='displayName',
937 
							compare_function=univention.s4connector.compare_normal,
938 
							single_value=True,
 931 
							single_value=True,
939 
						),
 932 
						),
940 
					'msPrintAttributes': univention.s4connector.attribute (
 933 
					'msPrintAttributes': univention.s4connector.attribute (
 Lines 997-1009   if ignore_filter: Link Here 
997 
							ldap_attribute='cn',
 990 
							ldap_attribute='cn',
998 
							con_attribute='cn',
 991 
							con_attribute='cn',
999 
							required=1,
 992 
							required=1,
993 
							compare_function=univention.s4connector.compare_lowercase,
1000 
							single_value=True,
 994 
							single_value=True,
1001 
						),
 995 
						),
1002 
					'description': univention.s4connector.attribute (
 996 
					'description': univention.s4connector.attribute (
1003 
							ucs_attribute='description',
 997 
							ucs_attribute='description',
1004 
							ldap_attribute='description',
 998 
							ldap_attribute='description',
1005 
							con_attribute='description',
 999 
							con_attribute='description',
1006 
							compare_function=univention.s4connector.compare_normal,
1007 
							single_value=True,
 1000 
							single_value=True,
1008 
						),
 1001 
						),
1009 
@!@
 1002 
@!@
 Lines 1052-1064   if ignore_filter: Link Here 
1052 
							ldap_attribute='ou',
 1045 
							ldap_attribute='ou',
1053 
							con_attribute='ou',
 1046 
							con_attribute='ou',
1054 
							required=1,
 1047 
							required=1,
1048 
							compare_function=univention.s4connector.compare_lowercase,
1055 
							single_value=True,
 1049 
							single_value=True,
1056 
						),
 1050 
						),
1057 
					'description': univention.s4connector.attribute (
 1051 
					'description': univention.s4connector.attribute (
1058 
							ucs_attribute='description',
 1052 
							ucs_attribute='description',
1059 
							ldap_attribute='description',
 1053 
							ldap_attribute='description',
1060 
							con_attribute='description',
 1054 
							con_attribute='description',
1061 
							compare_function=univention.s4connector.compare_normal,
1062 
							single_value=True,
 1055 
							single_value=True,
1063 
						),
 1056 
						),
1064 
@!@
 1057 
@!@
(-)a/services/univention-s4-connector/modules/univention/s4connector/__init__.py (-2 / +2 lines)
 Lines 349-356   class attribute: Link Here 
349 
		self.con_attribute = con_attribute
 349 
		self.con_attribute = con_attribute
350 
		self.con_other_attribute = con_other_attribute
 350 
		self.con_other_attribute = con_other_attribute
351 
		self.required = required
 351 
		self.required = required
352 
		# If no compare_function is given, we default to `compare_lowercase()`
 352 
		# If no compare_function is given, we default to `compare_normal()`
353 
		self.compare_function = compare_function or compare_lowercase
 353 
		self.compare_function = compare_function or compare_normal
354 
		if mapping:
 354 
		if mapping:
355 
			self.mapping = mapping
 355 
			self.mapping = mapping
356 
		# Make a reverse check of this mapping. This is necassary if the attribute is
 356 
		# Make a reverse check of this mapping. This is necassary if the attribute is

Return to bug 39309