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

(-)conffiles/etc/univention/s4connector/s4/mapping.py (-20 / +42 lines)
 Lines 193-198    Link Here 
193
							ucs_attribute='organisation',
193
							ucs_attribute='organisation',
194
							ldap_attribute='o',
194
							ldap_attribute='o',
195
							con_attribute='company',
195
							con_attribute='company',
196
							single_value=True,
196
						),
197
						),
197
					'organisation': univention.s4connector.attribute (
198
					'organisation': univention.s4connector.attribute (
198
							ucs_attribute='organisation',
199
							ucs_attribute='organisation',
 Lines 235-240    Link Here 
235
							ucs_attribute='sambaUserWorkstations',
236
							ucs_attribute='sambaUserWorkstations',
236
							ldap_attribute='sambaUserWorkstations',
237
							ldap_attribute='sambaUserWorkstations',
237
							con_attribute='userWorkstations',
238
							con_attribute='userWorkstations',
239
							single_value=True,
238
						),
240
						),
239
					#'sambaLogonHours': univention.s4connector.attribute (
241
					#'sambaLogonHours': univention.s4connector.attribute (
240
					#		ucs_attribute='sambaLogonHours',
242
					#		ucs_attribute='sambaLogonHours',
 Lines 684-725    Link Here 
684
					'msGPOFlags': univention.s4connector.attribute (
686
					'msGPOFlags': univention.s4connector.attribute (
685
							ucs_attribute='msGPOFlags',
687
							ucs_attribute='msGPOFlags',
686
							ldap_attribute='msGPOFlags',
688
							ldap_attribute='msGPOFlags',
687
							con_attribute='flags'
689
							con_attribute='flags',
690
							single_value=True,
688
						),
691
						),
689
					'msGPOVersionNumber': univention.s4connector.attribute (
692
					'msGPOVersionNumber': univention.s4connector.attribute (
690
							ucs_attribute='msGPOVersionNumber',
693
							ucs_attribute='msGPOVersionNumber',
691
							ldap_attribute='msGPOVersionNumber',
694
							ldap_attribute='msGPOVersionNumber',
692
							con_attribute='versionNumber'
695
							con_attribute='versionNumber',
696
							single_value=True,
693
						),
697
						),
694
					'msGPOSystemFlags': univention.s4connector.attribute (
698
					'msGPOSystemFlags': univention.s4connector.attribute (
695
							ucs_attribute='msGPOSystemFlags',
699
							ucs_attribute='msGPOSystemFlags',
696
							ldap_attribute='msGPOSystemFlags',
700
							ldap_attribute='msGPOSystemFlags',
697
							con_attribute='systemFlags'
701
							con_attribute='systemFlags',
702
							single_value=True,
698
						),
703
						),
699
					'msGPOFunctionalityVersion': univention.s4connector.attribute (
704
					'msGPOFunctionalityVersion': univention.s4connector.attribute (
700
							ucs_attribute='msGPOFunctionalityVersion',
705
							ucs_attribute='msGPOFunctionalityVersion',
701
							ldap_attribute='msGPOFunctionalityVersion',
706
							ldap_attribute='msGPOFunctionalityVersion',
702
							con_attribute='gPCFunctionalityVersion'
707
							con_attribute='gPCFunctionalityVersion',
708
							single_value=True,
703
						),
709
						),
704
					'msGPOFileSysPath': univention.s4connector.attribute (
710
					'msGPOFileSysPath': univention.s4connector.attribute (
705
							ucs_attribute='msGPOFileSysPath',
711
							ucs_attribute='msGPOFileSysPath',
706
							ldap_attribute='msGPOFileSysPath',
712
							ldap_attribute='msGPOFileSysPath',
707
							con_attribute='gPCFileSysPath'
713
							con_attribute='gPCFileSysPath',
714
							single_value=True,
708
						),
715
						),
709
					'msGPOMachineExtensionNames': univention.s4connector.attribute (
716
					'msGPOMachineExtensionNames': univention.s4connector.attribute (
710
							ucs_attribute='msGPOMachineExtensionNames',
717
							ucs_attribute='msGPOMachineExtensionNames',
711
							ldap_attribute='msGPOMachineExtensionNames',
718
							ldap_attribute='msGPOMachineExtensionNames',
712
							con_attribute='gPCMachineExtensionNames'
719
							con_attribute='gPCMachineExtensionNames',
720
							single_value=True,
713
						),
721
						),
714
					'msGPOUserExtensionNames': univention.s4connector.attribute (
722
					'msGPOUserExtensionNames': univention.s4connector.attribute (
715
							ucs_attribute='msGPOUserExtensionNames',
723
							ucs_attribute='msGPOUserExtensionNames',
716
							ldap_attribute='msGPOUserExtensionNames',
724
							ldap_attribute='msGPOUserExtensionNames',
717
							con_attribute='gPCUserExtensionNames'
725
							con_attribute='gPCUserExtensionNames',
726
							single_value=True,
718
						),
727
						),
719
					'msGPOWQLFilter': univention.s4connector.attribute (
728
					'msGPOWQLFilter': univention.s4connector.attribute (
720
							ucs_attribute='msGPOWQLFilter',
729
							ucs_attribute='msGPOWQLFilter',
721
							ldap_attribute='msGPOWQLFilter',
730
							ldap_attribute='msGPOWQLFilter',
722
							con_attribute='gPCWQLFilter'
731
							con_attribute='gPCWQLFilter',
732
							single_value=True,
723
						),
733
						),
724
				},
734
				},
725
''' % {'ignore_filter': ignore_filter, 'sync_mode_ou': sync_mode_ou}
735
''' % {'ignore_filter': ignore_filter, 'sync_mode_ou': sync_mode_ou}
 Lines 800-861    Link Here 
800
					'author': univention.s4connector.attribute (
810
					'author': univention.s4connector.attribute (
801
							ucs_attribute='author',
811
							ucs_attribute='author',
802
							ldap_attribute='msWMIAuthor',
812
							ldap_attribute='msWMIAuthor',
803
							con_attribute='msWMI-Author'
813
							con_attribute='msWMI-Author',
814
							single_value=True,
804
						),
815
						),
805
					'creationDate': univention.s4connector.attribute (
816
					'creationDate': univention.s4connector.attribute (
806
							ucs_attribute='creationDate',
817
							ucs_attribute='creationDate',
807
							ldap_attribute='msWMICreationDate',
818
							ldap_attribute='msWMICreationDate',
808
							con_attribute='msWMI-CreationDate'
819
							con_attribute='msWMI-CreationDate',
820
							single_value=True,
809
						),
821
						),
810
					'changeDate': univention.s4connector.attribute (
822
					'changeDate': univention.s4connector.attribute (
811
							ucs_attribute='changeDate',
823
							ucs_attribute='changeDate',
812
							ldap_attribute='msWMIChangeDate',
824
							ldap_attribute='msWMIChangeDate',
813
							con_attribute='msWMI-ChangeDate'
825
							con_attribute='msWMI-ChangeDate',
826
							single_value=True,
814
						),
827
						),
815
					'parm1': univention.s4connector.attribute (
828
					'parm1': univention.s4connector.attribute (
816
							ucs_attribute='parm1',
829
							ucs_attribute='parm1',
817
							ldap_attribute='msWMIParm1',
830
							ldap_attribute='msWMIParm1',
818
							con_attribute='msWMI-Parm1'
831
							con_attribute='msWMI-Parm1',
832
							single_value=True,
819
						),
833
						),
820
					'parm2': univention.s4connector.attribute (
834
					'parm2': univention.s4connector.attribute (
821
							ucs_attribute='parm2',
835
							ucs_attribute='parm2',
822
							ldap_attribute='msWMIParm2',
836
							ldap_attribute='msWMIParm2',
823
							con_attribute='msWMI-Parm2'
837
							con_attribute='msWMI-Parm2',
838
							single_value=True,
824
						),
839
						),
825
					'parm3': univention.s4connector.attribute (
840
					'parm3': univention.s4connector.attribute (
826
							ucs_attribute='parm3',
841
							ucs_attribute='parm3',
827
							ldap_attribute='msWMIParm3',
842
							ldap_attribute='msWMIParm3',
828
							con_attribute='msWMI-Parm3'
843
							con_attribute='msWMI-Parm3',
844
							single_value=True,
829
						),
845
						),
830
					'parm4': univention.s4connector.attribute (
846
					'parm4': univention.s4connector.attribute (
831
							ucs_attribute='parm4',
847
							ucs_attribute='parm4',
832
							ldap_attribute='msWMIParm4',
848
							ldap_attribute='msWMIParm4',
833
							con_attribute='msWMI-Parm4'
849
							con_attribute='msWMI-Parm4',
850
							single_value=True,
834
						),
851
						),
835
					'flags1': univention.s4connector.attribute (
852
					'flags1': univention.s4connector.attribute (
836
							ucs_attribute='flags1',
853
							ucs_attribute='flags1',
837
							ldap_attribute='msWMIFlags1',
854
							ldap_attribute='msWMIFlags1',
838
							con_attribute='msWMI-Flags1'
855
							con_attribute='msWMI-Flags1',
856
							single_value=True,
839
						),
857
						),
840
					'flags2': univention.s4connector.attribute (
858
					'flags2': univention.s4connector.attribute (
841
							ucs_attribute='flags2',
859
							ucs_attribute='flags2',
842
							ldap_attribute='msWMIFlags2',
860
							ldap_attribute='msWMIFlags2',
843
							con_attribute='msWMI-Flags2'
861
							con_attribute='msWMI-Flags2',
862
							single_value=True,
844
						),
863
						),
845
					'flags3': univention.s4connector.attribute (
864
					'flags3': univention.s4connector.attribute (
846
							ucs_attribute='flags3',
865
							ucs_attribute='flags3',
847
							ldap_attribute='msWMIFlags3',
866
							ldap_attribute='msWMIFlags3',
848
							con_attribute='msWMI-Flags3'
867
							con_attribute='msWMI-Flags3',
868
							single_value=True,
849
						),
869
						),
850
					'flags4': univention.s4connector.attribute (
870
					'flags4': univention.s4connector.attribute (
851
							ucs_attribute='flags4',
871
							ucs_attribute='flags4',
852
							ldap_attribute='msWMIFlags4',
872
							ldap_attribute='msWMIFlags4',
853
							con_attribute='msWMI-Flags4'
873
							con_attribute='msWMI-Flags4',
874
							single_value=True,
854
						),
875
						),
855
					'sourceOrganization': univention.s4connector.attribute (
876
					'sourceOrganization': univention.s4connector.attribute (
856
							ucs_attribute='sourceOrganization',
877
							ucs_attribute='sourceOrganization',
857
							ldap_attribute='msWMISourceOrganization',
878
							ldap_attribute='msWMISourceOrganization',
858
							con_attribute='msWMI-SourceOrganization'
879
							con_attribute='msWMI-SourceOrganization',
880
							single_value=True,
859
						),
881
						),
860
				},
882
				},
861
883

Return to bug 37259