diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-01 19:46:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:36 -0500 |
| commit | ce7bccef5fa41d5445a97f32daf387c9ed85030e (patch) | |
| tree | 8a8a32706be8b2964426aa082c943cc19939bf51 | |
| parent | a8f264eb2f5b3310d721e79f9ca7e8c47064267e (diff) | |
| download | samba-ce7bccef5fa41d5445a97f32daf387c9ed85030e.tar.gz samba-ce7bccef5fa41d5445a97f32daf387c9ed85030e.tar.bz2 samba-ce7bccef5fa41d5445a97f32daf387c9ed85030e.zip | |
r25449: Add convenience function for opening the default smb.conf for openchange.
(This used to be commit 5f023ef7a4046442a96768b926546f93735c9666)
| -rw-r--r-- | source4/param/loadparm.c | 5 | ||||
| -rwxr-xr-x | source4/script/mkproto.pl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 1d12a2b73c..39b02f0ccb 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2452,6 +2452,11 @@ bool loadparm_init(struct loadparm_context *lp_ctx) return true; } +_PUBLIC_ _DEPRECATED_ bool lp_load_default(void) +{ + return lp_load(dyn_CONFIGFILE); +} + /*************************************************************************** Load the services array from the services file. Return True on success, False on failure. diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl index 5e434d843a..6d76b9bc4f 100755 --- a/source4/script/mkproto.pl +++ b/source4/script/mkproto.pl @@ -198,7 +198,7 @@ sub process_file($$$) } next unless ( $is_public || $line =~ / - (_DEPRECATED_ |_NORETURN_ |_WARN_UNUSED_RESULT_ |_PURE_ )*^( + ^(_DEPRECATED_ |_NORETURN_ |_WARN_UNUSED_RESULT_ |_PURE_ )*( void|BOOL|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS| ADS_STATUS|enum\s.*\(|DATA_BLOB|WERROR|XFILE|FILE|DIR| double|TDB_CONTEXT|TDB_DATA|TALLOC_CTX|NTTIME|FN_|init_module| |