sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r6838: Remove unnecessary calls to gensec_gsskrb5

Browse Source 
Make the build system give a proper warning about this in the future
This commit is contained in:
Jelmer Vernooij 2005-05-17 00:02:55 +00:00 committed by Gerald (Jerry) Carter
parent 421e7feee9
commit 2d980465af
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/auth/gensec/config.m4
View File

@ -1,12 +1,8 @@
SMB_MODULE_DEFAULT(gensec_krb5, NOT) SMB_MODULE_DEFAULT(gensec_krb5, NOT)
SMB_MODULE_DEFAULT(gensec_gssapi, NOT) SMB_MODULE_DEFAULT(gensec_gssapi, NOT)
SMB_MODULE_DEFAULT(gensec_gsskrb5, NOT)
if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then
# krb5 is now disabled at runtime, not build time # krb5 is now disabled at runtime, not build time
SMB_MODULE_DEFAULT(gensec_krb5, STATIC) SMB_MODULE_DEFAULT(gensec_krb5, STATIC)
SMB_MODULE_DEFAULT(gensec_gssapi, STATIC) SMB_MODULE_DEFAULT(gensec_gssapi, STATIC)
if test x"$samba_cv_GSS_C_DCE_STYLE" = x"yes"; then
SMB_MODULE_DEFAULT(gensec_gsskrb5, STATIC)
fi
fi fi

9
source/build/smb_build/input.pm
View File

@ -54,8 +54,10 @@ sub check_subsystem($$)
return; return;
} }
unless(defined($subsys->{OUTPUT_TYPE})) {
$subsys->{OUTPUT_TYPE} = $subsystem_output_type; $subsys->{OUTPUT_TYPE} = $subsystem_output_type;
} }
}
sub check_module($$) sub check_module($$)
{ {
@ -173,7 +175,12 @@ sub check($)
($part->{ENABLE} = "YES") if not defined($part->{ENABLE}); ($part->{ENABLE} = "YES") if not defined($part->{ENABLE});
} }
foreach my $part (values %{$CTX->{INPUT}}) { foreach my $k (keys %{$CTX->{INPUT}}) {
my $part = $CTX->{INPUT}->{$k};
if (not defined($part->{TYPE})) {
print STDERR "$k does not have a type set.. Perhaps it's only mentioned in a .m4 but not in a .mk file?\n";
next;
}
check_subsystem($CTX, $part) if ($part->{TYPE} eq "SUBSYSTEM"); check_subsystem($CTX, $part) if ($part->{TYPE} eq "SUBSYSTEM");
check_module($CTX, $part) if ($part->{TYPE} eq "MODULE"); check_module($CTX, $part) if ($part->{TYPE} eq "MODULE");
check_library($CTX, $part) if ($part->{TYPE} eq "LIBRARY"); check_library($CTX, $part) if ($part->{TYPE} eq "LIBRARY");