lib/param: generate the param_functions.h containing the prototypes

Pair-programmed-with: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/param/param.h b/lib/param/param.h
index 77c3c770044148e619f4edcd3385c7215dadf073..428a2a31c29fd7721647401e306eb53ccf77586a 100644 (file)
--- a/lib/param/param.h
+++ b/lib/param/param.h
@@ -49,6 +49,7 @@ struct gensec_settings;
 
 #ifdef CONFIG_H_IS_FROM_SAMBA
 #include "lib/param/param_proto.h"
 
 #ifdef CONFIG_H_IS_FROM_SAMBA
 #include "lib/param/param_proto.h"

+#include "lib/param/param_functions.h"

 #endif
 
 const char **lpcfg_interfaces(struct loadparm_context *);
 #endif
 
 const char **lpcfg_interfaces(struct loadparm_context *);


@@ -61,7 +62,7 @@ int lpcfg_allow_dns_updates(struct loadparm_context *);
 void reload_charcnv(struct loadparm_context *lp_ctx);
 
 struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx);
 void reload_charcnv(struct loadparm_context *lp_ctx);
 
 struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx);

-
+bool lpcfg_autoloaded(struct loadparm_service *, struct loadparm_service *);

 
 char *lpcfg_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 
 char *lpcfg_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);


@@ -69,6 +70,8 @@ char *lpcfg_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 char *lpcfg_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 
 char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 char *lpcfg_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 

+const char *lpcfg_dnsdomain(struct loadparm_context *);
+

 const char *lpcfg_servicename(const struct loadparm_service *service);
 
 
 const char *lpcfg_servicename(const struct loadparm_service *service);
 
 

diff --git a/lib/param/wscript_build b/lib/param/wscript_build
index 1b26c5b141f6db9904b2783b9ebf6c282795cd78..2a32133bc1d34a44c56321ba06c06cdbc234412f 100644 (file)
--- a/lib/param/wscript_build
+++ b/lib/param/wscript_build
@@ -6,6 +6,12 @@ bld.SAMBA_GENERATOR('param_functions.c',
                     group='build_source',
                     rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=FUNCTIONS')
 
                     group='build_source',
                     rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=FUNCTIONS')
 

+bld.SAMBA_GENERATOR('param_functions.h',
+                    source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',
+                    target='param_functions.h',
+                    group='build_source',
+                    rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=LIBPROTO')
+

 bld.SAMBA_GENERATOR('param_local_h',
                     source= '../../script/mkparamdefs.pl loadparm.c param_functions.c ',
                     target='param_local.h',
 bld.SAMBA_GENERATOR('param_local_h',
                     source= '../../script/mkparamdefs.pl loadparm.c param_functions.c ',
                     target='param_local.h',


@@ -38,8 +44,7 @@ bld.SAMBA_LIBRARY('samba-hostconfig',
        deps='DYNCONFIG server-role',
        public_deps='samba-util param_local_h',
        public_headers='param.h',
        deps='DYNCONFIG server-role',
        public_deps='samba-util param_local_h',
        public_headers='param.h',

-       autoproto='param_proto.h',
-       autoproto_extra_source='param_functions.c'
+       autoproto='param_proto.h'

        )
 
 
        )
 
 

diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl
index 348f150e6dadfb80ea6fb3de2a1492a058614c59..2c3ebac0f99275a9e3b78e374e57d56f85a2c717 100755 (executable)
--- a/source4/script/mkproto.pl
+++ b/source4/script/mkproto.pl
@@ -124,45 +124,6 @@ sub print_footer($$)
        $file->("\n#endif /* $header_name */\n\n");
 }
 
        $file->("\n#endif /* $header_name */\n\n");
 }
 

-sub handle_loadparm($$) 
-{
-       my ($file,$line) = @_;
-       my $scope;
-       my $type;
-       my $name;
-       my $var;
-
-       if ($line =~ /^FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),(.*)\)/o) {
-               $scope = $1;
-               $type = $2;
-               $name = $3;
-               $var = $4;
-       } elsif ($line =~ /^FN_(GLOBAL|LOCAL)_PARM_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),(.*)\)/o) {
-               $scope = $1;
-               $type = $2;
-               $name = $3;
-               $var = $4;
-       } else {
-               return;
-       }
-
-       my %tmap = (
-               "BOOL" => "bool ",
-               "CONST_STRING" => "const char *",
-               "STRING" => "const char *",
-               "INTEGER" => "int ",
-               "CHAR" => "char ",
-               "LIST" => "const char **",
-       );
-
-       my %smap = (
-               "GLOBAL" => "struct loadparm_context *",
-               "LOCAL" => "struct loadparm_service *, struct loadparm_service *"
-               );
-
-       $file->("$tmap{$type}lpcfg_$name($smap{$scope});\n");
-}
-

 sub process_file($$$) 
 {
        my ($public_file, $private_file, $filename) = @_;
 sub process_file($$$) 
 {
        my ($public_file, $private_file, $filename) = @_;


@@ -203,8 +164,6 @@ sub process_file($$$)
                next if ($line =~ /^\/|[;]/);
 
                if ($line =~ /^FN_/) {
                next if ($line =~ /^\/|[;]/);
 
                if ($line =~ /^FN_/) {

-                       handle_loadparm($public_file, $line);
-                       handle_loadparm($private_file, $line);

                        next;
                }
 
                        next;
                }
 

diff --git a/wscript_build b/wscript_build
index f28c08cb41429ab4313032ec679f0e25cfa10ed5..9228d154107108d8d2c8dcd3bea783e581ca90da 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -20,7 +20,7 @@ bld.env.build_public_headers = 'include/public'
 
 # these are includes which appear in public headers, but with #ifdef conditional
 # compilation, so they are safe
 
 # these are includes which appear in public headers, but with #ifdef conditional
 # compilation, so they are safe

-bld.env.public_headers_skip = ['lib/param/param_proto.h']
+bld.env.public_headers_skip = ['lib/param/param_proto.h', 'lib/param/param_functions.h']

 
 samba_version.load_version(bld.env, is_install=bld.is_install)
 bld.SAMBA_MKVERSION('version.h')
 
 samba_version.load_version(bld.env, is_install=bld.is_install)
 bld.SAMBA_MKVERSION('version.h')