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

Collapse All | Expand All

(-)conffiles/etc/univention/s4connector/s4/mapping.py (-55 / +14 lines)
 Lines 119-143    Link Here 
119 
							con_attribute='sAMAccountName',
 119 
							con_attribute='sAMAccountName',
120 
							required=1,
 120 
							required=1,
121 
							compare_function=univention.s4connector.compare_lowercase,
 121 
							compare_function=univention.s4connector.compare_lowercase,
122 
							single_value=True,
123 
						),
 122 
						),
124 
					'givenName' : univention.s4connector.attribute (
 123 
					'givenName' : univention.s4connector.attribute (
125 
							ucs_attribute='firstname',
 124 
							ucs_attribute='firstname',
126 
							ldap_attribute='givenName',
 125 
							ldap_attribute='givenName',
127 
							con_attribute='givenName',
 126 
							con_attribute='givenName',
128 
							single_value=True,
129 
						),
 127 
						),
130 
					'displayName': univention.s4connector.attribute (
 128 
					'displayName': univention.s4connector.attribute (
131 
							ucs_attribute='displayName',
 129 
							ucs_attribute='displayName',
132 
							ldap_attribute='displayName',
 130 
							ldap_attribute='displayName',
133 
							con_attribute='displayName',
 131 
							con_attribute='displayName',
134 
							single_value=True,
135 
						),
 132 
						),
136 
					'sn': univention.s4connector.attribute (
 133 
					'sn': univention.s4connector.attribute (
137 
							ucs_attribute='lastname',
 134 
							ucs_attribute='lastname',
138 
							ldap_attribute='sn',
 135 
							ldap_attribute='sn',
139 
							con_attribute='sn',
 136 
							con_attribute='sn',
140 
							single_value=True,
141 
						),
 137 
						),
142 
					@!@
 138 
					@!@
143 
import univention.s4connector.s4.sid_mapping
 139 
import univention.s4connector.s4.sid_mapping
 Lines 197-209    Link Here 
197 
							ucs_attribute='organisation',
 193 
							ucs_attribute='organisation',
198 
							ldap_attribute='o',
 194 
							ldap_attribute='o',
199 
							con_attribute='company',
 195 
							con_attribute='company',
200 
							single_value=True,
201 
						),
 196 
						),
202 
					'description': univention.s4connector.attribute (
 197 
					'description': univention.s4connector.attribute (
203 
							ucs_attribute='description',
 198 
							ucs_attribute='description',
204 
							ldap_attribute='description',
 199 
							ldap_attribute='description',
205 
							con_attribute='description',
 200 
							con_attribute='description',
206 
							single_value=True,
207 
						),
 201 
						),
208 
					'mailPrimaryAddress': univention.s4connector.attribute (
 202 
					'mailPrimaryAddress': univention.s4connector.attribute (
209 
							ucs_attribute='mailPrimaryAddress',
 203 
							ucs_attribute='mailPrimaryAddress',
 Lines 210-234    Link Here 
210 
							ldap_attribute='mailPrimaryAddress',
 204 
							ldap_attribute='mailPrimaryAddress',
211 
							con_attribute='mail',
 205 
							con_attribute='mail',
212 
							reverse_attribute_check = True,
 206 
							reverse_attribute_check = True,
213 
							single_value=True,
214 
						),
 207 
						),
215 
					'street': univention.s4connector.attribute (
 208 
					'street': univention.s4connector.attribute (
216 
							ucs_attribute='street',
 209 
							ucs_attribute='street',
217 
							ldap_attribute='street',
 210 
							ldap_attribute='street',
218 
							con_attribute='streetAddress',
 211 
							con_attribute='streetAddress',
219 
							single_value=True,
220 
						),
 212 
						),
221 
					'city': univention.s4connector.attribute (
 213 
					'city': univention.s4connector.attribute (
222 
							ucs_attribute='city',
 214 
							ucs_attribute='city',
223 
							ldap_attribute='l',
 215 
							ldap_attribute='l',
224 
							con_attribute='l',
 216 
							con_attribute='l',
225 
							single_value=True,
226 
						),
 217 
						),
227 
					'postcode': univention.s4connector.attribute (
 218 
					'postcode': univention.s4connector.attribute (
228 
							ucs_attribute='postcode',
 219 
							ucs_attribute='postcode',
229 
							ldap_attribute='postalCode',
 220 
							ldap_attribute='postalCode',
230 
							con_attribute='postalCode',
 221 
							con_attribute='postalCode',
231 
							single_value=True,
232 
						),
 222 
						),
233 
					'sambaWorkstations': univention.s4connector.attribute (
 223 
					'sambaWorkstations': univention.s4connector.attribute (
234 
							ucs_attribute='sambaUserWorkstations',
 224 
							ucs_attribute='sambaUserWorkstations',
 Lines 244-262    Link Here 
244 
							ucs_attribute='profilepath',
 234 
							ucs_attribute='profilepath',
245 
							ldap_attribute='sambaProfilePath',
 235 
							ldap_attribute='sambaProfilePath',
246 
							con_attribute='profilePath',
 236 
							con_attribute='profilePath',
247 
							single_value=True,
248 
						),
 237 
						),
249 
					'scriptpath': univention.s4connector.attribute (
 238 
					'scriptpath': univention.s4connector.attribute (
250 
							ucs_attribute='scriptpath',
 239 
							ucs_attribute='scriptpath',
251 
							ldap_attribute='sambaLogonScript',
 240 
							ldap_attribute='sambaLogonScript',
252 
							con_attribute='scriptPath',
 241 
							con_attribute='scriptPath',
253 
							single_value=True,
254 
						),
 242 
						),
255 
					'homeDrive': univention.s4connector.attribute (
 243 
					'homeDrive': univention.s4connector.attribute (
256 
							ucs_attribute='homedrive',
 244 
							ucs_attribute='homedrive',
257 
							ldap_attribute='sambaHomeDrive',
 245 
							ldap_attribute='sambaHomeDrive',
258 
							con_attribute='homeDrive',
 246 
							con_attribute='homeDrive',
259 
							single_value=True,
260 
						),
 247 
						),
261 
					'homeDirectory': univention.s4connector.attribute (
 248 
					'homeDirectory': univention.s4connector.attribute (
262 
							ucs_attribute='sambahome',
 249 
							ucs_attribute='sambahome',
 Lines 263-269    Link Here 
263 
							ldap_attribute='sambaHomePath',
 250 
							ldap_attribute='sambaHomePath',
264 
							con_attribute='homeDirectory',
 251 
							con_attribute='homeDirectory',
265 
							reverse_attribute_check = True,
 252 
							reverse_attribute_check = True,
266 
							single_value=True,
267 
						),
 253 
						),
268 
					'telephoneNumber': univention.s4connector.attribute (
 254 
					'telephoneNumber': univention.s4connector.attribute (
269 
							ucs_attribute='phone',
 255 
							ucs_attribute='phone',
 Lines 357-369    Link Here 
357 
							con_attribute='sAMAccountName',
 343 
							con_attribute='sAMAccountName',
358 
							required=1,
 344 
							required=1,
359 
							compare_function=univention.s4connector.compare_lowercase,
 345 
							compare_function=univention.s4connector.compare_lowercase,
360 
							single_value=True,
361 
						),
 346 
						),
362 
					'description': univention.s4connector.attribute (
 347 
					'description': univention.s4connector.attribute (
363 
							ucs_attribute='description',
 348 
							ucs_attribute='description',
364 
							ldap_attribute='description',
 349 
							ldap_attribute='description',
365 
							con_attribute='description',
 350 
							con_attribute='description',
366 
							single_value=True,
367 
						),
 351 
						),
368 
@!@
 352 
@!@
369 
if configRegistry.is_true('connector/s4/mapping/group/grouptype', True):
 353 
if configRegistry.is_true('connector/s4/mapping/group/grouptype', True):
 Lines 371-377    Link Here 
371 
	print "							ucs_attribute='adGroupType',"
 355 
	print "							ucs_attribute='adGroupType',"
372 
	print "							ldap_attribute='univentionGroupType',"
 356 
	print "							ldap_attribute='univentionGroupType',"
373 
	print "							con_attribute='groupType',"
 357 
	print "							con_attribute='groupType',"
374 
	print "							single_value=True,"
375 
	print "					),"
 358 
	print "					),"
376 
@!@
 359 
@!@
377 
					'mailAddress': univention.s4connector.attribute (
 360 
					'mailAddress': univention.s4connector.attribute (
 Lines 379-385    Link Here 
379 
							ldap_attribute='mailPrimaryAddress',
 362 
							ldap_attribute='mailPrimaryAddress',
380 
							con_attribute='mail',
 363 
							con_attribute='mail',
381 
							reverse_attribute_check = True,
 364 
							reverse_attribute_check = True,
382 
							single_value=True,
383 
					),
 365 
					),
384 
					@!@
 366 
					@!@
385 
import univention.s4connector.s4.sid_mapping
 367 
import univention.s4connector.s4.sid_mapping
 Lines 471-501    Link Here 
471 
							con_attribute='cn',
 453 
							con_attribute='cn',
472 
							required=1,
 454 
							required=1,
473 
							compare_function=univention.s4connector.compare_lowercase,
 455 
							compare_function=univention.s4connector.compare_lowercase,
474 
							single_value=True,
475 
						),
 456 
						),
476 
					'samAccountName': univention.s4connector.attribute (
 457 
					'samAccountName': univention.s4connector.attribute (
477 
							ldap_attribute='uid',
 458 
							ldap_attribute='uid',
478 
							con_attribute='sAMAccountName',
 459 
							con_attribute='sAMAccountName',
479 
							compare_function=univention.s4connector.compare_lowercase,
 460 
							compare_function=univention.s4connector.compare_lowercase,
480 
							single_value=True,
481 
						),
 461 
						),
482 
					'description': univention.s4connector.attribute (
 462 
					'description': univention.s4connector.attribute (
483 
							ucs_attribute='description',
 463 
							ucs_attribute='description',
484 
							ldap_attribute='description',
 464 
							ldap_attribute='description',
485 
							con_attribute='description',
 465 
							con_attribute='description'
486 
							single_value=True,
487 
						),
 466 
						),
488 
					'operatingSystem': univention.s4connector.attribute (
 467 
					'operatingSystem': univention.s4connector.attribute (
489 
							ucs_attribute='operatingSystem',
 468 
							ucs_attribute='operatingSystem',
490 
							ldap_attribute='univentionOperatingSystem',
 469 
							ldap_attribute='univentionOperatingSystem',
491 
							con_attribute='operatingSystem',
 470 
							con_attribute='operatingSystem'
492 
							single_value=True,
493 
						),
 471 
						),
494 
					'operatingSystemVersion': univention.s4connector.attribute (
 472 
					'operatingSystemVersion': univention.s4connector.attribute (
495 
							ucs_attribute='operatingSystemVersion',
 473 
							ucs_attribute='operatingSystemVersion',
496 
							ldap_attribute='univentionOperatingSystemVersion',
 474 
							ldap_attribute='univentionOperatingSystemVersion',
497 
							con_attribute='operatingSystemVersion',
 475 
							con_attribute='operatingSystemVersion'
498 
							single_value=True,
499 
						),
 476 
						),
500 
					@!@
 477 
					@!@
501 
import univention.s4connector.s4.sid_mapping
 478 
import univention.s4connector.s4.sid_mapping
 Lines 565-595    Link Here 
565 
							con_attribute='cn',
 542 
							con_attribute='cn',
566 
							required=1,
 543 
							required=1,
567 
							compare_function=univention.s4connector.compare_lowercase,
 544 
							compare_function=univention.s4connector.compare_lowercase,
568 
							single_value=True,
569 
						),
 545 
						),
570 
					'samAccountName': univention.s4connector.attribute (
 546 
					'samAccountName': univention.s4connector.attribute (
571 
							ldap_attribute='uid',
 547 
							ldap_attribute='uid',
572 
							con_attribute='sAMAccountName',
 548 
							con_attribute='sAMAccountName',
573 
							compare_function=univention.s4connector.compare_lowercase,
 549 
							compare_function=univention.s4connector.compare_lowercase,
574 
							single_value=True,
575 
						),
 550 
						),
576 
					'description': univention.s4connector.attribute (
 551 
					'description': univention.s4connector.attribute (
577 
							ucs_attribute='description',
 552 
							ucs_attribute='description',
578 
							ldap_attribute='description',
 553 
							ldap_attribute='description',
579 
							con_attribute='description',
 554 
							con_attribute='description'
580 
							single_value=True,
581 
						),
 555 
						),
582 
					'operatingSystem': univention.s4connector.attribute (
 556 
					'operatingSystem': univention.s4connector.attribute (
583 
							ucs_attribute='operatingSystem',
 557 
							ucs_attribute='operatingSystem',
584 
							ldap_attribute='univentionOperatingSystem',
 558 
							ldap_attribute='univentionOperatingSystem',
585 
							con_attribute='operatingSystem',
 559 
							con_attribute='operatingSystem'
586 
							single_value=True,
587 
						),
 560 
						),
588 
					'operatingSystemVersion': univention.s4connector.attribute (
 561 
					'operatingSystemVersion': univention.s4connector.attribute (
589 
							ucs_attribute='operatingSystemVersion',
 562 
							ucs_attribute='operatingSystemVersion',
590 
							ldap_attribute='univentionOperatingSystemVersion',
 563 
							ldap_attribute='univentionOperatingSystemVersion',
591 
							con_attribute='operatingSystemVersion',
 564 
							con_attribute='operatingSystemVersion'
592 
							single_value=True,
593 
						),
 565 
						),
594 
					@!@
 566 
					@!@
595 
import univention.s4connector.s4.sid_mapping
 567 
import univention.s4connector.s4.sid_mapping
 Lines 666-684    Link Here 
666 
							con_attribute='cn',
 638 
							con_attribute='cn',
667 
							required=1,
 639 
							required=1,
668 
							compare_function=univention.s4connector.compare_lowercase,
 640 
							compare_function=univention.s4connector.compare_lowercase,
669 
							single_value=True,
670 
						),
 641 
						),
671 
					'description': univention.s4connector.attribute (
 642 
					'description': univention.s4connector.attribute (
672 
							ucs_attribute='description',
 643 
							ucs_attribute='description',
673 
							ldap_attribute='description',
 644 
							ldap_attribute='description',
674 
							con_attribute='description',
 645 
							con_attribute='description'
675 
							single_value=True,
676 
						),
 646 
						),
677 
					'displayName': univention.s4connector.attribute (
 647 
					'displayName': univention.s4connector.attribute (
678 
							ucs_attribute='displayName',
 648 
							ucs_attribute='displayName',
679 
							ldap_attribute='displayName',
 649 
							ldap_attribute='displayName',
680 
							con_attribute='displayName',
 650 
							con_attribute='displayName'
681 
							single_value=True,
682 
						),
 651 
						),
683 
					'msGPOFlags': univention.s4connector.attribute (
 652 
					'msGPOFlags': univention.s4connector.attribute (
684 
							ucs_attribute='msGPOFlags',
 653 
							ucs_attribute='msGPOFlags',
 Lines 756-762    Link Here 
756 
							ldap_attribute='msWMIID',
 725 
							ldap_attribute='msWMIID',
757 
							con_attribute='msWMI-ID',
 726 
							con_attribute='msWMI-ID',
758 
							required=1,
 727 
							required=1,
759 
							single_value=True,
760 
						),
 728 
						),
761 
					'name': univention.s4connector.attribute (
 729 
					'name': univention.s4connector.attribute (
762 
							ucs_attribute='name',
 730 
							ucs_attribute='name',
 Lines 763-781    Link Here 
763 
							ldap_attribute='msWMIName',
 731 
							ldap_attribute='msWMIName',
764 
							con_attribute='msWMI-Name',
 732 
							con_attribute='msWMI-Name',
765 
							required=1,
 733 
							required=1,
766 
							single_value=True,
767 
						),
 734 
						),
768 
					'description': univention.s4connector.attribute (
 735 
					'description': univention.s4connector.attribute (
769 
							ucs_attribute='description',
 736 
							ucs_attribute='description',
770 
							ldap_attribute='description',
 737 
							ldap_attribute='description',
771 
							con_attribute='description',
 738 
							con_attribute='description'
772 
							single_value=True,
773 
						),
 739 
						),
774 
					'displayName': univention.s4connector.attribute (
 740 
					'displayName': univention.s4connector.attribute (
775 
							ucs_attribute='displayName',
 741 
							ucs_attribute='displayName',
776 
							ldap_attribute='displayName',
 742 
							ldap_attribute='displayName',
777 
							con_attribute='displayName',
 743 
							con_attribute='displayName'
778 
							single_value=True,
779 
						),
 744 
						),
780 
					'author': univention.s4connector.attribute (
 745 
					'author': univention.s4connector.attribute (
781 
							ucs_attribute='author',
 746 
							ucs_attribute='author',
 Lines 876-888    Link Here 
876 
							con_attribute='cn',
 841 
							con_attribute='cn',
877 
							required=1,
 842 
							required=1,
878 
							compare_function=univention.s4connector.compare_lowercase,
 843 
							compare_function=univention.s4connector.compare_lowercase,
879 
							single_value=True,
880 
						),
 844 
						),
881 
					'description': univention.s4connector.attribute (
 845 
					'description': univention.s4connector.attribute (
882 
							ucs_attribute='description',
 846 
							ucs_attribute='description',
883 
							ldap_attribute='description',
 847 
							ldap_attribute='description',
884 
							con_attribute='description',
 848 
							con_attribute='description'
885 
							single_value=True,
886 
						),
 849 
						),
887 
@!@
 850 
@!@
888 
if configRegistry.is_true('connector/s4/mapping/gpo', True):
 851 
if configRegistry.is_true('connector/s4/mapping/gpo', True):
 Lines 890-897    Link Here 
890 
					'gPLink': univention.s4connector.attribute (
 853 
					'gPLink': univention.s4connector.attribute (
891 
							ucs_attribute='gPLink',
 854 
							ucs_attribute='gPLink',
892 
							ldap_attribute='msGPOLink',
 855 
							ldap_attribute='msGPOLink',
893 
							con_attribute='gPLink',
 856 
							con_attribute='gPLink'
894 
							single_value=True,
895 
						),
 857 
						),
896 
	'''
 858 
	'''
897 
@!@
 859 
@!@
 Lines 933-945    Link Here 
933 
							con_attribute='ou',
 895 
							con_attribute='ou',
934 
							required=1,
 896 
							required=1,
935 
							compare_function=univention.s4connector.compare_lowercase,
 897 
							compare_function=univention.s4connector.compare_lowercase,
936 
							single_value=True,
937 
						),
 898 
						),
938 
					'description': univention.s4connector.attribute (
 899 
					'description': univention.s4connector.attribute (
939 
							ucs_attribute='description',
 900 
							ucs_attribute='description',
940 
							ldap_attribute='description',
 901 
							ldap_attribute='description',
941 
							con_attribute='description',
 902 
							con_attribute='description'
942 
							single_value=True,
943 
						),
 903 
						),
944 
@!@
 904 
@!@
945 
if configRegistry.is_true('connector/s4/mapping/gpo', True):
 905 
if configRegistry.is_true('connector/s4/mapping/gpo', True):
 Lines 947-954    Link Here 
947 
					'gPLink': univention.s4connector.attribute (
 907 
					'gPLink': univention.s4connector.attribute (
948 
							ucs_attribute='gPLink',
 908 
							ucs_attribute='gPLink',
949 
							ldap_attribute='msGPOLink',
 909 
							ldap_attribute='msGPOLink',
950 
							con_attribute='gPLink',
 910 
							con_attribute='gPLink'
951 
							single_value=True,
952 
						),
 911 
						),
953 
	'''
 912 
	'''
954 
@!@
 913 
@!@

Return to bug 33621