mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
r5300: more uint32 and system/filesys.h build fixes when developer mode is enabled
This commit is contained in:
parent
483b7af1fd
commit
93931b1a74
@ -41,7 +41,7 @@ void update_joblist(void)
|
|||||||
struct atsvc_JobEnum r;
|
struct atsvc_JobEnum r;
|
||||||
struct atsvc_enum_ctr ctr;
|
struct atsvc_enum_ctr ctr;
|
||||||
int i;
|
int i;
|
||||||
uint32 resume_handle = 0;
|
uint32_t resume_handle = 0;
|
||||||
|
|
||||||
gtk_list_store_clear(store_jobs);
|
gtk_list_store_clear(store_jobs);
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
|
#include "system/filesys.h"
|
||||||
#include "lib/tdb/include/tdb.h"
|
#include "lib/tdb/include/tdb.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -316,7 +316,7 @@ static NTSTATUS gensec_gssapi_unwrap(struct gensec_security *gensec_security,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static BOOL gensec_gssapi_have_feature(struct gensec_security *gensec_security,
|
static BOOL gensec_gssapi_have_feature(struct gensec_security *gensec_security,
|
||||||
uint32 feature)
|
uint32_t feature)
|
||||||
{
|
{
|
||||||
struct gensec_gssapi_state *gensec_gssapi_state = gensec_security->private_data;
|
struct gensec_gssapi_state *gensec_gssapi_state = gensec_security->private_data;
|
||||||
if (feature & GENSEC_FEATURE_SIGN) {
|
if (feature & GENSEC_FEATURE_SIGN) {
|
||||||
|
@ -489,7 +489,7 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
|
|||||||
{
|
{
|
||||||
krb5_data inbuf;
|
krb5_data inbuf;
|
||||||
krb5_ap_rep_enc_part *repl = NULL;
|
krb5_ap_rep_enc_part *repl = NULL;
|
||||||
uint8 tok_id[2];
|
uint8_t tok_id[2];
|
||||||
DATA_BLOB unwrapped_in;
|
DATA_BLOB unwrapped_in;
|
||||||
|
|
||||||
if (!gensec_gssapi_parse_krb5_wrap(out_mem_ctx, &in, &unwrapped_in, tok_id)) {
|
if (!gensec_gssapi_parse_krb5_wrap(out_mem_ctx, &in, &unwrapped_in, tok_id)) {
|
||||||
@ -525,7 +525,7 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
|
|||||||
char *principal;
|
char *principal;
|
||||||
DATA_BLOB unwrapped_in;
|
DATA_BLOB unwrapped_in;
|
||||||
DATA_BLOB unwrapped_out = data_blob(NULL, 0);
|
DATA_BLOB unwrapped_out = data_blob(NULL, 0);
|
||||||
uint8 tok_id[2];
|
uint8_t tok_id[2];
|
||||||
|
|
||||||
if (!in.data) {
|
if (!in.data) {
|
||||||
*out = unwrapped_out;
|
*out = unwrapped_out;
|
||||||
@ -689,7 +689,7 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
|
|||||||
}
|
}
|
||||||
|
|
||||||
static BOOL gensec_krb5_have_feature(struct gensec_security *gensec_security,
|
static BOOL gensec_krb5_have_feature(struct gensec_security *gensec_security,
|
||||||
uint32 feature)
|
uint32_t feature)
|
||||||
{
|
{
|
||||||
if (feature & GENSEC_FEATURE_SESSION_KEY) {
|
if (feature & GENSEC_FEATURE_SESSION_KEY) {
|
||||||
return True;
|
return True;
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include "libcli/auth/kerberos.h"
|
#include "libcli/auth/kerberos.h"
|
||||||
#include "system/time.h"
|
#include "system/time.h"
|
||||||
#include "secrets.h"
|
#include "secrets.h"
|
||||||
|
#include "pstring.h"
|
||||||
|
|
||||||
#ifdef HAVE_KRB5
|
#ifdef HAVE_KRB5
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#include "asn_1.h"
|
#include "asn_1.h"
|
||||||
#include "lib/ldb/include/ldb.h"
|
#include "lib/ldb/include/ldb.h"
|
||||||
#include "secrets.h"
|
#include "secrets.h"
|
||||||
|
#include "pstring.h"
|
||||||
|
|
||||||
#ifdef HAVE_KRB5
|
#ifdef HAVE_KRB5
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ static NTSTATUS remote_register_one_iface(struct dcesrv_context *dce_ctx, const
|
|||||||
static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server)
|
static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
char **ifaces = str_list_make(dce_ctx, lp_parm_string(-1,"dcerpc_remote","interfaces"),NULL);
|
const char **ifaces = str_list_make(dce_ctx, lp_parm_string(-1,"dcerpc_remote","interfaces"),NULL);
|
||||||
|
|
||||||
if (!ifaces) {
|
if (!ifaces) {
|
||||||
DEBUG(3,("remote_op_init_server: no interfaces configured\n"));
|
DEBUG(3,("remote_op_init_server: no interfaces configured\n"));
|
||||||
|
@ -24,8 +24,8 @@
|
|||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
#include "dynconfig.h"
|
#include "dynconfig.h"
|
||||||
#include "system/passwd.h"
|
|
||||||
#include "system/filesys.h"
|
#include "system/filesys.h"
|
||||||
|
#include "system/passwd.h"
|
||||||
#include "lib/cmdline/popt_common.h"
|
#include "lib/cmdline/popt_common.h"
|
||||||
#include "auth/auth.h"
|
#include "auth/auth.h"
|
||||||
#include "libcli/security/security.h"
|
#include "libcli/security/security.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user