svn commit: samba r12332 - in trunk/source/nsswitch: .

[gd at samba.org]

Author: gd
Date: 2005-12-19 00:01:56 +0000 (Mon, 19 Dec 2005)
New Revision: 12332

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12332

Log:
Use the msrpc calls for account_policy/password_policy in the
ads-backend.

Guenther

Modified:
   trunk/source/nsswitch/winbindd_ads.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_ads.c
===================================================================
--- trunk/source/nsswitch/winbindd_ads.c	2005-12-18 23:59:15 UTC (rev 12331)
+++ trunk/source/nsswitch/winbindd_ads.c	2005-12-19 00:01:56 UTC (rev 12332)
@@ -933,51 +933,6 @@
 	return result;
 }
 
-static NTSTATUS lockout_policy(struct winbindd_domain *domain, 
-			       TALLOC_CTX *mem_ctx,
-			       SAM_UNK_INFO_12 *lockout_policy)
-{
-	ADS_STRUCT *ads = NULL;
-	ADS_STATUS rc;
-
-	ads = ads_cached_connection(domain);
-	
-	if (!ads) {
-		domain->last_status = NT_STATUS_SERVER_DISABLED;
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	rc = gpo_lockout_policy(ads, mem_ctx, get_global_sam_name(), lockout_policy);
-	if (!ADS_ERR_OK(rc)) {
-		return msrpc_lockout_policy(domain, mem_ctx, lockout_policy);
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS password_policy(struct winbindd_domain *domain, 
-				TALLOC_CTX *mem_ctx,
-				SAM_UNK_INFO_1 *password_policy)
-{
-	ADS_STRUCT *ads = NULL;
-	ADS_STATUS rc;
-
-	ads = ads_cached_connection(domain);
-	
-	if (!ads) {
-		domain->last_status = NT_STATUS_SERVER_DISABLED;
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	rc = gpo_password_policy(ads, mem_ctx, get_global_sam_name(), password_policy);
-	if (!ADS_ERR_OK(rc)) {
-		return msrpc_password_policy(domain, mem_ctx, password_policy);
-	}
-
-	return NT_STATUS_OK;
-}
-
-
 /* the ADS backend methods are exposed via this structure */
 struct winbindd_methods ads_methods = {
 	True,
@@ -994,8 +949,8 @@
 	msrpc_query_aliasmem,
 	msrpc_query_groupmem,
 	sequence_number,
-	lockout_policy,
-	password_policy,
+	msrpc_lockout_policy,
+	msrpc_password_policy,
 	trusted_domains,
 };