sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00
Code

Merge branch 'master' of git://git.samba.org/samba

Browse Source 
Conflicts:
	source3/include/proto.h
This commit is contained in:
Jelmer Vernooij 2008-10-20 21:35:10 +02:00
commit d36edccc00
9 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/include/includes.h
View File

@ -716,14 +716,6 @@ enum flush_reason_enum {
#include "modules/nfs4_acls.h"
#include "nsswitch/libwbclient/wbclient.h"
/* generated rpc server implementation functions */
#include "librpc/gen_ndr/srv_echo.h"
#include "librpc/gen_ndr/srv_svcctl.h"
#include "librpc/gen_ndr/srv_lsa.h"
#include "librpc/gen_ndr/srv_eventlog.h"
#include "librpc/gen_ndr/srv_winreg.h"
#include "librpc/gen_ndr/srv_initshutdown.h"
/***** automatically generated prototypes *****/
#ifndef NO_PROTO_H
#include "proto.h"

1
source3/libads/authdata.c
View File

@ -23,6 +23,7 @@
*/
#include "includes.h"
#include "librpc/gen_ndr/ndr_krb5pac.h"
#ifdef HAVE_KRB5

1
source3/libsmb/samlogon_cache.c
View File

@ -22,6 +22,7 @@
*/
#include "includes.h"
#include "librpc/gen_ndr/ndr_krb5pac.h"
#define NETSAMLOGON_TDB "netsamlogon_cache.tdb"

1
source3/rpc_server/srv_eventlog.c
View File

@ -19,6 +19,7 @@
*/
#include "includes.h"
#include "librpc/gen_ndr/srv_eventlog.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV

1
source3/rpc_server/srv_ntsvcs.c
View File

@ -18,6 +18,7 @@
*/
#include "includes.h"
#include "librpc/gen_ndr/srv_ntsvcs.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV

4
source3/rpc_server/srv_samr_nt.c
View File

@ -2909,6 +2909,10 @@ static NTSTATUS samr_QueryDomainInfo_internal(const char *fn_name,
unix_to_nt_time_abs(&nt_expire, u_expire);
unix_to_nt_time_abs(&nt_min_age, u_min_age);
if (lp_check_password_script() && *lp_check_password_script()) {
password_properties |= DOMAIN_PASSWORD_COMPLEX;
}
init_samr_DomInfo1(&dom_info->info1,
(uint16)min_pass_len,
(uint16)pass_hist,

1
source3/rpc_server/srv_svcctl.c
View File

@ -18,6 +18,7 @@
*/
#include "includes.h"
#include "librpc/gen_ndr/srv_svcctl.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV

1
source3/utils/net_ads.c
View File

@ -22,6 +22,7 @@
#include "includes.h"
#include "utils/net.h"
#include "librpc/gen_ndr/ndr_krb5pac.h"
#ifdef HAVE_ADS

2
source3/winbindd/idmap_ad.c
View File

@ -517,6 +517,8 @@ again:
bidx = idx;
for (i = 0; (i < IDMAP_AD_MAX_IDS) && ids[idx]; i++, idx++) {
ids[idx]->status = ID_UNKNOWN;
sidstr = sid_binstring(ids[idx]->sid);
filter = talloc_asprintf_append_buffer(filter, "(objectSid=%s)", sidstr);