diff options
author | Andrew Bartlett <abartlet@samba.org> | 2004-06-05 03:22:10 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:30 -0500 |
commit | 5b04ca8080708573207eb58f2c2b207780a6ea28 (patch) | |
tree | 42d7677298d96020cfa6ecdbe81211c582511bd3 /source4/rpc_server/samr/samdb.c | |
parent | ae067cdaf70c7725237ec58b5e23bc6f525594c2 (diff) | |
download | samba-5b04ca8080708573207eb58f2c2b207780a6ea28.tar.gz samba-5b04ca8080708573207eb58f2c2b207780a6ea28.tar.bz2 samba-5b04ca8080708573207eb58f2c2b207780a6ea28.zip |
r1025: Rename (across the samr and netlogon pipes, so far)
pwd -> password
passwd -> password
username -> account_name
Also work on consistant structure feild names between these two pipes,
and fix up some callers to use samr_Password for the netlogon
credential code.
Andrew Bartlett
(This used to be commit 4e35418c2776f7b79be5b358ffd077754685d1ac)
Diffstat (limited to 'source4/rpc_server/samr/samdb.c')
-rw-r--r-- | source4/rpc_server/samr/samdb.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source4/rpc_server/samr/samdb.c b/source4/rpc_server/samr/samdb.c index 872ec82894..c188e917a7 100644 --- a/source4/rpc_server/samr/samdb.c +++ b/source4/rpc_server/samr/samdb.c @@ -427,11 +427,13 @@ uint64_t samdb_result_uint64(struct ldb_message *msg, const char *attr, uint64_t /* - construct the allow_pwd_change field from the PwdLastSet attribute and the + construct the allow_password_change field from the PwdLastSet attribute and the domain password settings */ -NTTIME samdb_result_allow_pwd_change(void *ctx, TALLOC_CTX *mem_ctx, - const char *domain_dn, struct ldb_message *msg, const char *attr) +NTTIME samdb_result_allow_password_change(void *ctx, TALLOC_CTX *mem_ctx, + const char *domain_dn, + struct ldb_message *msg, + const char *attr) { uint64_t attr_time = samdb_result_uint64(msg, attr, 0); int64_t minPwdAge; @@ -440,7 +442,8 @@ NTTIME samdb_result_allow_pwd_change(void *ctx, TALLOC_CTX *mem_ctx, return 0; } - minPwdAge = samdb_search_int64(ctx, mem_ctx, 0, NULL, "minPwdAge", "dn=%s", domain_dn); + minPwdAge = samdb_search_int64(ctx, mem_ctx, 0, NULL, + "minPwdAge", "dn=%s", domain_dn); /* yes, this is a -= not a += as minPwdAge is stored as the negative of the number of 100-nano-seconds */ @@ -450,11 +453,13 @@ NTTIME samdb_result_allow_pwd_change(void *ctx, TALLOC_CTX *mem_ctx, } /* - construct the force_pwd_change field from the PwdLastSet attribute and the + construct the force_password_change field from the PwdLastSet attribute and the domain password settings */ -NTTIME samdb_result_force_pwd_change(void *ctx, TALLOC_CTX *mem_ctx, - const char *domain_dn, struct ldb_message *msg, const char *attr) +NTTIME samdb_result_force_password_change(void *ctx, TALLOC_CTX *mem_ctx, + const char *domain_dn, + struct ldb_message *msg, + const char *attr) { uint64_t attr_time = samdb_result_uint64(msg, attr, 0); int64_t maxPwdAge; |