summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 19:37:03 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-16 19:37:03 +0100
commit3e6cb51e2028481f1c0dc245c531e4a8b7a644f4 (patch)
treee86acd1bde6aab22185b4dd5180c7cd035dc5f9a
parent0b8fe26451eb9253d6cdc5c7b138d31d61c4841d (diff)
downloadsamba-3e6cb51e2028481f1c0dc245c531e4a8b7a644f4.tar.gz
samba-3e6cb51e2028481f1c0dc245c531e4a8b7a644f4.tar.bz2
samba-3e6cb51e2028481f1c0dc245c531e4a8b7a644f4.zip
Properly escape quotes in init functions.
(This used to be commit 0efa80f30b4f3287a204af450a43dcdfa9baad8a)
-rw-r--r--source4/build/smb_build/makefile.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index d782ec6300..d8780573b6 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -116,7 +116,11 @@ sub Integrated($$)
$self->_prepare_list($ctx, "OBJ_LIST");
$self->output("$ctx->{SUBSYSTEM}_OBJ_LIST += \$($ctx->{NAME}_OBJ_LIST)\n");
- $self->output("$ctx->{SUBSYSTEM}_INIT_FUNCTIONS += \"$ctx->{INIT_FUNCTION},\"\n") if defined($ctx->{INIT_FUNCTION});
+ if(defined($ctx->{INIT_FUNCTION})) {
+ my $init_fn = $ctx->{INIT_FUNCTION};
+ $init_fn =~ s/"/\\\"/g;
+ $self->output("$ctx->{SUBSYSTEM}_INIT_FUNCTIONS += \"$init_fn,\"\n");
+ }
}
sub SharedModulePrimitives($$)