[SCM] Samba Shared Repository - branch master updated -
1b05be10399a8fab80072e7aaccd55a3f6e8f651
Jelmer Vernooij
jelmer at samba.org
Sat Nov 1 14:21:53 GMT 2008
The branch, master has been updated
via 1b05be10399a8fab80072e7aaccd55a3f6e8f651 (commit)
via d880faae92eb8b90b3c52b00bb0c163bc84511df (commit)
via cf721521b6db0c67087ca1b34f4de204c55d5b93 (commit)
via 75819db083177d55940861d7da6c3a32e9663670 (commit)
from f929488d580748a7ce700a7672f77e2adae4c588 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1b05be10399a8fab80072e7aaccd55a3f6e8f651
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 1 15:21:31 2008 +0100
ALlow util/debug.h to be included more than once.
commit d880faae92eb8b90b3c52b00bb0c163bc84511df
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 1 15:13:00 2008 +0100
Fix includes in installed version of talloc_stack.h.
commit cf721521b6db0c67087ca1b34f4de204c55d5b93
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 1 15:10:56 2008 +0100
Remove need to define _SAMBA_BUILD_ == 4 when using installed headers.
commit 75819db083177d55940861d7da6c3a32e9663670
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 1 15:09:26 2008 +0100
Rename param_opt.flags to priority.
-----------------------------------------------------------------------
Summary of changes:
lib/util/debug.h | 5 +++++
lib/util/util.h | 2 +-
source4/headermap.txt | 1 +
source4/param/loadparm.c | 20 ++++++++++++++++----
source4/param/param.h | 5 ++++-
source4/script/installheader.pl | 2 ++
6 files changed, 29 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.h b/lib/util/debug.h
index 8c634f9..632c24f 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -17,6 +17,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef _SAMBA_DEBUG_H_
+#define _SAMBA_DEBUG_H_
+
/**
* @file
* @brief Debugging macros
@@ -131,3 +134,5 @@ _PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops);
_PUBLIC_ void dbgtext(const char *format, ...) PRINTF_ATTRIBUTE(1,2);
extern XFILE *dbf;
+
+#endif
diff --git a/lib/util/util.h b/lib/util/util.h
index 66861fb..0f09747 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -52,7 +52,7 @@ extern const char *panic_action;
#ifdef DEVELOPER
#define SMB_ASSERT(b) do { if (!(b)) { \
DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \
- __FILE__, __LINE__, #b)), smb_panic("assert failed: " #b); }} while(0)
+ __FILE__, __LINE__, #b)); smb_panic("assert failed: " #b); }} while(0)
#else
/* redefine the assert macro for non-developer builds */
#define SMB_ASSERT(b) do { if (!(b)) { \
diff --git a/source4/headermap.txt b/source4/headermap.txt
index 78b9200..cb5a4fa 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -79,3 +79,4 @@ libcli/ldap/ldap_ndr.h: ldap_ndr.h
lib/events/events.h: events.h
lib/events/events_internal.h: events_internal.h
auth/session.h: samba/session.h
+../talloc/talloc.h: talloc.h
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 18b3dcf..b4098c8 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -64,6 +64,7 @@
#include "param/param.h"
#include "param/loadparm.h"
#include "libcli/raw/libcliraw.h"
+#include "rpc_server/common/common.h"
#define standard_sub_basic talloc_strdup
@@ -1569,14 +1570,14 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
/* If we already have the option set, override it unless
it was a command line option and the new one isn't */
if (strcmp(paramo->key, name) == 0) {
- if ((paramo->flags & FLAG_CMDLINE) &&
+ if ((paramo->priority & FLAG_CMDLINE) &&
!(flags & FLAG_CMDLINE)) {
return true;
}
talloc_free(paramo->value);
paramo->value = talloc_strdup(paramo, pszParmValue);
- paramo->flags = flags;
+ paramo->priority = flags;
free(name);
return true;
}
@@ -1587,7 +1588,7 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
smb_panic("OOM");
paramo->key = talloc_strdup(paramo, name);
paramo->value = talloc_strdup(paramo, pszParmValue);
- paramo->flags = flags;
+ paramo->priority = flags;
if (service == NULL) {
DLIST_ADD(lp_ctx->globals->param_opt, paramo);
} else {
@@ -2219,7 +2220,7 @@ static int lp_destructor(struct loadparm_context *lp_ctx)
struct param_opt *next;
for (data = lp_ctx->globals->param_opt; data; data=next) {
next = data->next;
- if (data->flags & FLAG_CMDLINE) continue;
+ if (data->priority & FLAG_CMDLINE) continue;
DLIST_REMOVE(lp_ctx->globals->param_opt, data);
talloc_free(data);
}
@@ -2659,3 +2660,14 @@ _PUBLIC_ char *lp_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c
return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile);
}
+_PUBLIC_ struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+ struct dcerpc_server_info *ret = talloc_zero(mem_ctx, struct dcerpc_server_info);
+
+ ret->domain_name = talloc_reference(mem_ctx, lp_workgroup(lp_ctx));
+ ret->version_major = lp_parm_int(lp_ctx, NULL, "server_info", "version_major", 5);
+ ret->version_minor = lp_parm_int(lp_ctx, NULL, "server_info", "version_minor", 2);
+ ret->version_build = lp_parm_int(lp_ctx, NULL, "server_info", "version_build", 3790);
+
+ return ret;
+}
diff --git a/source4/param/param.h b/source4/param/param.h
index 85db1c3..8a653be 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -24,7 +24,7 @@ struct param_opt {
struct param_opt *prev, *next;
char *key;
char *value;
- int flags;
+ int priority;
};
struct param_context {
@@ -196,6 +196,7 @@ int lp_server_signing(struct loadparm_context *);
int lp_client_signing(struct loadparm_context *);
const char *lp_ntp_signd_socket_directory(struct loadparm_context *);
+
const char *lp_get_parametric(struct loadparm_context *lp_ctx,
struct loadparm_service *service,
const char *type, const char *option);
@@ -327,6 +328,8 @@ void lp_smbcli_options(struct loadparm_context *lp_ctx,
struct smbcli_options *options);
void lp_smbcli_session_options(struct loadparm_context *lp_ctx,
struct smbcli_session_options *options);
+struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
+
/* The following definitions come from param/generic.c */
diff --git a/source4/script/installheader.pl b/source4/script/installheader.pl
index 6b10bde..a962306 100755
--- a/source4/script/installheader.pl
+++ b/source4/script/installheader.pl
@@ -64,6 +64,8 @@ sub install_header($$)
if (/^#include \"(.*)\"/) {
print OUT "#include <" . rewrite_include("$src:$lineno", $1) . ">\n";
+ } else if (/^#if _SAMBA_BUILD_ == 4/) {
+ print OUT "#if 1\n";
} else {
print OUT $_;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list