← Back to branch summary

~ubuntu-branches/ubuntu/precise/krb5/precise-updates

« back to all changes in this revision

Viewing changes to src/windows/installer/wix/features.wxi

  • Committer: Package Import Robot
  • Author(s): Sam Hartman
  • Date: 2011-12-01 19:34:41 UTC
  • mfrom: (28.1.14 sid)
  • Revision ID: package-import@ubuntu.com-20111201193441-9tipg3aru1jsidyv
Tags: 1.10+dfsg~alpha1-6
http://bugs.debian.org/650671
http://bugs.debian.org/650603
http://bugs.debian.org/650611
* Fix segfault with unknown hostnames in krb5_sname_to_principal,
  Closes: #650671
* Indicate that this library breaks libsmbclient versions that depend on
  krb5_locate_kdc, Closes: #650603, #650611

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/windows/installer/wix/features.wxi
57
57
            <?endif?>
58
58
 
59
59
            <ComponentRef Id="cmf_comerr32_dll" />
60
 
            <ComponentRef Id="cmf_gss_exe" />
61
60
            <ComponentRef Id="cmf_gss_client_exe" />
62
61
            <ComponentRef Id="cmf_gss_server_exe" />
63
62
            <ComponentRef Id="cmf_gssapi32_dll" />
67
66
            <ComponentRef Id="cmf_kinit_exe" />
68
67
            <ComponentRef Id="cmf_klist_exe" />
69
68
            <ComponentRef Id="cmf_kpasswd_exe" />
 
69
            <ComponentRef Id="cmf_kswitch_exe" />
70
70
            <ComponentRef Id="cmf_kvno_exe" />
71
71
            <ComponentRef Id="cmf_krb5_32_dll" />
72
72
            <ComponentRef Id="cmf_k5sprt32_dll" />
73
73
            <ComponentRef Id="cmf_krbcc32_dll" />
74
 
            <ComponentRef Id="cmf_krbcc32s_exe" />
 
74
            <ComponentRef Id="cmf_ccapiserver_exe" />
75
75
            <ComponentRef Id="cmf_ms2mit_exe" />
76
76
            <ComponentRef Id="cmf_mit2ms_exe" />
77
77
            <ComponentRef Id="cmf_wshelp32_dll" />
78
 
            <ComponentRef Id="cmf_xpprof32_dll" />
 
78
<!--            <ComponentRef Id="cmf_xpprof32_dll" /> -->
79
79
 
80
80
            <ComponentRef Id="cmf_leashw32_dll" />
81
81
 
82
82
        <?if $(var.Platform) = "Intel" ?>
83
 
            <ComponentRef Id="cmf_leash32_exe" />
84
 
            <ComponentRef Id="csc_leash32_exe" />
85
 
 
86
 
            <ComponentRef Id="cmf_k524init_exe" />
87
 
            <ComponentRef Id="cmf_kclnt32_dll" />
88
 
            <ComponentRef Id="cmf_krb524_dll" />
89
 
            <ComponentRef Id="cmf_krbv4w32_dll" />
90
 
        <?endif?>
91
 
            
92
 
            <ComponentRef Id="cmf_nidmgr32_dll" />
93
 
        <?if $(var.Platform) = "Intel" ?>
94
 
            <ComponentRef Id="cmf_nidmgr32_dll_w2k" />
95
 
        <?endif?>
96
 
            <ComponentRef Id="cmf_krb5cred_dll" />
97
 
            <ComponentRef Id="cmf_krb5cred_en_us_dll" />
98
 
        <?if $(var.Platform) = "Intel" ?>
99
 
            <ComponentRef Id="cmf_krb4cred_dll" />
100
 
            <ComponentRef Id="cmf_krb4cred_en_us_dll" />
101
 
        <?endif?>
102
 
            <ComponentRef Id="cmf_netidmgr_exe" />
103
 
        <?if $(var.Platform) = "Intel" ?>
104
 
            <ComponentRef Id="cmf_netidmgr_exe_w2k" />
 
83
<!--            <ComponentRef Id="cmf_leash32_exe" /> -->
 
84
<!--            <ComponentRef Id="csc_leash32_exe" /> -->
105
85
        <?endif?>
106
86
            <ComponentRef Id="cmf_kfwlogon_DLL" />
107
87
            <ComponentRef Id="cmf_kfwcpcc_EXE" />
108
88
 
109
 
        <?if $(var.Platform) = "Intel" ?>
110
 
            <!-- Kerberos IV options -->
111
 
            <ComponentRef Id="rcm_krb4_1" />
112
 
            <ComponentRef Id="rcm_krb4_2" />
113
 
            <ComponentRef Id="rcm_krb4_3" />
114
 
            <ComponentRef Id="rcm_krb4_4" />
115
 
        <?endif?>
116
 
            
117
89
            <!-- Kerberos V options -->
118
90
            <ComponentRef Id="rcm_krb5_1" />
119
91
            <ComponentRef Id="rcm_krb5_2" />
127
99
            <ComponentRef Id="rcm_leash_5" />
128
100
            <ComponentRef Id="rcm_leash_6" />
129
101
            
130
 
        <?ifdef OldHelp?>
 
102
<!--        <?ifdef OldHelp?>
131
103
            <ComponentRef Id="cmf_leash32_hlp" />
132
104
        <?else?>
133
105
            <ComponentRef Id="cmf_leash32_chm" />
134
 
        <?endif?>
 
106
        <?endif?> -->
135
107
        <?endif?>
136
108
            
137
109
            <!-- Leash dll options -->
163
135
            
164
136
            <Feature Id="feaKfwLeashStartup" AllowAdvertise="no" Display="hidden" Level="130">
165
137
                <Condition Level="30">LEASHAUTOSTART = 1</Condition>
166
 
                <ComponentRef Id="csc_NetIDMgrStartup" />
167
138
                <?if $(var.Platform) = "Intel"?>
168
 
                        <ComponentRef Id="csc_LeashStartup" />
 
139
<!--                        <ComponentRef Id="csc_LeashStartup" /> -->
169
140
                <?endif?>
170
141
            </Feature>
171
 
 
 
142
            <ComponentRef Id="cmf_remove_folder" />
172
143
            <?include runtime.wxi?>
173
144
        </Feature> <!-- /feaKfwClient -->
174
145
        
180
151
            Level="130" 
181
152
            Title="$(loc.KerberosSDKTitle)">
182
153
            
183
 
            <ComponentRef Id="cmp_dirdoc_netid" />
184
154
        <?if $(var.Platform) = "Intel" ?>
185
 
            <ComponentRef Id="cmp_dirinc_kclient" />
186
 
            <ComponentRef Id="cmp_dirinc_krb4" />
187
155
            <ComponentRef Id="cmp_dirlib_i386" />
188
156
        <?else?>
189
157
            <ComponentRef Id="cmp_dirlib_amd64" />
190
158
        <?endif?>
191
159
            <ComponentRef Id="cmp_dirinc_krb5_gssapi" />
192
 
            <ComponentRef Id="cmp_dirinc_krb5_KerberosIV" />
193
160
            <ComponentRef Id="cmp_dirinc_krb5_krb5" />
194
161
            <ComponentRef Id="cmp_dirinc_krb5" />
195
 
            <ComponentRef Id="cmp_dirinc_krbcc" />
 
162
<!--            <ComponentRef Id="cmp_dirinc_krbcc" /> -->
196
163
            <ComponentRef Id="cmp_dirinc_leash" />
197
164
            <ComponentRef Id="cmp_dirinc_loadfuncs" />
198
165
            <ComponentRef Id="cmp_dirinc_wshelper" />
199
166
            <ComponentRef Id="cmp_dirinc_wshelper_arpa" />
200
 
            <ComponentRef Id="cmp_dirinc_netidmgr" />
201
 
            <ComponentRef Id="cmp_dirinstall_nsis" />
202
167
            <ComponentRef Id="cmp_dirinstall_wix" />
203
168
            <ComponentRef Id="cmp_dirinstall_wix_lang" />
204
169
            <ComponentRef Id="cmp_dirinstall_wix_Binary" />
205
170
            <ComponentRef Id="cmp_dirinstall_wix_custom" />
206
 
            <ComponentRef Id="cmp_credprov_files" />
207
 
            <ComponentRef Id="cmp_credprov_images_files" />
208
 
            <ComponentRef Id="cmp_credprov_en_us_files" />
209
171
            <ComponentRef Id="rcm_common" />
210
172
            <ComponentRef Id="rcm_sdk" />
211
173
        </Feature> <!-- /feaKfwSDK -->
218
180
            Level="30" 
219
181
            Title="$(loc.KerberosDocTitle)">
220
182
 
221
 
            <?if $(var.Platform) = "Intel"?>
 
183
<!--            <?if $(var.Platform) = "Intel"?>
222
184
                    <ComponentRef Id="efl_leash_userdoc_pdf" />
223
 
            <?endif?>
224
 
            <ComponentRef Id="efl_netidmgr_userdoc_pdf" />
225
 
            <ComponentRef Id="efl_relnotes_html" />
 
185
            <?endif?> -->
226
186
            
227
187
            <ComponentRef Id="rcm_common" />
228
188
            <ComponentRef Id="rcm_docs" />