Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 19:35:10 +0000 (21:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 19:35:10 +0000 (21:35 +0200)
Conflicts:
source3/include/proto.h

source3/include/includes.h
source3/libads/authdata.c
source3/libsmb/samlogon_cache.c
source3/rpc_server/srv_eventlog.c
source3/rpc_server/srv_ntsvcs.c
source3/rpc_server/srv_samr_nt.c
source3/rpc_server/srv_svcctl.c
source3/utils/net_ads.c
source3/winbindd/idmap_ad.c

index 65fac79d53137784b666c0569c5359dd634ab016..c164d285c1f70b010b38eb5d3b8ba387a79277db 100644 (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"
index 5a7bd24507684ba5c9ac02260baadc1baefc0515..9f0f68ed7b55129ac0b44b2e1e3242488b7ba2c5 100644 (file)
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_krb5pac.h"
 
 #ifdef HAVE_KRB5
 
index af4986fa9d681d9bb50fd9df2a2b9cdb1c266142..7af93cf2e042de6b5c2f7473fdbf9b992bb69cc5 100644 (file)
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_krb5pac.h"
 
 #define NETSAMLOGON_TDB        "netsamlogon_cache.tdb"
 
index da761c905eaee7322a66738119aa493fadad482c..973be28040adf2490b056757c1b4cefd33e80fae 100644 (file)
@@ -19,6 +19,7 @@
  */
  
 #include "includes.h"
+#include "librpc/gen_ndr/srv_eventlog.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
index 100d577010fa7cfc7b62691d2ef66f98e2555881..5010990b587c04b647e45a6643cac53acbf3d741 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "librpc/gen_ndr/srv_ntsvcs.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
index 6cf90be6d9bad07b86bd2be7a94684592df09f91..e527631cc116bf31002e69fe3b451973c25177b2 100644 (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,
index 84864364f706ae2deb83e8ec5d963475cef58618..4b3fdda3cbba123dbde1916d31c5658ad1fb4c41 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "librpc/gen_ndr/srv_svcctl.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
index 5a2d535b305adf2d67f372d59c7befe2dc5b0afa..4b1aa54731ab56c991ba69626b2901401f95826c 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "librpc/gen_ndr/ndr_krb5pac.h"
 
 #ifdef HAVE_ADS
 
index 8144d876d4061a4083ad96693e33877f0176c730..60a2d8642aacd2d3c563f204ea9252d6589bc097 100644 (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);